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

(Portage version: 2.1.2.7)

5 files changed, 21 insertions, 44 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/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 \