Revision bump: EAPI 5, fix target dependencies in Makefile patch, respect CFLAGS, wrt bug #436652

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 125 insertions, 6 deletions

diff --git a/dev-lua/luadbi/ChangeLog b/dev-lua/luadbi/ChangeLog
index ae192fb8f126..a96b6aaa82cf 100644
--- a/dev-lua/luadbi/ChangeLog
+++ b/dev-lua/luadbi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lua/luadbi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.9 2012/12/31 09:50:58 djc Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.10 2013/02/25 20:25:17 pinkbyte Exp $
+
+*luadbi-0.5-r2 (25 Feb 2013)
+
+  25 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +files/0.5-r2-Makefile.patch,
+  +luadbi-0.5-r2.ebuild:
+  Revision bump: EAPI 5, fix target dependencies in Makefile patch, respect
+  CFLAGS, wrt bug #436652
 
   31 Dec 2012; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
   Remove myself as a maintainer.
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 8cee49678b35..c196b9967c21 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -3,14 +3,20 @@ Hash: SHA256
 
 AUX 0.5-Makefile.patch 1293 SHA256 a9b8a3429f09855aff8b803659a72be2e80a94152f846d1c17cfedcf363ae630 SHA512 ce0afb2d169d30dfd038cc577fd7cdb7bc1fd425040a5681e0e6f07ec8212c57e1039d8a94e8e43ee530e1f3cf87ce15f6a18282842c164950e7b17819ede74e WHIRLPOOL 526ee1e4b2d96ce0351bb2eb08a64e587603674df0fcaec19e4af1ba1b6d94e7f9440651438c833ccddb57fc200c86a9bee5da8a03bc2fccad7d146945efbc88
 AUX 0.5-postgres-path.patch 277 SHA256 09ab48339a671083ac18ac42248a380f92722bee35b21e1412dc27d669e27385 SHA512 4e4a23c065f868c0aeb9111118cca71b7d3f0edbdbed82654cd77871d5028d223f07623e6598b902f06c02803b6310a7bed5a7ce38504c1ad10d571b6121e43a WHIRLPOOL 54c16aa4c25613ad86b074af228e718a41b875ed8448b279b4d64bfdb23e73609e0656709b265ca98f3062a716e6be7a0f9c9e7aba29c086bc813a16bc04af67
+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-r1.ebuild 1850 SHA256 646ca73e8bd2a37dc1f5ec2bb0d6df3daf2dc8567e13f2b04be841c6d3f548b7 SHA512 2e1cbd348edec3a4061f40c74588b7e29b804f79b93c0b7b97e21a9603d0ca826e1629144c6bee65efd4e68ae44ff1a79e569b4ed85f84705195d44fd7b9e23c WHIRLPOOL e2e65ac6b295c1100258e6364dd1104056c34e818af068e3743059afbaffcfdb6f50c9a9742c505ab8911fd2e33839eb212c80c75cf0ff63270228d46b13250d
-MISC ChangeLog 1410 SHA256 58183799d6e9c9cb9f00edcdcdb0a9e28b4e53436b238300db55fdc80b831cc2 SHA512 47d1a9f27842cf47dcb1d219413b7e08c144c1eeb100abf140e71a2cc83cd0cb64b8c98cf890eea7fa2e32be2e78f3898d5b8e152d57323d49e4c1cf9807cfb9 WHIRLPOOL f01e8bcb514ae7b99864b50cd7cdabf8e41936e2d73f45bae189353d05e24560c8982bff43b52a07bbd1e7015af6355c2f0e993263878d5938822bd120c3b7a5
+EBUILD luadbi-0.5-r2.ebuild 1854 SHA256 fc1c1e095645d7a9edac55232054a100727d79b15b2f61bcf0866c6fb0da8e32 SHA512 65cb7a3cb31240eca76bc68294dcee842f4de4bdc849202708b0fd8be70f9f1eba91b4582dadc3c8410fd6706b62312d3367f47f33fb3d054ccb5caf573f4b29 WHIRLPOOL 4d722f9fef76c84c9b6037ef1bd84e6cd2df26c5199e1b50cdc6b9ce654cbc524cbf99a94e869f75a1ece3a5522094d754b5d44c7f9508fa34d61129c0281a78
+MISC ChangeLog 1654 SHA256 2377449e06aae2ed7fa55326120e6258dcb7067d3fae769d2e215582b8b8129d SHA512 b24e73ca59ee72bed1b8e56b3d8d8f1e31889ddf29a3d98fda9e87a29cfc1a44271b16fee75060d737fb6b129d0a246ea9546f72410fa751ef15203c78712e2d WHIRLPOOL d4ac56e62813e9811df18302f4b817f6a6813d04676a971db3906a5f4a60936ac47b5ed0aae82dae4abe6640b1f2007b4261131873b161de49ea2427ecc1000d
 MISC metadata.xml 290 SHA256 d0ab6f77bf5c3d55ff53e09d4e61c1895cb5b7473d677323f2bb9c7309b2d203 SHA512 90bf7cb07542bb151bc7339aa96dbbe057f6471a0b32a5fff0f93886ea8f9a1bf1345a4aad2aea1581e29bd405c8544d3d93168df69af111aaf261b470343a29 WHIRLPOOL d535ef64786ebc5aa2b536d40e752c7062085bb61b46558ba4e6c123219958904ae36e5a118c381e22893dd9aadbdb9152619c31f5d2c7d523bbaf128a47a2a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDhYAYACgkQxeMuLWsGW/uDpgCgl0NQ44yKgUS33VNPv/CL2pEH
-OgUAn28JBwxuR++Ec37mFhS1+nukxnW5
-=B5Zx
+iQEcBAEBCAAGBQJRK8itAAoJECo/aRed9267gGMH/jHOU4KAn2cUMpHKXv2N95Wq
+iaU6mVNC9r02YW+q7EG6cbPd8mqSBjsBrnzjTy95IxpB6y+kL88ukoHbxFF0//qd
+8QnMBOzot8iNXU2H1WS4LPVXmWpdq9jFto4jFGTStr+nQHHCt7CvlAgsLQuhIUsj
+UYkNFAZId3Diy7AKrwtVxMp2YdR5OzFDpseNguXCpsSJiP4XR43css8+p1bHa3hU
+eem+4+MHb27/nfX783QhkOvlX1Kmm2XEqqCW7mQjSarWzUzOz41YQxPmiQGtBHOb
+EgAb23drWZlyZAcWyB1y2ww0LCK+MlFAMBt7OJDzBavvUTuNyvBE4IY7T6xSI9s=
+=vtu4
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
new file mode 100644
index 000000000000..b37b3c00efe0
--- /dev/null
+++ b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
@@ -0,0 +1,47 @@
+--- Makefile.orig	2013-02-01 13:34:54.490898002 +0400
++++ Makefile	2013-02-01 13:44:25.927772130 +0400
+@@ -1,5 +1,6 @@
+ CC=gcc
+-CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
++INCLUDES=-I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
++CFLAGS+=-pedantic -shared -fpic $(INCLUDES)
+ AR=ar rcu
+ RANLIB=ranlib
+ RM=rm -rf
+@@ -27,6 +27,14 @@
+ DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o
+ ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o
+ 
++INSTALL = install
++INSTALL_PROGRAM = $(INSTALL)
++INSTALL_DATA = $(INSTALL) -m 644
++LUA_INC_DIR=/usr/include/lua5.1
++LUA_LIB_DIR=/usr/lib
++INSTALL_DIR_LUA=/usr/share/lua/5.1
++INSTALL_DIR_BIN=/usr/lib/lua/5.1
++
+ free: mysql psql sqlite3
+ 
+ all:  mysql psql sqlite3 db2 oracle
+@@ -90,3 +98,21 @@
+ build:
+ 	$(MKDIR) ${BUILDDIR}
+ 
++install_lua:
++	$(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua
++
++install_mysql: install_lua
++	$(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL)
++
++install_psql: install_lua
++	$(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL)
++
++install_sqlite3: install_lua
++	$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3)
++
++install_db2: install_lua
++	$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2)
++
++install_oracle: install_lua
++	$(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE)
++
diff --git a/dev-lua/luadbi/luadbi-0.5-r2.ebuild b/dev-lua/luadbi/luadbi-0.5-r2.ebuild
new file mode 100644
index 000000000000..74af336b9f81
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.5-r2.ebuild
@@ -0,0 +1,59 @@
+# 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-r2.ebuild,v 1.1 2013/02/25 20:25:17 pinkbyte Exp $
+
+EAPI=5
+
+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"
+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}/${PVR}-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"
+
+	append-flags -fPIC
+	for driver in "${drivers}" ; do
+		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
+	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// /}"
+	done
+}