Redux a bit code complexity in latest ebuild.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

3 files changed, 56 insertions, 21 deletions

diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index 90fe0dcb10e0..9f22f0a97a37 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,13 +1,28 @@
-AUX libdbi-drivers-0.8.1-oci8.diff 695 SHA256 23a2c8819f9f80548f2c933278c844d03dec35e8500883f25ab4b7d5f4b7c523 SHA512 f8b4c1e4dbbae71b8a4f5400717767a71643b6112482be3cf59bbae94451a1f2a2d9fd1c721377a9eca0c9e687de97fcd69316ebd0b74fc5d26cd794191c9fb6 WHIRLPOOL 7cac7080e27e44ab49e105eb90d8345bf151bb6fdc7a8d5e9063c8ccde7f511972834f6873822f831fef6cb8bdc011cd58e86631d74562225b7aeb339939e35b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libdbi-drivers-0.8.3-doc-build-fix.patch 566 SHA256 ef18cdb0e5338d29bcdbbf9839bd64283d067bfe3eed3d4af3eb58fa29a316ec SHA512 060a254af1664de2e2c3eca18336c4f1460372a734dfe4ceeb9eeceb1d0686fe93b7f8336d37a8220d6903b16df4837d511d60b4c8b1093eb85fd81b57bb4a31 WHIRLPOOL a9fc78ec7a6dace052bc0160f9d4afa090fbab82b7297cbded4374850a4b5436c493be86de9a7a210e1bf83916d5700303632271cab204d09cdf8a29c0125221
 AUX libdbi-drivers-0.8.3-firebird-fix.patch 1374 SHA256 8e94e8dcc9445c887c7f3defdc3ed049d683f539c01d5a5007b158c3c8e0f97c SHA512 4595beee6ce1d58c92567e88cc2d92c4fbdf3a717879b7c4d6e2bc8fb3676d9721ae41d15a5a4222df1b2e8cbb9b1d76cd510adb9c5bf7e2a08c4e2dc06afaac WHIRLPOOL bed1b2dc561ac191c49400398c40cce789e24c7cd44586b8e0d7a88d87c24e217e232ad622f91411d5912686c81500fe662ad6ab4c7c70d84fde1518c8d8c06f
 AUX libdbi-drivers-0.8.3-oracle-build-fix.patch 485 SHA256 67d088a16f91f77a377eeae1fe8d1fa30540fcf5beb0566d1146fe56cbbd3dec SHA512 028ca89ef13c1c83dc7afcad752cd56407a97cb641d2b2d29c27ff19b9c0399ecd8f7ef2d79bfd0538012636ca1412c3d494e2d9bbf92be2200f6c740062224f WHIRLPOOL 89fbc30e204502714e6d56389ceeaa866950c8d14c9a8c8884a19779420a85c4f24de8a3d4fec69196fecd6a11033adae842a0fcee244d8f3e49871ab151621b
-DIST libdbi-drivers-0.8.1.tar.gz 1147446 SHA256 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd SHA512 90f9909f87a540fbd317812a3fa1f121c42544d56ced838c72c5668122ebb070408aeb57fb5394766dd15ee4ff2309c73df5a837370f12af5750aa27721051f2 WHIRLPOOL 11dcac53d0f337eaec579575cbfa9ea7547834b893428dcd62889285d9df00cdba3fbc0c117872129c317d9ef9152519f75cc2c2df4c9ebf8e5e7535ab198269
 DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 SHA512 c2cb76234b9137cc4a05af42a69ea7d5b08586287378406cbd4d114598598057f29cccb368bfbe0f86e19846ceab88ed636cccff6555ef9f7eebbb98bbcd3824 WHIRLPOOL fc8df681ccdf6995727b0bf7aa315090dc4af2849c02e6b78913f6d5ecdc51c5e60b7eba3f515050a4ae93e74dfa7f1dcc1f7aca7fe3c12e3f02ecfd04184700
-EBUILD libdbi-drivers-0.8.1-r1.ebuild 2205 SHA256 e3c0cbf40cd105eb6b07d44eb32feb78157f9d2a944ec17502a139920ab0c74d SHA512 f95c881620194c2344f2216e449da6645b71112496af4133b23f31b00affe7d3ca4372ae6b22a1f3710f32e7eba4ab7e564f4b2ddf219cfb97d9d3931c1c3bf6 WHIRLPOOL 2cc19fadebc555ebec995ac0fb95473d0c6120c77877acc94678e816930ed4f952698653b2da4b826bb3e3467212abf1e638192d2911b3c10199300b779fcfb1
-EBUILD libdbi-drivers-0.8.1-r2.ebuild 2602 SHA256 62624f7ac8dca1e1e9a8a9232515e4c1d4460df2690420165c91979f444c1ddb SHA512 02a0861e1c7cf9c0235a981390e45f48f5971eebcf80a876ac99dacf32a91bfda0d4a542cbbb3d93b7722a3b86418a663da8e501230dd97b2bac5cafbd8fa962 WHIRLPOOL cce0dacafac9b9977ade4c51c94843b21c0171e2e3e4e1b0894450eea070986019b444ba655741aaf38d26ab837f38721a378ff9f786fb09aa6cd7a3c003b3aa
-EBUILD libdbi-drivers-0.8.3-r1.ebuild 2923 SHA256 b7e52dd52cd7eca2352f08ac9e229d0fc39fe4372e9ee728f3cdad181a0f2086 SHA512 d42aa7fc1d073f5c43fb47eafbba867fd9d16e2040d2b66d0fe192fda2e6a631b12bdcd5ec4d10c80585fcdda84ebe914858e53ce269816fa3afbb12be4c73d7 WHIRLPOOL af8fde68b5248088d3c9cf67490418649d935892f3a4a43590661e21d7722a2f8aec40058bbe3afe95e5eef776e2e790d7a0ed6ad4accc7c542c9bd8d2a2c29c
-EBUILD libdbi-drivers-0.8.3-r2.ebuild 2944 SHA256 ac1e16230fc46695ec3c9cdfcda8d52712b316a56d04245550830d2ec90a993f SHA512 c71b91624634928616623d52e7cd396e9a1ff12e0042a2145380f7566d9130569eb49ad0c2c4e7c575df173c214181540cc14f6d4192223cb828fd69104feb62 WHIRLPOOL 09583527d4e86b49b7a8f3c2846df741e8a353ddb3e996e8d2c9aec3d78225cdde0d4af6741c11f277bb180c7cec855dd1af0336e6a40bfaeb6bae915e7d929d
+EBUILD libdbi-drivers-0.8.3-r2.ebuild 2035 SHA256 0905831ec3de49666fe7869eb0328dd32bf7d5fc3d6f1f494c1d7af3dc47db08 SHA512 a68f1a26177bb4a6a3795c8d2a8959ae380ab26d573d3a075d71c934243f2bf28e12ed8c80984c5265943bc322c2943d6b00854143e8667f532fb586ca724948 WHIRLPOOL f56810a179add96f63a57b7ac21973a558ac815acd978ad887887e586ee1cbd4de6ddc0815358ba0b916b0953f20fc6f867f67a560475698ab5995d3b61f6c1e
 EBUILD libdbi-drivers-0.8.3.ebuild 2902 SHA256 28eddda938a27d6190e03f065f332bbc913af8b7d6bf79a94189f1d7b3af9b55 SHA512 50177c2278a54b699c9bd67f2abc1167ad23c74cd15a208b9f4a75ea976351a6f6d82042958dad0d62616641f34ec768a7cec4479406492cde1b9b675a676a44 WHIRLPOOL 6ebe10e652caeaab0d16865c3150c3de2a43ba91c39fdb0f6a5f54c2c24f2d2857db8a14da2b41fc767ca99dd39a1af9dadd499ce5bd552a568b36550231902e
-MISC ChangeLog 7659 SHA256 9a4fc9afccc965f6d7831cf640f4c588566ffb0428fd43dd6949aaa668ac98ca SHA512 49de98e9b02417055dd8f62c7ca5ff0f62765f35f1980ca6523e33b9d3c3714bf93638a874f8cbce071438361557b10dd292c5fca5c74ef538233c95a20b4586 WHIRLPOOL 197a939ae3b5a126ae446135391607201dccfdc3bf51def8aa884ac81c402cd13e898947776c074e972fc24f4b07ee5cc585e8fa7aa5393aaba4ab3e1aa18b54
+MISC ChangeLog 8141 SHA256 3a38a304fa1f9725b3b7a6b713ee9bce87fae7edfe6011e455cd9d53703ebd68 SHA512 c751e41fad09be6112c88030ac0e9211bb6ea709b349040cd8e090432d361fe45f9e5389e56ee68a81fb6dcd5b69b2d74a65bfaf46b812e315a59f541cdd2511 WHIRLPOOL 88daf696a8e99e878c238817faad84793e68878168d651c53b8490a852cb9051b4a44ee41790a4ff7cc2438075eabea27fe862f28f5d46a5ebf13595910cdf9f
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQUijYAAoJEOSiRoyO7jvo3OEP/0Dz5suEyGIklbL5SrGQcnSR
+hsVmpwqhAWqFZLO0777YOF1WGHlQD79Ge8TekuQHzHrJGdcCDk9WIHWAv0gdj5Tb
+emcnMprRZZIlDUlBNUke6ezZD+XeJ2oofTmNIsIg11C++0yvXNdmKnEj+b6FH7W2
+TNlDCD3bWWaAn/jFrECUcDJBSKRrFHMw5l6sKn5TmPaZOqS9VoD0XMrtsih0JBdM
+pgeInE1dOkH/1R0QemudlJ31stwdcsNVdkOX63X1hP10Byf2lUbvgbJ7b6omrT6C
+5ydiLnwZx5rucCxjK7w2mm2gbtakgemCf7zZkanZHSIBj5OUauc0yfABF+2rqFOW
+OcLaVIQTqGWUDP62hiLY0ytFcJZXni48GsMk/iopUpCK+nK2pwPKgbM4bH9JgkWm
++xiI6jAracZKdfl6a74RKJ0bruhOt3IF6HkO5HLPGy7btK95Q0GiUp+T8taDtsxx
+Mhb4I/q0ExdBSXZ8YW8+a22ZfQySgRamycJfGfWXc2Ifu3cyaiceLmGxai+CkJQz
+mBtQq5RwTqQmvTmMWbfgo6Py/7K3X4dXq7Z3SmNA9Xl2aIeYckoDTbWVrhpGyqlZ
+XBOORDS/Be2BWXzXR7AfCaj0I8IeX1h7E4cYXrblBwhrJem2wr2RrLBTl0M3oQeM
+0usPMjVChlaFhbEWYuq0
+=l68R
+-----END PGP SIGNATURE-----
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index ed9592951dbf..0ad1e57e0da9 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX dbi.pc.in 244 SHA256 9c7969c72ad8bb5371fd8c30a163408ed5dcd2a9523b6274b2e7e7f2fb9eba40 SHA512 6865b37e8d84d7a95b0ae482d9b1cb486ab7abbe726e699099ea4368d418f64b6d8cb02ecd4d1473f643aa5d715c57817a9496bd8950461921d5db4ff4272ef9 WHIRLPOOL 4d170682fe48f03bbbd9deb51281b36cecfbf5d5fdcd4705215c43509668dd61b96f2efd9f1bc55b9761ada74327730f93ee9cf18cd187dbfa4e36aca1f3dabc
 AUX libdbi-0.8.1-pkg-config.patch 202 SHA256 835cfe7ce28f0859c092848404a2d35820a876fff9023115dcfac9d671c96daa SHA512 a2cc1ab269365984bc32d569d2884f8dbed0171a8b3614790f96084aabb24f42c947bd4971d16d52fe96b50f945bf876143ddba3b5fbd09e1644363626b449b1 WHIRLPOOL 5bbf2bf453565dae1cd0e4556b6f8ff67b4a718e97f35eaca7d8a84a9eced738042990d4064178f84b53a3eb6fdd0d2a5878c1a868317b10c135a1ed95c2708f
 AUX libdbi-0.8.3-doc-build-fix.patch 526 SHA256 eda2d5fe104894f946f80cf2067f6340d0908996d2459a405becd44d9c3be388 SHA512 4b2c13c940a52a3a37c9b511b6a4b25237d091031beef507b9653528691bdafdd5a4035a69918408b8044f73cf62fdc9d47808e7ee6711f248d0fcc77c4c5424 WHIRLPOOL 312863deb14681ea5b4c77ce07a779b6158e82be25a44ca5992003ac11112d44d39a6ac881c1b5efb4c38dd0d1c14083ff40d7b559c705de73b76aee349b8342
@@ -7,6 +10,23 @@ DIST libdbi-0.8.3.tar.gz 1060714 SHA256 72e41856bebb1da7b1fd1e6369358c294913f329
 DIST libdbi-0.8.4.tar.gz 1045247 SHA256 ef38db616f0752ccb09b8ba2eac471722369b8ded50b153c25e238cac2c8de99 SHA512 7e28945a96483785840511df23fd8177383a1f9ee3929df863a3e458550b6eb943f8f86f49ede167125ce64daf718b14c40ac09b99e2e8eea474eecf7ee6a530 WHIRLPOOL 6f5770d2a10e02e0e16c6354548d053811ca0205f2942c2e261cd189097423d49a0f2f86afb8308fe7b3cbfde34afc9cb0e16c2fd1471c733c44802235879064
 EBUILD libdbi-0.8.1.ebuild 931 SHA256 6613224f5c5443f9002baae1fe11ca63124418c7348b53f304361bdbdfe04db2 SHA512 05f1290c5e07b0c037d084e4eb3579bd72fcc7afef7000244ced4ce13308ebf9c6038c4af0b75df62f47525d361bfb1501fecaa87b729f9bb95c58e8529f3fa4 WHIRLPOOL f8dbdebe06e4b64618ae97993e53434f2b46cef9da2e9d6a98c40584e7b919e3c35c11aa8b48954c5da45e4aa2551826e9a049fb049d933de17a0fab7bc0af16
 EBUILD libdbi-0.8.3.ebuild 1384 SHA256 1925fb38655868d732674878da6bc05253316893fbcb03ef4a06ba998de23840 SHA512 00382f4c79baab0de8bbbcea275f281988077e620b3d79cccb85376bc329e088826c387fb9a5a5276b74d043ec208b0e8c5ade4ab4a89cabf3ae4887e1e32c0c WHIRLPOOL 9c70c2cb30940bc5490c9ee248aad694e6200d6efe48b1c2f9fd44616b3aa33bcae08a917b08187c0377f9af332026a58f2ade4c668f1a346ec442e4b0c0f88e
-EBUILD libdbi-0.8.4.ebuild 1482 SHA256 002a876deb6b5e76c5830440462ebd491ac0f1ef8ff8c31522dac6edf1254822 SHA512 4b73b6f7ce8f0e3bafd8b73ad28968fade68cf8226d5951c8e2547212d5f92d20530fa820b45bf4f7188763191b89f56ca3c8136f2258597bce4b1c9af0a70e0 WHIRLPOOL 235f4ca5b74132538dff6171f207f087c6b5bfc87add13522b643bfce003e71deb68c78bd8c7cc65541cddc7fc34fedff4baa507fa98c3f6bea1c9d137297497
+EBUILD libdbi-0.8.4.ebuild 1387 SHA256 7f6ed805e90d1d78aaa72cdc0b6ec0c0955d8aa31556345de28aa3dff196339d SHA512 eda03c6188b18f4f99bdc1a58c8f8064c58e1642d49ee9b0db037b4e7b0877afda990188fa63c018dff265c70173c7d6dd2b867044793d347281bf094d322c3d WHIRLPOOL 4a4dfb98fc02729ca39039a574593a78fa2b3a468ef6c23a8ff171354879a012743ee191602b2010bc45e6dd7acebba09d9890993a97b02d9e99c4c350bc88bc
 MISC ChangeLog 5008 SHA256 09a51ebdd9555209880a5224ace815cd17894fcb44e2e6bde8416fd7241c72a2 SHA512 de5eedfe1ebcf650d0c5396d63990059a587a24cc162cfc88c2c067c4b3edf0e8c8b32194fcb0b356d29568390e2ec13db6a0fdf0ae569a5f6a35adbe6c2be5a WHIRLPOOL 2e8cf3e1ac22176eb2c7bcce9c1d7fd9b6492f8afb41457bf9c06de6042653a98d81dbcf128ed7755c1e273e17a9fb8a5466e88ecfefde53e025e4d8b437212f
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQUifXAAoJEOSiRoyO7jvoTZkQAJI5WpXzijMGhOt0hzld7P1p
++N/+yH4wooBF4/hbKCM3CLaCuWb8rMNqwq2Le4qflRjV06udEH0JDxlrqWVtRfak
+Z0xahDwCNe5G6uNYZmkjZkusk2xFmNrVttS1NBQgegMnCP9BgCyZBZbBxvbfsNTk
+H2a904eC4d+Dp4Dn4n9dfZ5SoYXwxfPLKv6DemgArInfRmh2/E9yYNLSh35dw/3w
+gYtDEkCdGHUZc0QN0vH3S3/5hrPEZKtS5cgGOW8Q8yzetdqIxLxHTVmllSOtHuYc
+LKVRJQhnR7/H5gw6BcDDmYBPeR4YBTF9al6VV05gkVOcbTVrQ7D8ivIPRXfFOyxe
+Js8cVYGtG99bsRm/4ZUd868x1u7+nAlpTLupbV+ed1ju3TWT0ZrIr7CgXV8/Q/aO
+v9YW5tm1bmKW32On0mz8nggk/x+5kcYir4xMjZbSHAyzQ6KsCOsiknplHCUeaAvC
+DZ6UL80VwD0pHMjtlpEesVVJLmf6wA/EKioQGadC0Q18VZvBF9wuilPCNDht9g9R
+CFWosRP3A2u+YT0ZoFqK7Ra/xSowiePKxB+pOR2bFAmB7l58oaVMxV9irGY93KNi
+ACFwaOTJ0p7qZTPPaN13pewGBPGdM7F+Fy+irC7Z/sIaXAqCvdTmGD3VGp58MPn5
+RLiqfOcRX1JejB1y1foc
+=9wFz
+-----END PGP SIGNATURE-----
diff --git a/dev-db/libdbi/libdbi-0.8.4.ebuild b/dev-db/libdbi/libdbi-0.8.4.ebuild
index 70f747cd68ff..ec71603a1166 100644
--- a/dev-db/libdbi/libdbi-0.8.4.ebuild
+++ b/dev-db/libdbi/libdbi-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.4.ebuild,v 1.3 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.4.ebuild,v 1.4 2012/09/13 18:37:05 scarabeus Exp $
 
 EAPI=4
 
@@ -10,16 +10,21 @@ DESCRIPTION="libdbi implements a database-independent abstraction layer in C, si
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libdbi.sourceforge.net/"
 LICENSE="LGPL-2.1"
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4
-		virtual/pkgconfig
-		doc? ( app-text/openjade )
-		${RDEPEND}"
-PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist
+
 IUSE="doc"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 SLOT=0
 
+DOCS="AUTHORS ChangeLog README README.osx TODO"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/pkgconfig
+	doc? ( app-text/openjade )
+"
+PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist
+
 src_unpack() {
 	unpack ${A}
 	chown -R portage:portage "${S}"
@@ -40,13 +45,8 @@ src_configure() {
 	econf $(use_enable doc docs)
 }
 
-src_compile() {
-	emake || die "emake failed"
-}
-
 src_install () {
-	emake install DESTDIR="${ED}" || die "make install failed"
-	dodoc AUTHORS ChangeLog README README.osx TODO
+	default
 
 	# syslog-ng requires dbi.pc
 	insinto /usr/$(get_libdir)/pkgconfig/