Update luadbi to EAPI=4 (bug 427928).

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

3 files changed, 22 insertions, 18 deletions

diff --git a/dev-lua/luadbi/ChangeLog b/dev-lua/luadbi/ChangeLog
index 28746582cee4..90630bd16f34 100644
--- a/dev-lua/luadbi/ChangeLog
+++ b/dev-lua/luadbi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2012/05/04 04:01:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.6 2012/09/30 11:57:08 djc Exp $
+
+  30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> luadbi-0.5-r1.ebuild:
+  Upgrade to EAPI=4, for REQUIRED_USE (bug 427928, thanks to
+  gentoo@quintero.com).
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> luadbi-0.5-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index bf2d9410323d..1958edb959af 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST luadbi.0.5.tar.gz 22454 SHA256 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62 WHIRLPOOL 6f1384d562adb7f874b9df6d42ebbe689fbd200ca57881ab76847eae818ffbb85765bfdbeb810511e8cff05170ba104bfc029f9cc969e8799a6971207f4bce4e
-EBUILD luadbi-0.5-r1.ebuild 2116 SHA256 7ed520f28ac384a634031814667d559ed5c0772561d485d4a0df9285d845ea61 SHA512 da7f32705d08189706d2427814d5aa20648eb9ea85d6679b931931d837fb9c9da51a83bc6d50771c5a5addc9eddff8af0f04bd5e4c272d6dd53a3da8989c5f32 WHIRLPOOL b78ce1bfbac702b0b346b12f3412979f61bd49498f2db51f9c4b2f06c53f380fe2417ecd27be2c8639e2079e0adf5972f05321d26f677e37e66977beb9e57d17
-MISC ChangeLog 902 SHA256 146d64bc364bf38908debb4e17967baf488d2f86e4080424c9baf4203d06c134 SHA512 0201e0ccde3220ad345ac5bd9e9ca0c5841eaa9fe31ce2917af9010b501eaccd389a2ecfb25a0ee31a80754f4ffac40f6fdda0315a34d58fd634202ca599a304 WHIRLPOOL 851119f61a582500df8e96a9cf7cbec03d6a1bc47470fd65b64e1e6d295ba618bc6729aacb8b26bc68ebcc2cc059233cf6e5ec3db12563cb9219aed6218797ee
+EBUILD luadbi-0.5-r1.ebuild 1806 SHA256 9fcbce2aa7b518cc10dca8715fbe5cee2797c18e39d1316ebf599bb0d137e93f SHA512 2bad3f280a08f4b5aafdc103d241a7019c1211b90034536074552019f48b51bc2a34908f6275ffffee4aa4b9129f946e003fa2d323090eb9d9a139d36f24cf90 WHIRLPOOL b4b11c29923080af39fd9ef9cb3a7a5bfb1a9427a9ffd2190d48fb161acf7138059a28cba794502061b7aba3e8ed4c477c4832aa06e753110f85b2076da3ceb9
+MISC ChangeLog 1055 SHA256 82bf7ab2faf7ace87658f75fc252ecaeea77b1b5a9d075b72ee0c15b6aac9dd4 SHA512 88abf3c467588dd687545c6677717dd853de5dc20259c356b15fde74870a52de53dfd8a2f2b7dc7421ad7d63979325519d320d93290cf36e2051741f49826dc4 WHIRLPOOL b481fd1af4eb64a2fa84abe42dfadcda6f163be0da6ff7079115d6168341453aa0d554258ce536cf8bfb9a10d5cd037ed4c7bece17e5015ed71238750532b014
 MISC metadata.xml 276 SHA256 b10e02a00f58e53475aacff4e0d4f754e2eb135c6232d7a63fe5352e1700c13a SHA512 e5fcefb779df495bc510e5df9f222373435e9294dab37e27866ef650526ef875a197944d2aa07bd13af58a1854078c8b4a2f5b5aecec17e38413d01cf80a9356 WHIRLPOOL ba62434993fcb4cbd9873092592934265f593bdebe00636342416ebf3cf83839c6886724e6ab0101d5e90a7e627674291c32f0d830a6f148b6d8752edc0f2438
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBoM50ACgkQxeMuLWsGW/vzmQCeIOmzj7g6QThNObPobwdlzvuk
++1QAn3K9mnW7hcZieTDEUCSEfaz7m/j0
+=iual
+-----END PGP SIGNATURE-----
diff --git a/dev-lua/luadbi/luadbi-0.5-r1.ebuild b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
index 6f3a1bef0fb8..b80b93750b51 100644
--- a/dev-lua/luadbi/luadbi-0.5-r1.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.3 2012/05/04 04:01:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r1.ebuild,v 1.4 2012/09/30 11:57:08 djc Exp $
 
-EAPI=2
+EAPI=4
 
 inherit multilib toolchain-funcs flag-o-matic eutils
 
@@ -14,6 +14,7 @@ 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 )
@@ -40,19 +41,9 @@ src_compile() {
 	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"
+		emake ${driver}
 	done
 }
 
@@ -63,7 +54,6 @@ src_install() {
 	use sqlite && drivers="${drivers} sqlite3"
 
 	for driver in ${drivers} ; do
-		emake DESTDIR="${D}" "install_${driver// /}" \
-			|| die "Install of driver '${drivers// /}' failed"
+		emake DESTDIR="${D}" "install_${driver// /}"
 	done
 }