Use EAPI=4. Add static-libs USE flag. Patch by Arfrever.

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

4 files changed, 53 insertions, 26 deletions

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 9aaf0e6ab688..ab32f67c2fd7 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX apr-util-1.3.12-bdb-5.2.patch 5199 RMD160 ec3395485cc4f88b0bb191f9ef2cbeb49159606c SHA1 bb990d5d6e74eff65fef22e110792489e683dc7b SHA256 81339f327727775bb88a4530a620b0fd1f94d3fc4c0e65a810931acb638b7913
 DIST apr-util-1.3.11.tar.bz2 607486 RMD160 5b745baf523b99c8fa0501deab4f00d86ca050e5 SHA1 dc71af7684f76d56f06b4fc8763a8606bd861e84 SHA256 13b8446c5ff96ed32293db77689992db18addb1a76d0f6dae29f132dc96dab59
 DIST apr-util-1.3.12.tar.bz2 607646 RMD160 c23f9e8f312edbb4c484c839c071648c79a00140 SHA1 4902165fc5f2f077afbcc7ddf7ebbf61556a1cda SHA256 93976dc2f40d8622c4e9c355f419bb20f2c0dd843ee21a295a092d1c1b950d9c
 EBUILD apr-util-1.3.11.ebuild 2510 RMD160 599ee97079645aef1ef2eeec3707c43ff020aa22 SHA1 e6ccaee867d6183e41a16b7d82518dbb88035e1c SHA256 0cb438b545963fbc89b0305265296ef9d2e512e6e9a270bd97689aa36840f210
-EBUILD apr-util-1.3.12.ebuild 2450 RMD160 166fe377a1acdf26e17dc8e201edf4f2524d4edf SHA1 9ee29a903530e6e6ed7f6bf4ad9c8ac96f127916 SHA256 44c1564c343c3a0248429a88b1f64b19e1fbab30dcbea75fe46ef40ca62af90e
-MISC ChangeLog 21813 RMD160 b7f7520c31895682d58466abe1f2c2306b85ce00 SHA1 b334b72137887b3c1c2412b3c45a0cbba2e606f9 SHA256 130520aeed4815b2b982c574c9ae9f2684f0491c009354aaa8ac01ef2c098df5
+EBUILD apr-util-1.3.12.ebuild 2468 RMD160 f85e49593bbc1021af935b7308b74c41755918a8 SHA1 690446221f35948650bea99f0dd05e21afcf6f77 SHA256 509a3b6d89285ef1039747240cdc77211b7cfbf016965275bfdf4465531d0365
+MISC ChangeLog 21939 RMD160 56a847f7992eb015d98c27b5885b88dfa13fab56 SHA1 89e469375d11a0b5d60c0c74e4551ab754498508 SHA256 97ab161515065842762143c70856774f3230b14f8d334bbd0bae4172785ddc91
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6sSV8ACgkQuQc30/atMkCO/ACgmNMAO35YA9sibG3vlE1AOe+I
-KdoAnArwTdnqfHw7psq4lUR3EZ2EhKJn
-=l9Qo
+iQIcBAEBCgAGBQJOvXU1AAoJEPqDWhW0r/LCdMsQAKXWrcmbiE2pg91phVpeazxj
+a61doTEUanjHnfSU8DswMSRorG/fDWf7PA3xqv4cA2399wZxhaZOQeEznIeGpj3T
+4Zs6nXgaSh0rg4oWtHhoyOY3PiG5NdAAd0NX4/AU6RYQvcLa2dI57l1riOARqx8V
+TJQzHiXmrXYASnvsSTCJg2mQbNPk9kjA9shtDPPFVYAKoa1ztstk2tNBg3CNiO+2
+gF1+PTrF7Klvk3OxBXyzpUi/rS44qX7aUgjAlMdq5E1ljRaTCldZo32n1ar4WWX7
+yxLJLTxMphJvSCfoIqh+DviYGKEab5+3qUOU8o4rbcHL7QiIjGU9zhELbsZZs9U9
+JCrKhPFS0fWeKw4OIAj6tVf130rMKqqB3FDaAeqO6x3EgU+un+3Cc3J/v6QtogOK
+IwY2FqBE0oR+ojnE7uVoHBq0WR+m3rbHmy4Uw8A8IhsBM3tVRRA2vRgEZrIEiXR4
+z1bN6jolmcmB6bPbIUjK0mjqa7sdT0BQReh/nPSgfvM1tiUMP6vcVMAZSe2JsWat
+fcxO91Gk7OlrPT04JPYv1f8DXr/sBfRrPay1zj9aodpY35/o0rhq7N05EZomxRwf
+AG9GXCy/tjT6rjptH5fC5stHGsquvmNK0RS1Y5njZ0KXFPU8BI3M9LA84xSraWiU
+v2C7fSuh3RUNY3hLi1gE
+=EKBV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 574bb7c597af..9555f7b2b290 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.180 2011/10/29 18:36:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.181 2011/11/11 19:17:50 hwoarang Exp $
+
+  11 Nov 2011; Markos Chandras <hwoarang@gentoo.org> apr-1.4.5.ebuild:
+   Use EAPI=4. Add static-libs USE flag. Patch by Arfrever.
 
   29 Oct 2011; Raúl Porcel <armin76@gentoo.org> apr-1.4.5.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #385859
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 4eb49e6c04aa..ddd550db0ac5 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
 DIST apr-1.4.4.tar.bz2 759604 RMD160 3715774150253d024d79fcf3295f39f822229b85 SHA1 d05cd65ec169c06174ca7c8978179289777f8dae SHA256 15372afeb6bba4091c4662600dad8bc51e5e4ff15ce308fac286df8735eb544d
 DIST apr-1.4.5.tar.bz2 754763 RMD160 d2a966c1b143416cd3655cf849cb5d3cb1ca2c5f SHA1 517de5e3cc1e3be810d9bc95508ab66bb8ebe7cb SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e
 EBUILD apr-1.4.4.ebuild 2170 RMD160 1cb5428493b3ec066d4964b29001cd57a2987aaa SHA1 6402cf8e08df62d68a9b85a12ef68e96dad5ed4d SHA256 4cbb2bb0b4139c8e938a497411f61fcb4001b1abe021198f4e62aa8a16bfcaef
-EBUILD apr-1.4.5.ebuild 2170 RMD160 88b6884f3c9ca5f7c38e4d0633fdc43fdb9de328 SHA1 bc6e0881e928b1a16fb9488a8aff36f89985db50 SHA256 fe6eb7e2863068d0cb1d499fa68418566365eb442784ae5b39f10dd02a311da2
-MISC ChangeLog 21594 RMD160 dab5648a7f4e5277e2d7d9c6b107da6f1ea7f7a7 SHA1 675bee7566274b6deb9429bb0edd4fb07bb53737 SHA256 f3a69f8fa1944bdbd8a3acd0d3066fc7bf960b7aa00163d600afcdaf46d532a0
+EBUILD apr-1.4.5.ebuild 2131 RMD160 b5da63b392e7af2c71ceceada6cbaaa6e3bdd4ce SHA1 d18fddb52ba4406128c98f6cd07804aa0c5b157d SHA256 13c591ee66cdfef1d3da5fbcf18925b18f3415ede24255be1897156568d4d7e5
+MISC ChangeLog 21727 RMD160 fc725461824ed7f7c901317a7cdaedce3797c96e SHA1 b6741c3c77402472655c2689eecc26a6ac98d3bd SHA256 327b782b634b10c10be17ab084e338f142e25fd40dac31a0c498d98a27a35bc2
 MISC metadata.xml 453 RMD160 44be42dfd9fe4c26f5655b4a8b78446ae1c073e7 SHA1 d7378602457f126b8448744b2f965853b4a17188 SHA256 c089c114bb8c838899abeb5c1f1c19a495039b30e106363c14e5de83b7e9a1f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6sR7kACgkQuQc30/atMkB8UQCfWs31AUbJdQKz78hwBdIdYC2+
-VIwAnjHJ1E/czt25MNSWwuL1GedI4p8t
-=RLVs
+iQIcBAEBCgAGBQJOvXThAAoJEPqDWhW0r/LCqj8P/1ws+S7L27qLpk5mhq4iJMwY
+hhe+1KefRDUPwUkKjmq3T/1B2AaKUJR7mFD7YZ1taHco5hjDWWtyrh9hmBsXrNjg
+KniJvPKsTDjHwuVetNHORaTIw22xJspg0hQ9qkcQAvPsTUp/fhC8kEEAov8ZO5ge
+Vz14Skl9arC7rFRQtexnzaBVZzcDOJ3Ynz2oeW9JU30jAfXutbNAIFfauHAjPXpD
+qyMI70WoK583MwyBcaDX8tSKkRZtVbMK9ZnyIjFQ3iJE6YicvTf/ovlAmbQiUpjB
+RN9BgoRUb2SRrR2nBzW+2v2QGc4D2UvalOJ23d2V0BYYXzdV0XkJbiuViDV16CY0
+L6lZkfwofBDqETX8MHw8M5+llln9FegpVhWs9qGWjrmlwyj1HRqCSXChBdRj66fI
+jP2YYNPhOMzVLuRtPL2863/nF58wEfyyF125Na4OENtUbIH3d2CiQBWyPhEr5vi5
++LZX3gWXRWvQ6Sho0F/fouTaXf1lNsVnjCS3OcJzsuDzhVzxcdZfZGfIubLsNe4R
+5egnkag7cmB2ktmDU5nkgReHcKPItCYArwsFb4ar5D8G80X2kLsqiQTAAevAyT6b
+qQ3SJqI+LFinHQXBIPZlZooSftWlCFHVsaXRpDLZN6AFvT55i/LCBXj4qRV5GlIn
+9ZA0ei8QWKMZ+TuFruFf
+=BKuv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.4.5.ebuild b/dev-libs/apr/apr-1.4.5.ebuild
index fafc5c9d4ae0..8a243ad11bd9 100644
--- a/dev-libs/apr/apr-1.4.5.ebuild
+++ b/dev-libs/apr/apr-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.5.ebuild,v 1.7 2011/10/29 18:36:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.5.ebuild,v 1.8 2011/11/11 19:17:50 hwoarang Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit autotools eutils libtool multilib
 
@@ -13,13 +13,15 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility +urandom +uuid"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
 RESTRICT="test"
 
 RDEPEND="uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+DOCS=(CHANGES NOTICE README)
+
 src_prepare() {
 	# Ensure that system libtool is used.
 	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
@@ -63,25 +65,27 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use doc; then
-		emake dox || die "emake dox failed"
+		emake dox
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
+	default
 
-	dodoc CHANGES NOTICE README
+	find "${ED}" -name "*.la" -exec rm -f {} +
 
 	if use doc; then
-		dohtml -r docs/dox/html/* || die "dohtml failed"
+		dohtml -r docs/dox/html/*
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -exec rm -f {} +
 	fi
 
 	# This file is only used on AIX systems, which Gentoo is not,
 	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${D}usr/$(get_libdir)/apr.exp"
+	rm -f "${ED}usr/$(get_libdir)/apr.exp"
 }