Fix path to postgres header (bug 364141).

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

4 files changed, 91 insertions, 5 deletions

diff --git a/dev-lua/luadbi/ChangeLog b/dev-lua/luadbi/ChangeLog
index 24942c5f6353..15efbf7fc84f 100644
--- a/dev-lua/luadbi/ChangeLog
+++ b/dev-lua/luadbi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lua/luadbi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.1 2011/04/08 16:37:09 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.2 2011/05/02 16:37:07 djc Exp $
+
+*luadbi-0.5-r1 (02 May 2011)
+
+  02 May 2011; Dirkjan Ochtman <djc@gentoo.org>
+  +files/0.5-postgres-path.patch, +luadbi-0.5-r1.ebuild:
+  Fix path to postgres header (bug 364141).
 
 *luadbi-0.5 (08 Apr 2011)
 
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 090c65f4792f..ec0bcef8e69e 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX 0.5-Makefile.patch 1293 RMD160 1503f79f30bb438e562e78ed11217bbfc4405638 SHA1 b92c87a66ad6bb296d2b43552b5c949c575579b4 SHA256 a9b8a3429f09855aff8b803659a72be2e80a94152f846d1c17cfedcf363ae630
+AUX 0.5-postgres-path.patch 277 RMD160 49f6350645b7d1da446fb0fc918d3f111e7fed12 SHA1 9e52f4e853959429ac05d299d4f0b27d5891d7a0 SHA256 09ab48339a671083ac18ac42248a380f92722bee35b21e1412dc27d669e27385
 DIST luadbi.0.5.tar.gz 22454 RMD160 b653e55a47a7f65cb436b962a8035ed5ebb61074 SHA1 c8c650c168599e3ac97634a5ffb28aeaaa4fb635 SHA256 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e
+EBUILD luadbi-0.5-r1.ebuild 2113 RMD160 9f1780f478a2badfbb5733ab29deb4487e60da41 SHA1 88a350d24e145bab336fa0db0a6b9939bc5e0a06 SHA256 6d50a0fe01eccff6711f26f59f7d8286ca2e3a2b728d7ec75c71a448aa5e85d3
 EBUILD luadbi-0.5.ebuild 2063 RMD160 a6d3133ae08abfe63ce6ed60912fa4a9dd3fd7c8 SHA1 f2501912a556b70b4bafe9d3cabd0b110a7cf9ce SHA256 1778900df532ab1e56bbd9c8ed0bf5b8d2530e759238a9316a971397f57c7c2c
-MISC ChangeLog 379 RMD160 b8786c1cc098ba0bd7cc53de13e8747ee4a0e0e3 SHA1 5cd63e9b4735ba8ec494e34c140369e31d87a189 SHA256 15bc212a4f170662e92f2db692526e02b184f1a0901402ab8e292fad81d4c5de
+MISC ChangeLog 559 RMD160 73eb4bd5f52d61815c9f6c80a820cdec12168b7d SHA1 157c2256eb8136592bd363842b6080db48ff1203 SHA256 5370491c5456af41e6b40302516563437db3e1043f8b83c07906a5dc58eddd55
 MISC metadata.xml 222 RMD160 1ecd6ec2de3cabca42355c97a60a9ab10e6d04eb SHA1 eb11b76b0b58d89542957a3e8661ae90f01fdd28 SHA256 bf2766a136d56123f5cbd54b934eaf7b781d38cbd24fccb23cfc568535270ac9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2fOb8ACgkQxeMuLWsGW/uzEQCfSxEo2tFNr5JYM8qtbFLHVWeW
-+NUAn3aqpoqmrHDGfTi3eLmr8s4J1zQX
-=/y3b
+iEYEARECAAYFAk2+3bwACgkQxeMuLWsGW/s0PwCfctYhdUq4qfBMDBE7QBLJ643l
+aDMAn3JCsjkrzdyFvoj8nL/c/Z4Ijp1I
+=/zZh
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/luadbi/files/0.5-postgres-path.patch b/dev-lua/luadbi/files/0.5-postgres-path.patch
new file mode 100644
index 000000000000..87a0e889a582
--- /dev/null
+++ b/dev-lua/luadbi/files/0.5-postgres-path.patch
@@ -0,0 +1,9 @@
+--- dbd/postgresql/dbd_postgresql.h.old	2010-05-01 06:25:12.000000000 +0200
++++ dbd/postgresql/dbd_postgresql.h	2011-04-19 16:59:53.364944209 +0200
+@@ -1,5 +1,5 @@
+ #include <libpq-fe.h>
+-#include <postgres_fe.h>
++#include <server/postgres_fe.h>
+ #include <dbd/common.h>
+ 
+ /* 
\ No newline at end of file
diff --git a/dev-lua/luadbi/luadbi-0.5-r1.ebuild b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
new file mode 100644
index 000000000000..42073f5ae8ba
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r1.ebuild,v 1.1 2011/05/02 16:37:07 djc Exp $
+
+EAPI=2
+
+inherit multilib 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"
+
+RDEPEND=">=dev-lang/lua-5.1
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql-base )
+		sqlite? ( >=dev-db/sqlite-3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-Makefile.patch"
+	epatch "${FILESDIR}/${PV}-postgres-path.patch"
+	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/Makefile"
+	sed -i -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/Makefile"
+	sed -i -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" "${S}/Makefile"
+	sed -i -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" "${S}/Makefile"
+	sed -i -e "s#^LUA_LIB =.*#LUA_LIB=lua#" "${S}/Makefile"
+}
+
+src_compile() {
+	local drivers=""
+	use mysql && drivers="${drivers} mysql"
+	use postgres && drivers="${drivers} psql"
+	use sqlite && drivers="${drivers} sqlite3"
+
+	if [ -z "${drivers// /}" ] ; then
+		eerror
+		eerror "No driver was selected, cannot build."
+		eerror "Please set USE flags to build any driver."
+		eerror "Possible USE flags: mysql postgres sqlite"
+		eerror
+		die "No driver selected"
+	fi
+
+	append-flags -fPIC -c
+	for driver in "${drivers}" ; do
+		emake ${driver} \
+			|| die "Compiling driver '${drivers// /}' failed"
+	done
+}
+
+src_install() {
+	local drivers=""
+	use mysql && drivers="${drivers} mysql"
+	use postgres && drivers="${drivers} psql"
+	use sqlite && drivers="${drivers} sqlite3"
+
+	for driver in ${drivers} ; do
+		emake DESTDIR="${D}" "install_${driver// /}" \
+			|| die "Install of driver '${drivers// /}' failed"
+	done
+}