Apache 1.X masking (fix ebuilds to not require apache-1*).

(Portage version: 2.1.2.7)

4 files changed, 14 insertions, 13 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index 92b20916ac40..80d91c7f39ab 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/bugzilla
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.82 2007/04/23 12:47:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.83 2007/05/12 04:20:35 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> bugzilla-2.18.6.ebuild,
+  bugzilla-2.20.4.ebuild, bugzilla-2.22.2.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   23 Apr 2007; Raúl Porcel <armin76@gentoo.org> bugzilla-2.22.2.ebuild:
   ia64 stable
diff --git a/www-apps/bugzilla/bugzilla-2.18.6.ebuild b/www-apps/bugzilla/bugzilla-2.18.6.ebuild
index 2512a4611f2c..1bfcbf03359f 100644
--- a/www-apps/bugzilla/bugzilla-2.18.6.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.18.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.6.ebuild,v 1.10 2007/01/02 22:20:03 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.6.ebuild,v 1.11 2007/05/12 04:20:35 chtekk Exp $
 
 inherit webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.bugzilla.org"
 LICENSE="MPL-1.1 NPL-1.1"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 
-IUSE="apache2"
+IUSE=""
 
 # http://www.bugzilla.org/docs218/html/stepbystep.html to verify dependancies
 # updated list of deps: http://www.bugzilla.org/releases/2.18/release-notes.html
@@ -32,8 +32,7 @@ RDEPEND="
 	dev-perl/perl-ldap
 	>=dev-perl/PatchReader-0.9.4
 	dev-perl/XML-Parser
-	apache2? ( >=net-www/apache-2.0 )
-	!apache2? ( =net-www/apache-1* )"
+	>=net-www/apache-2.0"
 
 src_unpack() {
 	unpack ${A}
diff --git a/www-apps/bugzilla/bugzilla-2.20.4.ebuild b/www-apps/bugzilla/bugzilla-2.20.4.ebuild
index 845bf8cb5216..a18422f48f07 100644
--- a/www-apps/bugzilla/bugzilla-2.20.4.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.20.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.4.ebuild,v 1.1 2007/02/03 23:31:28 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.4.ebuild,v 1.2 2007/05/12 04:20:35 chtekk Exp $
 
 inherit webapp
 
@@ -11,14 +11,13 @@ HOMEPAGE="http://www.bugzilla.org"
 LICENSE="MPL-1.1 NPL-1.1"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="apache2 graphviz mysql postgres"
+IUSE="graphviz mysql postgres"
 
 RDEPEND="
 	>=dev-lang/perl-5.6.1
 	postgres? ( >=dev-perl/DBD-Pg-1.43 )
 	mysql? ( <=dev-perl/DBD-mysql-3.0002 )
-	apache2? ( >=net-www/apache-2.0 )
-	!apache2? ( =net-www/apache-1* )
+	>=net-www/apache-2.0
 	graphviz? ( media-gfx/graphviz )
 	>=dev-perl/AppConfig-1.52
 	>=virtual/perl-CGI-2.93
diff --git a/www-apps/bugzilla/bugzilla-2.22.2.ebuild b/www-apps/bugzilla/bugzilla-2.22.2.ebuild
index b88799f1b856..154542310b22 100644
--- a/www-apps/bugzilla/bugzilla-2.22.2.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.22.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.2.ebuild,v 1.5 2007/04/23 12:47:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.2.ebuild,v 1.6 2007/05/12 04:20:35 chtekk Exp $
 
 inherit webapp
 
@@ -11,14 +11,13 @@ HOMEPAGE="http://www.bugzilla.org"
 LICENSE="MPL-1.1 NPL-1.1"
 KEYWORDS="~alpha ~amd64 ia64 ~ppc ppc64 ~sparc x86"
 
-IUSE="apache2 extras graphviz mysql postgres"
+IUSE="extras graphviz mysql postgres"
 
 RDEPEND="
 	>=dev-lang/perl-5.6.1
 	postgres? ( >=dev-perl/DBD-Pg-1.45 )
 	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
-	apache2? ( >=net-www/apache-2.0 )
-	!apache2? ( =net-www/apache-1* )
+	>=net-www/apache-2.0
 	graphviz? ( media-gfx/graphviz )
 	>=dev-perl/AppConfig-1.52
 	>=virtual/perl-CGI-2.93