Remove Apache1 support (part of fix for #178380).

Package-Manager: portage-2.1.2.7

4 files changed, 21 insertions, 43 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 5bd7fc980867..560fefa2156a 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.29 2007/04/18 17:43:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.30 2007/05/13 20:05:10 chtekk Exp $
+
+  13 May 2007; Luca Longinotti <chtekk@gentoo.org> mod_jk-1.2.21-r2.ebuild,
+  mod_jk-1.2.22.ebuild:
+  Remove Apache1 support (part of fix for #178380).
 
 *mod_jk-1.2.22 (18 Apr 2007)
 
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 63f08e45134b..288f1e0c0ac1 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -8,18 +8,18 @@ RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034
 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034
 DIST tomcat-connectors-1.2.21-src.tar.gz 1334563 RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d SHA1 77b110d91ef0f3574bf74fa1dd37802def361ea6 SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa
 DIST tomcat-connectors-1.2.22-src.tar.gz 1346940 RMD160 a378022f3b817216f71c7236d87479265d4fb6f1 SHA1 9c6ca8df4e54ce4654c0ccd61bdd6bab5982b0da SHA256 024bbc5c9593fc67b6a6e3f318ad6b8b8ceae9d08fc19a1d94dbfefed581d398
-EBUILD mod_jk-1.2.21-r2.ebuild 1727 RMD160 50f59ea84522c99055d908e0e37817530494d73f SHA1 feaaa9e8d043bdaf28db017bfc32214c98b0fde0 SHA256 14c99fbda4d5178dd5fadcb0a0921199832e00b667ae42e0acbbf2877617b1ee
-MD5 7bb814ee477be8b88d458152225b7e9d mod_jk-1.2.21-r2.ebuild 1727
-RMD160 50f59ea84522c99055d908e0e37817530494d73f mod_jk-1.2.21-r2.ebuild 1727
-SHA256 14c99fbda4d5178dd5fadcb0a0921199832e00b667ae42e0acbbf2877617b1ee mod_jk-1.2.21-r2.ebuild 1727
-EBUILD mod_jk-1.2.22.ebuild 1722 RMD160 aeb75e1b50b533d9e3264cf26d82e8a1653030a1 SHA1 c90b5a7dde2e8c9db41ae719ddf09cb476ec6d9d SHA256 eb88d551a046e1808e4fc000fba6823ccc856c2ebe65d5b5cf6ae77431bee814
-MD5 84b71a2fb6608ab457481df5edd15b3f mod_jk-1.2.22.ebuild 1722
-RMD160 aeb75e1b50b533d9e3264cf26d82e8a1653030a1 mod_jk-1.2.22.ebuild 1722
-SHA256 eb88d551a046e1808e4fc000fba6823ccc856c2ebe65d5b5cf6ae77431bee814 mod_jk-1.2.22.ebuild 1722
-MISC ChangeLog 5610 RMD160 cdd4670e438fcb26549afe39a716e3d15b2a3897 SHA1 86c98de10f6ad37e5095113a95225083278c6d75 SHA256 260bfb6f50bd35fca06f30e95fd04002c6765baf9c0fcf36a7afab7e6f7fadef
-MD5 659eb81759e1a300adce2a4aa33aecd9 ChangeLog 5610
-RMD160 cdd4670e438fcb26549afe39a716e3d15b2a3897 ChangeLog 5610
-SHA256 260bfb6f50bd35fca06f30e95fd04002c6765baf9c0fcf36a7afab7e6f7fadef ChangeLog 5610
+EBUILD mod_jk-1.2.21-r2.ebuild 1377 RMD160 45112e9fc41c0bd904454306290e1ebaf356d19f SHA1 aaa8c1dc2fb2ea713db4a6a88fcb1ee8e3b63958 SHA256 038ae7e8427d678e31c9dee66504f502c823e499a4f6a99911f2d3976efb074f
+MD5 d4800d9f2aa5e96edd47d3345c9bae00 mod_jk-1.2.21-r2.ebuild 1377
+RMD160 45112e9fc41c0bd904454306290e1ebaf356d19f mod_jk-1.2.21-r2.ebuild 1377
+SHA256 038ae7e8427d678e31c9dee66504f502c823e499a4f6a99911f2d3976efb074f mod_jk-1.2.21-r2.ebuild 1377
+EBUILD mod_jk-1.2.22.ebuild 1372 RMD160 b275cbdc4047a5804692454c7267b2c6f4f47e4e SHA1 f3b3b78df9570ec1719792cc4f58df5daae18dc5 SHA256 71078ef4db82b258e0971ae24b04be9b6b502b6830be1beff291c612efc97969
+MD5 ea005ca04d740f193fcf52a2f18b5757 mod_jk-1.2.22.ebuild 1372
+RMD160 b275cbdc4047a5804692454c7267b2c6f4f47e4e mod_jk-1.2.22.ebuild 1372
+SHA256 71078ef4db82b258e0971ae24b04be9b6b502b6830be1beff291c612efc97969 mod_jk-1.2.22.ebuild 1372
+MISC ChangeLog 5764 RMD160 0c3fe37f0c2dc67b26a8a48290fdd8b219697511 SHA1 0f1581e5f299c6de192b768d9f2e3c77fcce515e SHA256 d34a8be669b6448389f213f4a120716596fc2d45cf836e93d204fc6b257efb59
+MD5 398f7412733318ee155d010948c0489d ChangeLog 5764
+RMD160 0c3fe37f0c2dc67b26a8a48290fdd8b219697511 ChangeLog 5764
+SHA256 d34a8be669b6448389f213f4a120716596fc2d45cf836e93d204fc6b257efb59 ChangeLog 5764
 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
 MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
diff --git a/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild b/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild
index 58845ab231bd..1fb7f1b8121e 100644
--- a/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.21-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/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild,v 1.2 2007/03/08 19:16:39 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild,v 1.3 2007/05/13 20:05:10 chtekk Exp $
 
 inherit apache-module autotools
 
@@ -18,10 +18,6 @@ IUSE=""
 
 S="${WORKDIR}/${MY_P}/native"
 
-APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
-APACHE1_MOD_CONF="88_${PN}"
-APACHE1_MOD_DEFINE="JK"
-
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="JK"
@@ -38,12 +34,8 @@ src_unpack() {
 }
 
 src_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-
 	econf \
-		--with-apxs=${apxs} \
+		--with-apxs=${APXS2} \
 		--with-apr-config=/usr/bin/apr-config \
 		|| die "econf failed"
 	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
@@ -56,11 +48,6 @@ src_install() {
 
 	# call the nifty default src_install :-)
 	apache-module_src_install
-
-	if ! use apache2 ; then
-		sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \
-			|| die "Could not update jk-workers.properties for apache"
-	fi
 }
 
 pkg_postinst() {
diff --git a/www-apache/mod_jk/mod_jk-1.2.22.ebuild b/www-apache/mod_jk/mod_jk-1.2.22.ebuild
index 601e8710f796..531727f7841b 100644
--- a/www-apache/mod_jk/mod_jk-1.2.22.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.22.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-apache/mod_jk/mod_jk-1.2.22.ebuild,v 1.1 2007/04/18 17:43:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.22.ebuild,v 1.2 2007/05/13 20:05:10 chtekk Exp $
 
 inherit apache-module autotools
 
@@ -18,10 +18,6 @@ IUSE=""
 
 S="${WORKDIR}/${MY_P}/native"
 
-APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
-APACHE1_MOD_CONF="88_${PN}"
-APACHE1_MOD_DEFINE="JK"
-
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="JK"
@@ -38,12 +34,8 @@ src_unpack() {
 }
 
 src_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-
 	econf \
-		--with-apxs=${apxs} \
+		--with-apxs=${APXS2} \
 		--with-apr-config=/usr/bin/apr-config \
 		|| die "econf failed"
 	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
@@ -56,11 +48,6 @@ src_install() {
 
 	# call the nifty default src_install :-)
 	apache-module_src_install
-
-	if ! use apache2 ; then
-		sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \
-			|| die "Could not update jk-workers.properties for apache"
-	fi
 }
 
 pkg_postinst() {