Fixes bug #475942. Ebuild patch by Alexander Tsoy. Minor improvements by me

Package-Manager: portage-2.1.13.1/cvs/Linux x86_64

3 files changed, 73 insertions, 2 deletions

diff --git a/dev-lua/luadbi/ChangeLog b/dev-lua/luadbi/ChangeLog
index 32e01a655c9f..592d65b91a01 100644
--- a/dev-lua/luadbi/ChangeLog
+++ b/dev-lua/luadbi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lua/luadbi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.14 2013/07/22 23:33:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.15 2013/07/29 01:49:21 mrueg Exp $
+
+*luadbi-0.5-r3 (29 Jul 2013)
+
+  29 Jul 2013; Manuel Rüger <mrueg@gentoo.org> +luadbi-0.5-r3.ebuild:
+  Fixes bug #475942. Ebuild patch by Alexander Tsoy. Minor improvements by me
 
   22 Jul 2013; Manuel Rüger <mrueg@gentoo.org> metadata.xml:
   Taking up maintainership
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index a61c020970b5..1995262a8964 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -2,5 +2,6 @@ AUX 0.5-postgres-path.patch 277 SHA256 09ab48339a671083ac18ac42248a380f92722bee3
 AUX 0.5-r2-Makefile.patch 1785 SHA256 b04eb65a09578c4a72344107881a09fcca56bd95d7a5d13a2c5e3d8e8c2841a0 SHA512 c9eca24aac386d34dff68a61e538dd2c736569b62e1afc9b0ff2bad14f26c42d402ec1e0eba2f7e974d6e689c70f880c31cfbc955a4e2afa8ca4bebcd351ae58 WHIRLPOOL 01ff9086e393173d567c713de1a04f50c2d4e705d85769dc5dd73c965b94aafeedc8067143480519818f05aa988e1ff3631ce56443590f7720d54a15d2461d23
 DIST luadbi.0.5.tar.gz 22454 SHA256 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62 WHIRLPOOL 6f1384d562adb7f874b9df6d42ebbe689fbd200ca57881ab76847eae818ffbb85765bfdbeb810511e8cff05170ba104bfc029f9cc969e8799a6971207f4bce4e
 EBUILD luadbi-0.5-r2.ebuild 1847 SHA256 a0b5884aaeca1deab2bacffd3b2490af01cd6b20a84c02d3f93431911c9d744e SHA512 253507134c454b8c3b5c584e58862396ce5377bae2b21995ac8ca9985102a44ffbb553fd2bcb2ee944a4f3de0004d37907a221996365017610f3797ac25c656f WHIRLPOOL e20aed56686b757386c15325e1a509c60805679c4834903d7efe37a1bd520624f570711a287c5ae43a2897b17a21d2816398ef2bca892fcc21fd0821091a87b1
-MISC ChangeLog 2077 SHA256 a5a43da120c4440ccf2e1a41022944ea79b355108c8108705898c36a8e85aab5 SHA512 3427570c85856d96d414113568c0b874a9ae425911784662f2561a01398da205b568577dfce7e36f0fc9868c58a795bcad193369e109b4994f4939f175599f42 WHIRLPOOL 5e72b0867f27e3d5915e94d688c6a737202e6efe947acecab556b8d265a21035268ef5d1b7292213b0f94fb6ac0efd60f1043875fdfbf145edff7d5861fb70ef
+EBUILD luadbi-0.5-r3.ebuild 1923 SHA256 b5537859ea6c584ea43361b03ea5532b3a078b2d70addc0ea3ecc13f8c1e8715 SHA512 1726469824088c54ff37c1661776b8229eafd9790e9bf21e4c4447a8bf032daa9602c910d96bcd59f8549fadaff1c1adc89126794e4825e43a69253e8c45906c WHIRLPOOL 5a8fc79abed01f93c181d443bf3cf1cd3f3857e195553e74be8dd1673dfe3ae86b751a523b94857da22bb29003a174c9451a6b65b97f20989c94dcd64bb66499
+MISC ChangeLog 2257 SHA256 3632cd7941f8cd57bd539b3ab088e3c1a3b38fc12d6619e8008832b7f496445e SHA512 78d4c58990d4e94a50e3968c7ed9734c6aba1a0754c22d3e83bda096647e9c257662ce3a23b8cbba880de3209ba835c4992764cffc6dfd40e978108f12299e15 WHIRLPOOL ef5011e1170a0d04e6a3deaf40741983484065d2f441cc3f3827048361a5549ac70c1c8a88b4a4ad03ef39b4f426080fad8152dde053b9f457db2c645d669b74
 MISC metadata.xml 307 SHA256 76edeecb335c2a89fc2a457c2dd71978f16f15e7c203fa3ae07fade5956d114b SHA512 da8073d11473a23fb0ac894ad2a195b8e3fd72a217b921a947489a51542e6e9f361cb4da15d9d8df91888d7ca2f97dc9618f2c5182262a0ca8d3d0ce2fc1e7c7 WHIRLPOOL acc78fe2c2e1109da77fa47de33d12878e88ebc3079b346ae2f30a71fc1c04f812867a4c8b8165c6143b37a2e0323b725d94bf6938927cfc20db5553494b75e6
diff --git a/dev-lua/luadbi/luadbi-0.5-r3.ebuild b/dev-lua/luadbi/luadbi-0.5-r3.ebuild
new file mode 100644
index 000000000000..bd22507650a2
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.5-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r3.ebuild,v 1.1 2013/07/29 01:49:21 mrueg Exp $
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="DBI module for Lua"
+HOMEPAGE="http://code.google.com/p/luadbi/"
+SRC_URI="http://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/lua-5.1
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-base )
+		sqlite? ( >=dev-db/sqlite-3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-r2-Makefile.patch \
+		"${FILESDIR}"/${PV}-postgres-path.patch
+	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" \
+		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" \
+		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" \
+		-e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" \
+		-e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die
+
+	drivers=""
+
+	if use mysql; then
+		drivers+="mysql "
+		sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \
+			-e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die
+	fi
+
+	if use postgres; then
+		drivers+="psql "
+		sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir)#" \
+			-e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die
+	fi
+
+	use sqlite && drivers+="sqlite3"
+}
+
+src_compile() {
+	append-flags -fPIC
+	for driver in ${drivers}; do
+		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
+	done
+}
+
+src_install() {
+	for driver in ${drivers}; do
+		emake DESTDIR="${D}" "install_${driver// /}"
+	done
+}