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

Package-Manager: portage-2.1.2.7

4 files changed, 18 insertions, 17 deletions

diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
index 7c5d54318028..07de81351719 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.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/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.5 2007/01/20 15:19:11 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.6 2007/05/12 04:13:31 chtekk Exp $
 
 inherit depend.apache perl-module webapp
 
@@ -13,16 +13,14 @@ HOMEPAGE="http://apachegallery.dk/"
 
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="apache2"
+IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
 DEPEND="${DEPEND}
 	=dev-lang/perl-5*
-	!apache2? ( >=net-www/apache-1.3.26-r2
-		=www-misc/libapreq-1* )
-	apache2? ( >=net-www/apache-2.0.43-r1
-		=www-misc/libapreq2-2* )
+	>=net-www/apache-2.0.43-r1
+	=www-misc/libapreq2-2*
 	>=media-libs/imlib2-1.0.6-r1
 	dev-perl/URI
 	>=dev-perl/ImageInfo-1.04-r2
@@ -51,13 +49,8 @@ src_install() {
 	insinto ${MY_HOSTROOTDIR}/${PN}/templates/new
 	doins templates/new/*
 
-	if use apache2; then
-		insinto ${APACHE2_VHOSTDIR}
-		doins ${FILESDIR}/76_apache2-gallery.conf
-	else
-		insinto ${APACHE1_VHOSTDIR}
-		doins ${FILESDIR}/76_apache1-gallery.conf
-	fi
+	insinto ${APACHE2_VHOSTDIR}
+	doins ${FILESDIR}/76_apache2-gallery.conf
 
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 	webapp_src_install
diff --git a/www-apps/Apache-Gallery/ChangeLog b/www-apps/Apache-Gallery/ChangeLog
index 849edfdee2e7..9d4dce3c347e 100644
--- a/www-apps/Apache-Gallery/ChangeLog
+++ b/www-apps/Apache-Gallery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/Apache-Gallery
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.23 2007/01/20 15:19:11 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.24 2007/05/12 04:13:31 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org>
+  Apache-Gallery-1.0_rc3.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   20 Jan 2007; Michael Cummings <mcummings@gentoo.org>
   Apache-Gallery-1.0_rc3.ebuild:
diff --git a/www-apps/bugs-bug-genie/ChangeLog b/www-apps/bugs-bug-genie/ChangeLog
index c48245dcc8bc..3b2e2c772eeb 100644
--- a/www-apps/bugs-bug-genie/ChangeLog
+++ b/www-apps/bugs-bug-genie/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/bugs-bug-genie
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugs-bug-genie/ChangeLog,v 1.11 2007/01/02 22:17:23 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugs-bug-genie/ChangeLog,v 1.12 2007/05/12 04:15:15 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org>
+  bugs-bug-genie-1.7.2.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   02 Jan 2007; Renat Lumpau <rl03@gentoo.org> bugs-bug-genie-1.7.2.ebuild:
   Drop mysql dep wrt bug 159781.
diff --git a/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.2.ebuild b/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.2.ebuild
index 47ba0c6d0180..bad17ca62c63 100644
--- a/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.2.ebuild
+++ b/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.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/bugs-bug-genie/bugs-bug-genie-1.7.2.ebuild,v 1.3 2007/01/02 22:17:23 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.2.ebuild,v 1.4 2007/05/12 04:15:15 chtekk Exp $
 
 inherit webapp
 S=${WORKDIR}/bugs_${PV}
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/BUGS_${PV}.zip"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=net-www/apache-1.3
+RDEPEND=">=net-www/apache-2.0
 		virtual/php"
 
 LICENSE="MPL-1.1"