remove apache-1 cruft

Package-Manager: portage-2.1.3.9

3 files changed, 21 insertions, 29 deletions

diff --git a/www-apache/mod_auth_nufw/ChangeLog b/www-apache/mod_auth_nufw/ChangeLog
index 2bfce6cef74f..948433a25828 100644
--- a/www-apache/mod_auth_nufw/ChangeLog
+++ b/www-apache/mod_auth_nufw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_auth_nufw
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.2 2007/08/04 17:14:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.3 2007/09/21 21:07:07 hollow Exp $
+
+  21 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  mod_auth_nufw-2.2.0.ebuild:
+  remove apache-1 cruft
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org>
   +files/50_mod_auth_nufw.conf,
diff --git a/www-apache/mod_auth_nufw/Manifest b/www-apache/mod_auth_nufw/Manifest
index b36809fb6198..3378625ba38d 100644
--- a/www-apache/mod_auth_nufw/Manifest
+++ b/www-apache/mod_auth_nufw/Manifest
@@ -10,14 +10,14 @@ MD5 fb078cf917fe304f04ed71b4042d91ae files/mod_auth_nufw-2.2.0-configure_in.patc
 RMD160 caeb6b9c6ead11bf9ee53836799441779b43cd7f files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 SHA256 c02cea50dde1c26ceeef3dcbf66508d02d648493cd7f780711068a26e3577e2a files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 DIST mod_auth_nufw-2.2.0.tar.gz 42703 RMD160 75469adb58e24dd06837eea1256cf2069e76ac93 SHA1 46a37b29d5c2e1bce320505cd8221a582d3cc0d8 SHA256 e97379c4b032bb8109df048ca675646ff9c9df934c3089c882ba2f1fef49e173
-EBUILD mod_auth_nufw-2.2.0.ebuild 1738 RMD160 46a72a575f94338b80c2f3bee1bd0e8ed25d9565 SHA1 62bed6ae4ce0e777958e9c24235e9386f8270aa8 SHA256 eb50ac4461be8fdd67e9e3e47a5ad2dd6e3031eb1cc5e73908f7c89461d9f198
-MD5 b40941b5ae68d081b4a76005e9fa5eb8 mod_auth_nufw-2.2.0.ebuild 1738
-RMD160 46a72a575f94338b80c2f3bee1bd0e8ed25d9565 mod_auth_nufw-2.2.0.ebuild 1738
-SHA256 eb50ac4461be8fdd67e9e3e47a5ad2dd6e3031eb1cc5e73908f7c89461d9f198 mod_auth_nufw-2.2.0.ebuild 1738
-MISC ChangeLog 1291 RMD160 05369c5dd2189f2bbcdfc7364860e3cf6d12ea6d SHA1 f96281da7281ed77de561c58600181b728396768 SHA256 2798040bbfd40f2ee977c262f564c9e6130a43d6671b1cec8122a95858bcaf62
-MD5 95509ef9ea3fee0bc9387cfa5998029d ChangeLog 1291
-RMD160 05369c5dd2189f2bbcdfc7364860e3cf6d12ea6d ChangeLog 1291
-SHA256 2798040bbfd40f2ee977c262f564c9e6130a43d6671b1cec8122a95858bcaf62 ChangeLog 1291
+EBUILD mod_auth_nufw-2.2.0.ebuild 1570 RMD160 9dfabe016e5189e2d078eb33a8995d63ff842058 SHA1 815569426b007d2acce158c0cfb434b1e7169c16 SHA256 84fb1ad57a54eaa1dea9334297bc3ff78d90e33df44ac8c86a63198eb1f9f77e
+MD5 878e8aa4372c26d33a7a95fb9d22b109 mod_auth_nufw-2.2.0.ebuild 1570
+RMD160 9dfabe016e5189e2d078eb33a8995d63ff842058 mod_auth_nufw-2.2.0.ebuild 1570
+SHA256 84fb1ad57a54eaa1dea9334297bc3ff78d90e33df44ac8c86a63198eb1f9f77e mod_auth_nufw-2.2.0.ebuild 1570
+MISC ChangeLog 1394 RMD160 2b2eea3adb891891e329ee137c3d365e42bd58f2 SHA1 197f89b5a4de712577325362868f494af52f1a63 SHA256 e8416bb57d24a21a710b1483a1c4a5f522fc2ae361b59039fbd492e6674cc413
+MD5 b4ebc87203dbbe490d6e8a9ba01357a4 ChangeLog 1394
+RMD160 2b2eea3adb891891e329ee137c3d365e42bd58f2 ChangeLog 1394
+SHA256 e8416bb57d24a21a710b1483a1c4a5f522fc2ae361b59039fbd492e6674cc413 ChangeLog 1394
 MISC metadata.xml 298 RMD160 42658edeb89d62bf18bc9562280953153dcb182a SHA1 d9e6e505b41289470f4f5ff83db6768b0dbda994 SHA256 3f0c5e1607b53756bf87acea7196a98866f254aaec52a86001eb949d3d96bccc
 MD5 6139eed6578304a312c52508728fde77 metadata.xml 298
 RMD160 42658edeb89d62bf18bc9562280953153dcb182a metadata.xml 298
@@ -26,9 +26,9 @@ MD5 2bd7a0b4020a8dd098d0de86ec309ce1 files/digest-mod_auth_nufw-2.2.0 256
 RMD160 b5c1c516320c8dd74c0e591014b8b4c28c5d4177 files/digest-mod_auth_nufw-2.2.0 256
 SHA256 0575961c3411e6e8adfb250393a98eb6588757cf24b22a22b5b41c3e055bf872 files/digest-mod_auth_nufw-2.2.0 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGtLQeI1lqEGTUzyQRAqCNAJsFGDdDWKlWFFJPnw4MtY0tdyiiiACdHL2E
-Epor5fHapB8ZWIQQXSIPqr4=
-=gPD7
+iD8DBQFG9DKFmPFBzbX68WERAmEuAKCYaJSALEjMLZJTXLRF/PD41PQYJwCggFM7
+diN6fy+ey/yF6d9shi23m+U=
+=ia1t
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
index 1ec1a80cc613..d2a811171bef 100644
--- a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
+++ b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.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_auth_nufw/mod_auth_nufw-2.2.0.ebuild,v 1.1 2007/07/29 16:07:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild,v 1.2 2007/09/21 21:07:07 hollow Exp $
 
 inherit eutils apache-module autotools
 
@@ -20,10 +20,6 @@ DEPEND="=dev-libs/apr-0*
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_FILE="mod_auth_nufw.so"
-
-APACHE1_MOD_CONF="50_${PN}"
-APACHE1_MOD_DEFINE="AUTH_NUFW"
-
 APACHE2_MOD_CONF="50_${PN}"
 APACHE2_MOD_DEFINE="AUTH_NUFW"
 
@@ -55,19 +51,11 @@ src_unpack() {
 src_compile() {
 	cd "${S}"
 
-	local apx
-	if [[ ${APACHE_VERSION} -eq '1' ]] ; then
-		apx=${APXS1}
-	else
-		apx=${APXS2}
-	fi
-
-	econf \
-		$(use_with apache2 apache20) \
+	econf --with-apache20 \
 		$(use_with ldap ldap-uids) \
 		$(use_with mysql) \
-		--with-apxs=${apx} \
-		CPPFLAGS="-I$(apr-config --includedir) ${CPPFLAGS}" \
+		--with-apxs=${APXS2} \
+		CPPFLAGS="-I$($(apr_config) --includedir) ${CPPFLAGS}" \
 		|| die "econf failed"
 	emake || die "emake failed"
 }