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

(Portage version: 2.1_pre6)

5 files changed, 17 insertions, 17 deletions

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