Updated dependencies on apr and apr-util to prevent upgrade/downgrade cycles

Package-Manager: portage-2.1_pre6

6 files changed, 32 insertions, 32 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 9925d14d7b8d..bbadc9907518 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -31,24 +31,24 @@ SHA256 356004a57895403a62071ab5bad0f2ea0eb8ba0c7f290880336de6ed48b4e597 apache-2
 MD5 8523c2d699f3e179775df99f510ad323 apache-2.0.54-r16.ebuild 13045
 RMD160 02f00b8076a072eae23f96bc405cc5dbd206755e apache-2.0.54-r16.ebuild 13045
 SHA256 e62e402d035f7b2c56508bea278b0d7b512359d349274244804f6208a9d8f33f apache-2.0.54-r16.ebuild 13045
-MD5 be59fbc220730a0212fbf6f34a1a6652 apache-2.0.54-r30.ebuild 12930
-RMD160 39cb147f6db9d7d64207124000c09c89abc85a89 apache-2.0.54-r30.ebuild 12930
-SHA256 01cb3644a174f831ee50e7f0f645678f4275714708be80a81e0876725c10c60b apache-2.0.54-r30.ebuild 12930
-MD5 17f7420f9957d17a514ee70bc4786a25 apache-2.0.54-r31.ebuild 13375
-RMD160 52e207e76c61d66934d886904fbc0090f313c5f6 apache-2.0.54-r31.ebuild 13375
-SHA256 a9c4dc3f5083f17f60ca09f9d50eeff7799272348f1c82dcf537cc2e5cc3efc2 apache-2.0.54-r31.ebuild 13375
+MD5 a89727816dd4a977941623bb39595a5f apache-2.0.54-r30.ebuild 13031
+RMD160 d2c45e68dbd7aa229f9e11d1d0877dcf7dec85e3 apache-2.0.54-r30.ebuild 13031
+SHA256 d1f5e72faaef0edf35ef8d67fd70f6a1974c3f733715444482188116eb2550bc apache-2.0.54-r30.ebuild 13031
+MD5 be1cdde2979274910c9435322e0288be apache-2.0.54-r31.ebuild 13478
+RMD160 4e7e51be4538d94e59e1328f43067b2e73dced46 apache-2.0.54-r31.ebuild 13478
+SHA256 12105c9b75b05b76a7279b723624a5c52b5eff7fca4b439327120cd20016684f apache-2.0.54-r31.ebuild 13478
 MD5 e1e33b99a1b8f95a419f0e95a6ebb2dc apache-2.0.54-r9.ebuild 12595
 RMD160 f895408b50d3d6ae1eb1203aa1fa62ec7b4963fc apache-2.0.54-r9.ebuild 12595
 SHA256 ead56d4310f2920a7c8b0e57895cde1e1cbebaf14496c17a7a393d29ad0f7d68 apache-2.0.54-r9.ebuild 12595
-MD5 dd51c3afe05262ec8243d43b8f800d98 apache-2.0.55-r1.ebuild 13372
-RMD160 b5c01391ee0a0e7d3e5e9c99b2ad8af3812176f2 apache-2.0.55-r1.ebuild 13372
-SHA256 f2392d16809ced1641b3e4b74fc551e1e4cc24a6db776269ff27d6d7322a4b7c apache-2.0.55-r1.ebuild 13372
-MD5 88112e04a7efe7ccccd0dd29fa5ab877 apache-2.0.55-r2.ebuild 13385
-RMD160 c05b508fdd5c1c1aea00683aa0111d27509e898c apache-2.0.55-r2.ebuild 13385
-SHA256 a3826d6649134059db2235caabf4a76b0e6d63e4aa482cd1b9e4ecba8188733c apache-2.0.55-r2.ebuild 13385
-MD5 2eef71adb67bd3ddf3f8c4743a5ebe6a apache-2.0.55.ebuild 13370
-RMD160 621677a89b2efc48a78fab130594d871f8f74e1c apache-2.0.55.ebuild 13370
-SHA256 b9048c96a2f8103c755b9640fb25993eddbb3cf49134ea7703cea0d2a58c4f5e apache-2.0.55.ebuild 13370
+MD5 760634ce6afefa245a2a801ea9740b95 apache-2.0.55-r1.ebuild 13436
+RMD160 d1deeccd2253916410c3dbe28b6ebce7ca6d2056 apache-2.0.55-r1.ebuild 13436
+SHA256 48e6e548e85f303e4508a29d611781344c758e6c2cbbb3786cd24e5efc3de7d8 apache-2.0.55-r1.ebuild 13436
+MD5 54f8c2d9e8aa5b5a52ca0e56aa996811 apache-2.0.55-r2.ebuild 13446
+RMD160 30142f6c42eca65bb328c90b31d96e9b15f0923b apache-2.0.55-r2.ebuild 13446
+SHA256 0619df76df2ca0a3fe6a6a16f46df6bd440a8b64261756016c22534b8b018449 apache-2.0.55-r2.ebuild 13446
+MD5 acd45c4eb92641bc5847ae4c641d46cb apache-2.0.55.ebuild 13433
+RMD160 913335508cc2c039256fe34418e8ea5a0be962f5 apache-2.0.55.ebuild 13433
+SHA256 ff9880879b77c8dbeda8f8ce834fed0ac0c0cdd3769ae6afbbef1c2779cd60c4 apache-2.0.55.ebuild 13433
 MD5 55f89417afabbd3e95fd74c2af364c4e apache-2.2.0-r1.ebuild 14076
 RMD160 0ab52a7488ed52f48c9ddf828682f3e1cf8e252c apache-2.2.0-r1.ebuild 14076
 SHA256 f0087fa3698f2059316416fa58f2b95a46a7a34dbd569c5d9bd9822b7e170a4c apache-2.2.0-r1.ebuild 14076
diff --git a/net-www/apache/apache-2.0.54-r30.ebuild b/net-www/apache/apache-2.0.54-r30.ebuild
index d7a7eda8748c..f5127cb01a51 100644
--- a/net-www/apache/apache-2.0.54-r30.ebuild
+++ b/net-www/apache/apache-2.0.54-r30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.4 2005/09/23 04:36:51 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.5 2006/04/17 16:19:12 vericgar Exp $
 
 inherit eutils gnuconfig
 
@@ -21,8 +21,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
+	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 ~dev-libs/apr-0.9.6 )
+	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 ~dev-libs/apr-0.9.6 )
 	dev-libs/expat
 	net-www/gentoo-webroot-default
 	app-misc/mime-types
diff --git a/net-www/apache/apache-2.0.54-r31.ebuild b/net-www/apache/apache-2.0.54-r31.ebuild
index a1e267b8c59a..3da2781bb2a7 100644
--- a/net-www/apache/apache-2.0.54-r31.ebuild
+++ b/net-www/apache/apache-2.0.54-r31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.18 2005/12/19 22:52:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.19 2006/04/17 16:19:12 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -21,8 +21,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
+	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 ~dev-libs/apr-0.9.6 )
+	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 ~dev-libs/apr-0.9.6 )
 	dev-libs/expat
 	net-www/gentoo-webroot-default
 	app-misc/mime-types
diff --git a/net-www/apache/apache-2.0.55-r1.ebuild b/net-www/apache/apache-2.0.55-r1.ebuild
index 25982994c437..1a51e1f34717 100644
--- a/net-www/apache/apache-2.0.55-r1.ebuild
+++ b/net-www/apache/apache-2.0.55-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55-r1.ebuild,v 1.9 2006/01/19 12:23:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55-r1.ebuild,v 1.10 2006/04/17 16:19:12 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -21,8 +21,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.7
-	~dev-libs/apr-util-0.9.7
+	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 )
+	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 )
 	dev-libs/expat
 	net-www/gentoo-webroot-default
 	app-misc/mime-types
diff --git a/net-www/apache/apache-2.0.55-r2.ebuild b/net-www/apache/apache-2.0.55-r2.ebuild
index 26b1b7f382bc..5f88d7d96d94 100644
--- a/net-www/apache/apache-2.0.55-r2.ebuild
+++ b/net-www/apache/apache-2.0.55-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55-r2.ebuild,v 1.1 2006/04/01 02:59:31 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55-r2.ebuild,v 1.2 2006/04/17 16:19:12 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -21,8 +21,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.7
-	~dev-libs/apr-util-0.9.7
+	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 )
+	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 )
 	dev-libs/expat
 	net-www/gentoo-webroot-default
 	app-misc/mime-types
diff --git a/net-www/apache/apache-2.0.55.ebuild b/net-www/apache/apache-2.0.55.ebuild
index d18f5627abf7..11e32b4043de 100644
--- a/net-www/apache/apache-2.0.55.ebuild
+++ b/net-www/apache/apache-2.0.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55.ebuild,v 1.10 2006/01/17 01:35:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55.ebuild,v 1.11 2006/04/17 16:19:12 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -21,8 +21,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.7
-	~dev-libs/apr-util-0.9.7
+	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 )
+	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 )
 	dev-libs/expat
 	net-www/gentoo-webroot-default
 	app-misc/mime-types