Remove Apache1 support, fix Apache2 support.

Package-Manager: portage-2.1.2.7

9 files changed, 26 insertions, 98 deletions

diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog
index 9b3a8353d390..f6cde82aba32 100644
--- a/net-www/mod_auth_pam/ChangeLog
+++ b/net-www/mod_auth_pam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_auth_pam
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.19 2007/01/20 11:16:56 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.20 2007/05/12 10:57:59 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/10_mod_auth_pam_ap1.conf,
+  -files/mod_auth_pam-1.1.1-compile-fix.patch, mod_auth_pam-1.1.1-r1.ebuild,
+  mod_auth_pam-1.1.1-r2.ebuild:
+  Remove Apache1 support, fix Apache2 support.
 
   20 Jan 2007; Christian Heim <phreak@gentoo.org>
   mod_auth_pam-1.1.1-r1.ebuild, mod_auth_pam-1.1.1-r2.ebuild:
diff --git a/net-www/mod_auth_pam/files/10_mod_auth_pam_ap1.conf b/net-www/mod_auth_pam/files/10_mod_auth_pam_ap1.conf
deleted file mode 100644
index 674175b62571..000000000000
--- a/net-www/mod_auth_pam/files/10_mod_auth_pam_ap1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-<IfDefine AUTH_PAM>
-  <IfModule !mod_auth_pam.c>
-    LoadModule pam_auth_module          modules/mod_auth_pam.so
-  </IfModule>
-</IfDefine>
-
-### EXAMPLE 1: authentificate against a single PAM account
-###
-#	<IfModule mod_auth_pam.c>
-#		AuthPAM_Enabled on
-#
-#		AuthType Basic
-#		AuthName "secure area"
-#		Require user webmaster
-#	</IfModule>
-
-### EXAMPLE 2: authentificate against a a PAM group, so, that each user
-###            beeing in this group may access this "secure area"
-###
-#	<IfModule mod_auth_sys_group.c>
-#		AuthPAM_Enabled on
-#
-#		AuthType Basic
-#		AuthName "secure area"
-#		Require group staff
-#	</IfModule>
-
-# vim:syntax=apache
diff --git a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1 b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
index 43652b8aae55..c6afce1046ca 100644
--- a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
+++ b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r1
@@ -1,6 +1,3 @@
-MD5 b1e36b5df18a177e671785f7f4c8001c mod_auth_pam-1.1.1.tar.gz 9575
-RMD160 1072354a7a5bc42bfcbae0e935a5e444db280233 mod_auth_pam-1.1.1.tar.gz 9575
-SHA256 2c252f5f4932c8cfd398d1dfdf6245f6528ab8ae505c23c16a289c3626042b3f mod_auth_pam-1.1.1.tar.gz 9575
 MD5 ab873520ddd2fee7d480dfd53e464e0a mod_auth_pam-2.0-1.1.1.tar.gz 11456
 RMD160 4dbc4daae2e696b44767577d63ccf24aec397f2c mod_auth_pam-2.0-1.1.1.tar.gz 11456
 SHA256 21c55e3a3539e05782654d4dc6f12345b0a4eac29425c20c41f540260866977b mod_auth_pam-2.0-1.1.1.tar.gz 11456
diff --git a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2 b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2
index 43652b8aae55..c6afce1046ca 100644
--- a/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2
+++ b/net-www/mod_auth_pam/files/digest-mod_auth_pam-1.1.1-r2
@@ -1,6 +1,3 @@
-MD5 b1e36b5df18a177e671785f7f4c8001c mod_auth_pam-1.1.1.tar.gz 9575
-RMD160 1072354a7a5bc42bfcbae0e935a5e444db280233 mod_auth_pam-1.1.1.tar.gz 9575
-SHA256 2c252f5f4932c8cfd398d1dfdf6245f6528ab8ae505c23c16a289c3626042b3f mod_auth_pam-1.1.1.tar.gz 9575
 MD5 ab873520ddd2fee7d480dfd53e464e0a mod_auth_pam-2.0-1.1.1.tar.gz 11456
 RMD160 4dbc4daae2e696b44767577d63ccf24aec397f2c mod_auth_pam-2.0-1.1.1.tar.gz 11456
 SHA256 21c55e3a3539e05782654d4dc6f12345b0a4eac29425c20c41f540260866977b mod_auth_pam-2.0-1.1.1.tar.gz 11456
diff --git a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-compile-fix.patch b/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-compile-fix.patch
deleted file mode 100644
index 2e95c8d17bba..000000000000
--- a/net-www/mod_auth_pam/files/mod_auth_pam-1.1.1-compile-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- mod_auth_pam.c	2002-08-08 15:47:33.000000000 +0200
-+++ mod_auth_pam.c	2005-02-17 08:31:13.812819720 +0100
-@@ -231,13 +231,11 @@
- 
- static command_rec auth_pam_cmds[] = {
-   { "AuthFailDelay", (const char*(*)())auth_fail_delay, 0, OR_AUTHCFG, TAKE1,
--    "number of micro seconds to wait after failed authentication attempt. defau
--lt is 0" },
-+    "number of micro seconds to wait after failed authentication attempt. default is 0" },
-   { "AuthPAM_Authorative", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
-     "no longer in use -- see AuthPAM_FallThrough instead" },
-   { "AuthPAM_FallThrough", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
--    "on|off - determines if other authentication methods are attempted if this
--one fails; default is off" },
-+    "on|off - determines if other authentication methods are attempted if thisone fails; default is off" },
-   { "AuthPAM_Enabled", (const char*(*)())auth_enable, NULL, OR_AUTHCFG, FLAG,
-     "on|off - determines if PAM authentication is enabled; default is on" },
-   { 0 }
diff --git a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild
index 2f386c483301..5fde88f79f1c 100644
--- a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild
+++ b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-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/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild,v 1.15 2007/01/20 11:16:56 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r1.ebuild,v 1.16 2007/05/12 10:57:59 chtekk Exp $
 
 inherit eutils apache-module
 
@@ -15,14 +15,9 @@ IUSE=""
 DEPEND="sys-libs/pam"
 RDEPEND="${DEPEND}"
 
-APXS1_ARGS="-c ${PN}.c -lpam"
 APXS2_ARGS="-c ${PN}.c -lpam"
-
 APACHE2_EXECFILES=".libs/mod_auth_sys_group.so"
 
-APACHE1_MOD_CONF="10_${PN}_ap1"
-APACHE1_MOD_DEFINE="AUTH_PAM"
-
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="AUTH_PAM"
 
@@ -30,30 +25,26 @@ DOCFILES="INSTALL README doc/*"
 
 need_apache
 
-SRC_URI="apache2? ( http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz )
-		!apache2? ( http://pam.sourceforge.net/mod_auth_pam/dist/${P}.tar.gz )"
+SRC_URI="http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz"
 
-use apache2 && S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	use apache2 || epatch "${FILESDIR}/${P}-compile-fix.patch"
-	use apache2 && sed -i -e 's/servicename = "httpd"/servicename = "apache2"/' "${PN}.c"
-	use apache2 || sed -i -e 's/servicename = "httpd"/servicename = "apache"/' "${PN}.c"
+	sed -i -e 's/servicename = "httpd"/servicename = "apache2"/' "${PN}.c"
 }
 
 src_compile() {
 	apache-module_src_compile
-	use apache2 && ${APXS2} -c mod_auth_sys_group.c
+	${APXS2} -c mod_auth_sys_group.c
 }
 
 src_install() {
 	apache-module_src_install
 	insinto /etc/pam.d
-	use apache2 && newins "${FILESDIR}/apache2.pam" apache2
-	use apache2 || newins "${FILESDIR}/apache2.pam" apache
+	newins "${FILESDIR}/apache2.pam" apache2
 }
 
 pkg_postinst() {
diff --git a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild
index fe9adf9cab03..4ff702d754c8 100644
--- a/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild
+++ b/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.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/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild,v 1.2 2007/01/20 11:16:56 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/mod_auth_pam-1.1.1-r2.ebuild,v 1.3 2007/05/12 10:57:59 chtekk Exp $
 
 inherit eutils apache-module
 
@@ -15,14 +15,9 @@ IUSE=""
 DEPEND="sys-libs/pam"
 RDEPEND="${DEPEND}"
 
-APXS1_ARGS="-c ${PN}.c -lpam"
 APXS2_ARGS="-c ${PN}.c -lpam"
-
 APACHE2_EXECFILES=".libs/mod_auth_sys_group.so"
 
-APACHE1_MOD_CONF="10_${PN}_ap1"
-APACHE1_MOD_DEFINE="AUTH_PAM"
-
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="AUTH_PAM"
 
@@ -30,30 +25,26 @@ DOCFILES="INSTALL README doc/*"
 
 need_apache
 
-SRC_URI="apache2? ( http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz )
-		!apache2? ( http://pam.sourceforge.net/mod_auth_pam/dist/${P}.tar.gz )"
+SRC_URI="http://pam.sourceforge.net/mod_auth_pam/dist/${PN}-2.0-${PV}.tar.gz"
 
-use apache2 && S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	use apache2 || epatch "${FILESDIR}/${P}-compile-fix.patch"
-	use apache2 && epatch "${FILESDIR}/${P}-service_name.patch"
-	use apache2 || sed -i -e 's/servicename = "httpd"/servicename = "apache"/' "${PN}.c"
+	epatch "${FILESDIR}/${P}-service_name.patch"
 }
 
 src_compile() {
 	apache-module_src_compile
-	use apache2 && ${APXS2} -c mod_auth_sys_group.c
+	${APXS2} -c mod_auth_sys_group.c
 }
 
 src_install() {
 	apache-module_src_install
 	insinto /etc/pam.d
-	use apache2 && newins "${FILESDIR}/apache2.pam" apache2
-	use apache2 || newins "${FILESDIR}/apache2.pam" apache
+	newins "${FILESDIR}/apache2.pam" apache2
 }
 
 pkg_postinst() {
diff --git a/net-www/mod_scgi/ChangeLog b/net-www/mod_scgi/ChangeLog
index eea9a8090f6a..09ffd17cf1c7 100644
--- a/net-www/mod_scgi/ChangeLog
+++ b/net-www/mod_scgi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/mod_scgi
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.17 2007/01/14 19:59:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.18 2007/05/12 11:00:59 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> mod_scgi-1.10.ebuild:
+  Remove Apache1 support, fix Apache2 support.
 
   14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
   -files/1.2/20_mod_scgi.conf, files/20_mod_scgi.conf, -mod_scgi-1.2.ebuild,
diff --git a/net-www/mod_scgi/mod_scgi-1.10.ebuild b/net-www/mod_scgi/mod_scgi-1.10.ebuild
index 9ddb0cdc1b64..c340dd2e42a7 100644
--- a/net-www/mod_scgi/mod_scgi-1.10.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.10.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/net-www/mod_scgi/mod_scgi-1.10.ebuild,v 1.2 2007/01/14 19:59:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.10.ebuild,v 1.3 2007/05/12 11:00:59 chtekk Exp $
 
 inherit apache-module
 
@@ -18,22 +18,11 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P/mod_}"
 
-APXS1_S="${S}/apache1"
-APACHE1_MOD_FILE="${S}/apache1/${PN}.so"
-APACHE1_MOD_CONF="20_mod_scgi"
-APACHE1_MOD_DEFINE="SCGI"
-
 APXS2_S="${S}/apache2"
 APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so"
 APACHE2_MOD_CONF="20_mod_scgi"
 APACHE2_MOD_DEFINE="SCGI"
 
-need_apache
-
-DOCFILES="PKG-INFO LICENSE.txt CHANGES"
+DOCFILES="PKG-INFO LICENSE.txt CHANGES apache2/README"
 
-if use apache2 ; then
-	DOCFILES="${DOCFILES} apache2/README"
-else
-	DOCFILES="${DOCFILES} apache1/README"
-fi
+need_apache