Update luadbi to EAPI=4 (bug 427928).

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

4 files changed, 26 insertions, 27 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
 }
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 8ef08208769c..21a47367e783 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -6,17 +6,12 @@ AUX luaexpat-1.1-makefile.patch 607 SHA256 606a86314e3fdfe4a1ea63a1587629e1e3b1e
 AUX luaexpat-1.2.0-makefile.patch 607 SHA256 606a86314e3fdfe4a1ea63a1587629e1e3b1e867d98f6739a8f5bbf5431297ef SHA512 23f1ff3edc01242992777a1904800a2657c61b9942e529ab453856a6eae307ffe7cbf7a73794085956377650323a1e51f853cb997c6fe49b36813cf577b94cad WHIRLPOOL 563dab78a2de01f782b896a7ba0c5ad1d0da8f64380721ca5298b1ec12013b5254149ba5a55602fd8586a559a78a0b6e4a7cec531514af944fe2ce6beaed3422
 DIST luaexpat-1.2.0.tar.gz 28621 SHA256 2a7140e9c1923510639e87b60e85d7ddd0cd4e27561663bd9d4031ef90bae5ef SHA512 4f28e36fabcade14f9ae524b8aea19757ceaca9d4ad50c367fe8f58c14c3850efe252df780641159eeb01e96aaba38a9c9c6fe51d21f54a6c4ce33f80c87033f WHIRLPOOL 46f28918e788bfb4ad22f122d3948837fb1134312ee4d111009184cf2e28fcaf250c62427df6de478469fddf5b71be0d3d8677cc9a547598f248bd7fc026334e
 EBUILD luaexpat-1.2.0-r1.ebuild 1327 SHA256 96d8e0dc17a3716b7cf59f66b01c7d0e0ab1bb1decadd81112f74c0fea34b867 SHA512 62f224084350816b9d4672359149f60667c7cb133a9cab8e566a0689caafeafef6fecd4eb111a939a773508bdfe052c2f6caf4401306c66c90e71fac01bbfc2c WHIRLPOOL a78deb45ef09d26ee4065b2bf0ffae257170d5b12ebb503188964286912bb5c0da5ed5de6a3ca00fb8f22ec94908d0bb34fab550a4d403bd0407630bb0816272
-EBUILD luaexpat-1.2.0.ebuild 1369 SHA256 b64ca7a596c19c7ac5c80c2d6cbb90f0e44dd4b65746fdb094b259094ac2b0fd SHA512 84006b31ec84dd7337f5c25ea63d1e0a0b99ac7bf81d223bedc5682f1d3f35a12ac6fb0c5dcb9bca018a01166b5a687d7d19166be2f107fd89a95b92ae93d715 WHIRLPOOL ddd04127c6b30f7f7d427c80f92a256435648e952a87bce9f027c16a6b0fc7d2962a46f28e5f47950eaf32e04312b441e80b7e325db7af752901714f6aeffbe9
-MISC ChangeLog 1684 SHA256 fbb5b207a97d43682e68426f6e5d80402f49e65c2c24613a577e84b9144f1327 SHA512 c119192abf2d895cc9e639d048862104afecfd80e1131312d76e1585bf26daaf554eb1ac7979e90aa446e1c01d7887f0b6e32fff1244bd05d76f1dba1c48bd86 WHIRLPOOL fe608754a89d119e8733ae145f02519db30b1c2a96f32bd88f4091d1a92115fc1507d63f036d8e459ce5e8a57489a21a0581e12b183423dbf530c3251be475c6
+MISC ChangeLog 1778 SHA256 7a63d200bb83fd95a04aa1c713c2535220f86b632690bc297cfe21e466f1130d SHA512 ac1ed9e3f499db97aab27aa7edb71ad6653c74f3c4dda1533f9a8df67a0839f37613c2c83389d38e738905a27a5b6241b2dc2f70854eb9f14390d91dcb18c8a7 WHIRLPOOL e9f3dbe47e37af6772d888da18aaa89ebf77b2beb2a079cbcd8a4a7e072912feef7d29da253456269120778709e80e50fcd8de7345aceb9e522af3b40dc88ae6
 MISC metadata.xml 312 SHA256 30a2b0c1eaee45f4f21aef60fd327a220df7ecb90c506642c701eb9e73f2cfda SHA512 cf1e7954319fa6e9bb0782a834297b5f1a5383262fb6854d4b5f6282618c32dc4b370633d5d4db0dda08b14a16199ef308fe3ad243a878c5d40ed73c590b0fd6 WHIRLPOOL 280873b5786c02c9a2cb2d8a112b9cf05148a40e968213613ccf3f5d4599aa46bd2d60b1b83b1aa67bbbc94ed44ed050008df9f7bddd703287acaf2ad49bc1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZeEdAAoJEO+t9ga+3I3asskH/jRYbKqLhlvGLi3noiDGqj2y
-VGBS5bnTkuEFdZ/fM8NpMQ8wTPs20GldYQHzHLL0TIm0FbqpMAR1jy82wrqsWf2Y
-tNLRW8HTLXHVtrUPx/UNoLLG6NiaVShvkThsw+K89IGqhIZsMiotsAe16tjvSmR5
-fkOPfhchILXw2sOxmZ2T6fWuWWak+1TIAs0SiDLFIud7YAOl81bh/CAGk8xMCW/7
-zxLnCSQZPbCzdAJZInZXKIy+69Vt70SCrRQD4sQhoDIyKLX6mOOYcLwUUK/jsMk0
-aqC4Q7HGuTJNI9dsGIVlHPRtBpHkb8EhCnIQhrUfn3BxoznwwscGd9LSghRRSwA=
-=1LZJ
+iEYEAREIAAYFAlBoNJYACgkQxeMuLWsGW/vbGgCfYqZ4umMvz0ALigVGSc/HNefM
+C3gAniyVj+79ijqTi8lV4uzJDw9Rpdjd
+=LmlW
 -----END PGP SIGNATURE-----