fix #221653

Package-Manager: portage-2.1.5.2

4 files changed, 28 insertions, 12 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 1951ed1ef1d0..2a5d704cab2f 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.106 2008/01/28 23:51:51 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.107 2008/06/01 11:42:35 hollow Exp $
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> apr-util-1.2.10.ebuild,
+  apr-util-1.2.12.ebuild:
+  fix #221653
 
   28 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
   -files/apr-util-0.9.12-db-4.5.patch, -files/apr-util-0.9.12-linking.patch,
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 3164adb332ab..4f85a663f210 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST apr-1.2.11.tar.gz 1114033 RMD160 8b1c1831cd8281de17f41f84ffc5cfd9b6c35553 SHA1 bde2c8b6e477752bcac4f387ac0de9671cd15d1a SHA256 fc7a14e8ded002c252cf5f3ccce6cd5636f01a85986188e373f9343a174c42ff
 DIST apr-1.2.12.tar.gz 1127522 RMD160 912c34e412b42e678288727b811ba35f03d07b6b SHA1 12ebc5ee6bba6b66b75e25ff8326fd2d2ad8f4ff SHA256 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
 DIST apr-util-1.2.10.tar.gz 654083 RMD160 6d577b04a4d75efcb40e132fddf15faede7b29c1 SHA1 9e136a5492313a0eb3c50154a25da2c99dcabb1b SHA256 8761fec487ff98e7b9d965864125d0468a3d4adf2c91a44834faff3c693e6f47
 DIST apr-util-1.2.12.tar.gz 668292 RMD160 438528fe4d207dc2290de80ccbd2973266853f8a SHA1 7c0d929a3c0b328c257c916408bc2c9d47690fed SHA256 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
 DIST apr_dbd_mysql-r84.c 49110 RMD160 9d665f2e964b09f58b182829563a203f59e16640 SHA1 04c82a4dda00bbeaddc713b29dae826562fc0db6 SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919
-EBUILD apr-util-1.2.10.ebuild 2354 RMD160 28614ab534851abf66c05d58fd156566cdf9805c SHA1 ad072e34c497f00446a5683b9e17644b82cd3f96 SHA256 ac430edff7349e78b99f8d7a7aec3656117b6b4073b9f44d751a4881349f44fc
-EBUILD apr-util-1.2.12.ebuild 2131 RMD160 4fba1628832a9a60c91756e624a9b1bbb4434538 SHA1 1c03b09aa7afcf2ab6933a3a01912adbfe4a546e SHA256 3f943d81a1a57cf4c24538d7db9bebe393d71341c65cc33af686747e96ed9ed4
-MISC ChangeLog 13755 RMD160 dc02b1d3451256aa54763c410af5349f122a40b3 SHA1 f68cf0ef7030e0a26db340e8c49a151b7c7dc7e1 SHA256 1a621543e312a7054f88afb2c4149af64b7ad4972f4bb624066f1cc168e0828f
+EBUILD apr-util-1.2.10.ebuild 2373 RMD160 cfd05aa3a37e36bbe2f3d4053b2c4a56cbfdfbe9 SHA1 49f5fb6cff82d2fa00fe46699123e03e9e5ee37c SHA256 9181619073e95f52a2979dd9fe8d7903de54ca12786209d78453d7287c5133a3
+EBUILD apr-util-1.2.12.ebuild 2150 RMD160 ea6c74ee8f0fc9cd98d40faf0091fc9da516c249 SHA1 493990bc7afa40ed74ddda27222239eefbdd7b60 SHA256 505d853579548ef5b2f1e124a5148bebbca56c437fc7c6da3d62c1b2da4d04bf
+MISC ChangeLog 13870 RMD160 ada0d48953030292cbe8227e9a63c76a80389db4 SHA1 91b1903ce7e8cdab7829426468ac4aadbe56fcd9 SHA256 a365e6f49a9b14ad7fb3bbfde6d7608ea9b0904f9a6b518c7f431c79efeb1ff3
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhCizIACgkQmPFBzbX68WFzLACdEw6ilK7SX1/1ZGE+VZUtDSyp
+xosAn2oVSjNVHRuAIDbWAkC8H1glBBNd
+=82iY
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/apr-util/apr-util-1.2.10.ebuild b/dev-libs/apr-util/apr-util-1.2.10.ebuild
index 204d47bad368..6f4e7fecc6fb 100644
--- a/dev-libs/apr-util/apr-util-1.2.10.ebuild
+++ b/dev-libs/apr-util/apr-util-1.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.10.ebuild,v 1.11 2008/05/19 19:26:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.10.ebuild,v 1.12 2008/06/01 11:42:35 hollow Exp $
 
 inherit autotools eutils flag-o-matic libtool db-use
 
@@ -19,16 +19,17 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x8
 IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
 RESTRICT="test"
 
-DEPEND="dev-libs/expat
+RDEPEND="dev-libs/expat
 	>=dev-libs/apr-${PV}
 	berkdb? ( =sys-libs/db-4* )
-	doc? ( app-doc/doxygen )
 	gdbm? ( sys-libs/gdbm )
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( =virtual/mysql-5* )
 	postgres? ( virtual/postgresql-base )
 	sqlite? ( =dev-db/sqlite-2* )
 	sqlite3? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-libs/apr-util/apr-util-1.2.12.ebuild b/dev-libs/apr-util/apr-util-1.2.12.ebuild
index 4084c27e783f..0ea43b6bb9bb 100644
--- a/dev-libs/apr-util/apr-util-1.2.12.ebuild
+++ b/dev-libs/apr-util/apr-util-1.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.12.ebuild,v 1.2 2008/05/19 19:26:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.12.ebuild,v 1.3 2008/06/01 11:42:35 hollow Exp $
 
 inherit autotools eutils flag-o-matic libtool db-use
 
@@ -15,16 +15,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
 IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
 RESTRICT="test"
 
-DEPEND="dev-libs/expat
+RDEPEND="dev-libs/expat
 	>=dev-libs/apr-${PV}
 	berkdb? ( =sys-libs/db-4* )
-	doc? ( app-doc/doxygen )
 	gdbm? ( sys-libs/gdbm )
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( =virtual/mysql-5* )
 	postgres? ( virtual/postgresql-base )
 	sqlite? ( =dev-db/sqlite-2* )
 	sqlite3? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}