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

Package-Manager: portage-2.1.2.7

6 files changed, 41 insertions, 74 deletions

diff --git a/www-servers/skunkweb/ChangeLog b/www-servers/skunkweb/ChangeLog
index 044edd0bf6b4..59b83c212d2b 100644
--- a/www-servers/skunkweb/ChangeLog
+++ b/www-servers/skunkweb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/skunkweb
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.16 2007/04/28 17:29:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.17 2007/05/12 03:52:33 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> skunkweb-3.4.0.ebuild,
+  skunkweb-3.4.0-r1.ebuild, skunkweb-3.4.1.ebuild, skunkweb-3.4.3.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> skunkweb-3.4.0-r1.ebuild,
   skunkweb-3.4.1.ebuild, skunkweb-3.4.3.ebuild:
diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest
index 033e7f2b4858..3c9b591f8a02 100644
--- a/www-servers/skunkweb/Manifest
+++ b/www-servers/skunkweb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 100_mod_skunkweb.conf 1727 RMD160 40e158ed5a23553c04c43752f6697a9546a3a0bd SHA1 822d6af3b84bd25de5a2a72a9d22555a3fdfa725 SHA256 9aac3364aba8cd5ec04d92fe193aff709ed2e879944494679acabbac6f938641
 MD5 2843ae875786bb890bad903d0f005381 files/100_mod_skunkweb.conf 1727
 RMD160 40e158ed5a23553c04c43752f6697a9546a3a0bd files/100_mod_skunkweb.conf 1727
@@ -16,26 +13,26 @@ SHA256 3c8077ad2429c0ed083fe8157b7ea19e421c67b433de81b6e9ff9916f76b4abb files/sk
 DIST skunkweb-3.4.0.tar.gz 1944962 RMD160 320d35744ad1240c6d1d5442a825d04f7bb82295 SHA1 15380a59016e177949632641e8c08b246ea4bc4b SHA256 2e671e98705e5dd70922b1e75fb5a287c4179ddb9a207281749956bc2af4e0b9
 DIST skunkweb-3.4.1.tar.gz 1523805 RMD160 ac9ea1dd37796523c5eec528f7896bb2044d646e SHA1 52e29c23daa3307fd104105f8299237fff28cc2f SHA256 0c1371fe00be335b303fdc2739a529d6558ad3feb9e0f095986cc807cc76a1be
 DIST skunkweb-3.4.3.tar.gz 1406288 RMD160 79b18c800847e67bfbefb023f0c193cf2b4f1b04 SHA1 6ee98d679e4619754ea9c2162cf9c739f055f84c SHA256 5a55978c94e62627310dea48f4447308be55439b01c23e0db45cd13b659824af
-EBUILD skunkweb-3.4.0-r1.ebuild 2280 RMD160 f18b76e8baf50fbcf0477dd43a0866f468316096 SHA1 5aa53c0d6664bb00fc533ad4d901b9ceee6f6096 SHA256 1fc2e014cbe9e474e5908f8e02a111a1934ae4260bde525266114c44a5382eb3
-MD5 751692357d21186164a1121b4fbe212d skunkweb-3.4.0-r1.ebuild 2280
-RMD160 f18b76e8baf50fbcf0477dd43a0866f468316096 skunkweb-3.4.0-r1.ebuild 2280
-SHA256 1fc2e014cbe9e474e5908f8e02a111a1934ae4260bde525266114c44a5382eb3 skunkweb-3.4.0-r1.ebuild 2280
-EBUILD skunkweb-3.4.0.ebuild 2639 RMD160 12b97f20ba6d7a15af5b1994c31a0d84830580cc SHA1 be7466b0787ae0bf1e4f4bde4c77c56a698fb1b7 SHA256 14d2ba195cb2c1798cd23d4332b9a7e50359b5d92f4159a863c07e4cc40053f7
-MD5 b5bbb1ab80d9a847f819ece8d09d8e34 skunkweb-3.4.0.ebuild 2639
-RMD160 12b97f20ba6d7a15af5b1994c31a0d84830580cc skunkweb-3.4.0.ebuild 2639
-SHA256 14d2ba195cb2c1798cd23d4332b9a7e50359b5d92f4159a863c07e4cc40053f7 skunkweb-3.4.0.ebuild 2639
-EBUILD skunkweb-3.4.1.ebuild 2277 RMD160 ce310aecc2ff5f72a0f908144d24918a86971e80 SHA1 6822c55e05f5e62133a161614ab6976af5c5187d SHA256 1e0e999e7d9b6f072ab3e4ca0788b8cec413d0d10060ca98c105885aea9b13e4
-MD5 ffb3775760595aac36302b6cbb3af8e2 skunkweb-3.4.1.ebuild 2277
-RMD160 ce310aecc2ff5f72a0f908144d24918a86971e80 skunkweb-3.4.1.ebuild 2277
-SHA256 1e0e999e7d9b6f072ab3e4ca0788b8cec413d0d10060ca98c105885aea9b13e4 skunkweb-3.4.1.ebuild 2277
-EBUILD skunkweb-3.4.3.ebuild 2294 RMD160 852d5b7c6d96e5473baaaf54efa68bfe9e3a15d2 SHA1 3a80910dffa3294d44355de1de69940fbd66e8cb SHA256 05c76c65553b34381649a482cd99878644c139f1d456810c37079ff3c86cc30f
-MD5 d0765c7fd25aa2bf9688e706267440d7 skunkweb-3.4.3.ebuild 2294
-RMD160 852d5b7c6d96e5473baaaf54efa68bfe9e3a15d2 skunkweb-3.4.3.ebuild 2294
-SHA256 05c76c65553b34381649a482cd99878644c139f1d456810c37079ff3c86cc30f skunkweb-3.4.3.ebuild 2294
-MISC ChangeLog 4164 RMD160 2bce6af800d6249311447b6f19ae2f48dc8ee037 SHA1 ab716513cd8b7ed0504829280490ed63517fdf5c SHA256 131d1ad95c08ce8740e7a5ea1f09f22102bc4558ce1f3794ee06b1e1a1fff7c8
-MD5 3d68db4740f02e1a111af659a0986231 ChangeLog 4164
-RMD160 2bce6af800d6249311447b6f19ae2f48dc8ee037 ChangeLog 4164
-SHA256 131d1ad95c08ce8740e7a5ea1f09f22102bc4558ce1f3794ee06b1e1a1fff7c8 ChangeLog 4164
+EBUILD skunkweb-3.4.0-r1.ebuild 2089 RMD160 ffa119e009053b5839fcdd3fe5c493cec6df9b5c SHA1 3860cf76ba387c84834dde2ed2372bccdd7dd3c3 SHA256 6d77a9089b52fce6dc7a4de29863031c940b5b6652b8391c81d2f107b26b5205
+MD5 7b1c965a084b3b4cbc2b4b213c45d6d5 skunkweb-3.4.0-r1.ebuild 2089
+RMD160 ffa119e009053b5839fcdd3fe5c493cec6df9b5c skunkweb-3.4.0-r1.ebuild 2089
+SHA256 6d77a9089b52fce6dc7a4de29863031c940b5b6652b8391c81d2f107b26b5205 skunkweb-3.4.0-r1.ebuild 2089
+EBUILD skunkweb-3.4.0.ebuild 2277 RMD160 568b8ff105073ad88edcb64bdaacd7565db52fa7 SHA1 3f810ce7fbdd205152ee49e11aee32c263420a93 SHA256 c0a645820af8849832f8d38720d54b071dec57e56a3524e9c1d8f5bca2f3600c
+MD5 a887852d8fa8c3dda1e8a2e31c3ff67d skunkweb-3.4.0.ebuild 2277
+RMD160 568b8ff105073ad88edcb64bdaacd7565db52fa7 skunkweb-3.4.0.ebuild 2277
+SHA256 c0a645820af8849832f8d38720d54b071dec57e56a3524e9c1d8f5bca2f3600c skunkweb-3.4.0.ebuild 2277
+EBUILD skunkweb-3.4.1.ebuild 2086 RMD160 702b6ee963954c9ede61d0b9904b58b40de9bc12 SHA1 b31111e6d2d695407a8569f2477db9d0513c7bee SHA256 f9c93e42bf75599f73ccf54b4645f11f713098a5bdc3d1451ed6b29e778b0444
+MD5 73f675c4cf65fb864ccda101827d9bd1 skunkweb-3.4.1.ebuild 2086
+RMD160 702b6ee963954c9ede61d0b9904b58b40de9bc12 skunkweb-3.4.1.ebuild 2086
+SHA256 f9c93e42bf75599f73ccf54b4645f11f713098a5bdc3d1451ed6b29e778b0444 skunkweb-3.4.1.ebuild 2086
+EBUILD skunkweb-3.4.3.ebuild 2103 RMD160 e451e59b634da5b72d0c329fb50e464415c58619 SHA1 43105e84c91951fb16b7646bdedbb28a3fcf969a SHA256 39a9f8c1a850f813ed1322ea272cba25cd41c939c8e00e4d18e99908a7114367
+MD5 e25ae6f94dbaaf1511430a398301218b skunkweb-3.4.3.ebuild 2103
+RMD160 e451e59b634da5b72d0c329fb50e464415c58619 skunkweb-3.4.3.ebuild 2103
+SHA256 39a9f8c1a850f813ed1322ea272cba25cd41c939c8e00e4d18e99908a7114367 skunkweb-3.4.3.ebuild 2103
+MISC ChangeLog 4372 RMD160 e81370404a5b661d23571c05db6869fd172a811d SHA1 efe0045c6705ecc9533b62b11b4b0483e3820505 SHA256 7698c5bc90f18176aeeeffaedf327a1d9ef9a84027fc0555794c0965c5d10547
+MD5 e793c7ebd46a3ca9264c00e22dc02524 ChangeLog 4372
+RMD160 e81370404a5b661d23571c05db6869fd172a811d ChangeLog 4372
+SHA256 7698c5bc90f18176aeeeffaedf327a1d9ef9a84027fc0555794c0965c5d10547 ChangeLog 4372
 MISC metadata.xml 536 RMD160 32fda8c907f275fd179e104389a5b31071f5cc12 SHA1 c3178c3286ebc7315e0698bcb244e3a8718f6d8d SHA256 a43ba1a992096d7d03ca295076a4f31f3d029df9a076e95459b31d87accfdf3c
 MD5 8ed4fe3b3e2b2cde0b1eb44f5767d209 metadata.xml 536
 RMD160 32fda8c907f275fd179e104389a5b31071f5cc12 metadata.xml 536
@@ -52,10 +49,3 @@ SHA256 6eb26c18f0a006d50476b1a03352812b6946c7ba8192ade4d1629f62af0dcd63 files/di
 MD5 51f1ace9c600167065c157d54e9d658a files/digest-skunkweb-3.4.3 247
 RMD160 ce647fe0a4155566494685115315257ab2f57a85 files/digest-skunkweb-3.4.3 247
 SHA256 9289290e7f91ae286bb8c1d31aa9a53d163b9916b453671aeb6320f028e63575 files/digest-skunkweb-3.4.3 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM8FRV3J2n04EauwRAmR8AKCO3/38k1NXeVXTBlUItUprdUJkRwCgmcae
-0WoTGV+wbLICYUSyF9kedVQ=
-=YvhX
------END PGP SIGNATURE-----
diff --git a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild b/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild
index e0c0086d26bf..4d080a62f3de 100644
--- a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.0-r1.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-servers/skunkweb/skunkweb-3.4.0-r1.ebuild,v 1.7 2007/04/28 17:29:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild,v 1.8 2007/05/12 03:52:33 chtekk Exp $
 
 inherit eutils apache-module
 
@@ -10,20 +10,17 @@ SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="apache2 doc"
+IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.2
 		>=dev-python/egenix-mx-base-2.0.4
 		app-admin/sudo"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/mod_skunkweb.so"
 APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
 
-APACHE1_MOD_DEFINE="SKUNKWEB"
 APACHE2_MOD_DEFINE="SKUNKWEB"
 
-APACHE1_MOD_CONF="100_mod_skunkweb"
 APACHE2_MOD_CONF="100_mod_skunkweb"
 
 need_apache
@@ -34,9 +31,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
+	local apxs="${APXS2}"
 
 	econf \
 		--with-user=skunkweb \
diff --git a/www-servers/skunkweb/skunkweb-3.4.0.ebuild b/www-servers/skunkweb/skunkweb-3.4.0.ebuild
index 9a6404b612f9..a5963c440d19 100644
--- a/www-servers/skunkweb/skunkweb-3.4.0.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0.ebuild,v 1.7 2007/04/28 21:48:58 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0.ebuild,v 1.8 2007/05/12 03:52:33 chtekk Exp $
 
 inherit eutils
 
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/skunkweb/${MY_P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="apache apache2 doc"
+IUSE="apache2 doc"
 DEPEND=">=dev-lang/python-2.2
 		>=dev-python/egenix-mx-base-2.0.4
-		apache2? ( >=net-www/apache-2.0.47 )
-		!apache2? ( apache? ( <=net-www/apache-2 ) )"
+		apache2? ( >=net-www/apache-2.0.47 )"
 
 pkg_setup() {
 	enewgroup skunkweb
@@ -25,14 +24,10 @@ pkg_setup() {
 
 src_compile() {
 	local myconf
-	if use apache2; then
+	if use apache2 ; then
 		myconf="${myconf} --with-apxs=/usr/sbin/apxs2"
 	else
-		if use apache; then
-			myconf="${myconf} --with-apxs=/usr/sbin/apxs"
-		else
-			myconf="${myconf} --without-mod_skunkweb"
-		fi
+		myconf="${myconf} --without-mod_skunkweb"
 	fi
 	econf \
 		--with-user=skunkweb \
@@ -54,18 +49,11 @@ src_compile() {
 src_install() {
 	INSTALLING="yes"
 	make DESTDIR=${D} APXSFLAGS="-c" install || die
-	if use apache2; then
+	if use apache2 ; then
 		exeinto /usr/lib/apache2-extramodules
 		doexe SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so
 		insinto /etc/apache2/conf/modules.d
 		newins SkunkWeb/mod_skunkweb/httpd_conf.stub mod_skunkweb.conf
-	else
-		if use apache; then
-			exeinto /usr/lib/apache-extramodules
-			doexe SkunkWeb/mod_skunkweb/mod_skunkweb.so
-			insinto /etc/apache/conf/addon-modules
-			newins SkunkWeb/mod_skunkweb/httpd_conf.stub mod_skunkweb.conf
-		fi
 	fi
 	# dirs --------------------------------------------------------------
 	mkdir -p ${D}/var/{lib,log}/${PN}
diff --git a/www-servers/skunkweb/skunkweb-3.4.1.ebuild b/www-servers/skunkweb/skunkweb-3.4.1.ebuild
index 0b8d0f260758..2c22f1e1a132 100644
--- a/www-servers/skunkweb/skunkweb-3.4.1.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.1.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-servers/skunkweb/skunkweb-3.4.1.ebuild,v 1.3 2007/04/28 17:29:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.1.ebuild,v 1.4 2007/05/12 03:52:33 chtekk Exp $
 
 inherit eutils apache-module
 
@@ -10,20 +10,17 @@ SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="apache2 doc"
+IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.2
 		>=dev-python/egenix-mx-base-2.0.4
 		app-admin/sudo"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/mod_skunkweb.so"
 APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
 
-APACHE1_MOD_DEFINE="SKUNKWEB"
 APACHE2_MOD_DEFINE="SKUNKWEB"
 
-APACHE1_MOD_CONF="100_mod_skunkweb"
 APACHE2_MOD_CONF="100_mod_skunkweb"
 
 need_apache
@@ -34,9 +31,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
+	local apxs="${APXS2}"
 
 	econf \
 		--with-user=skunkweb \
diff --git a/www-servers/skunkweb/skunkweb-3.4.3.ebuild b/www-servers/skunkweb/skunkweb-3.4.3.ebuild
index 2a2fb82b11fe..1147a92ce4b2 100644
--- a/www-servers/skunkweb/skunkweb-3.4.3.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.3.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-servers/skunkweb/skunkweb-3.4.3.ebuild,v 1.4 2007/04/28 17:29:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.3.ebuild,v 1.5 2007/05/12 03:52:33 chtekk Exp $
 
 inherit eutils apache-module
 
@@ -10,20 +10,17 @@ SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apache2 doc"
+IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.2
 		>=dev-python/egenix-mx-base-2.0.4
 		app-admin/sudo"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/mod_skunkweb.so"
 APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
 
-APACHE1_MOD_DEFINE="SKUNKWEB"
 APACHE2_MOD_DEFINE="SKUNKWEB"
 
-APACHE1_MOD_CONF="100_mod_skunkweb"
 APACHE2_MOD_CONF="100_mod_skunkweb"
 
 need_apache
@@ -34,9 +31,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
+	local apxs="${APXS2}"
 
 	econf \
 		--with-user=skunkweb \