remove apache-1 cruft

Package-Manager: portage-2.1.3.9

3 files changed, 20 insertions, 24 deletions

diff --git a/www-apache/mod_ldap_userdir/ChangeLog b/www-apache/mod_ldap_userdir/ChangeLog
index 68353c7a8ebb..0c03e8b6cecf 100644
--- a/www-apache/mod_ldap_userdir/ChangeLog
+++ b/www-apache/mod_ldap_userdir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_ldap_userdir
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/ChangeLog,v 1.4 2007/08/04 17:20:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/ChangeLog,v 1.5 2007/09/21 21:18:34 hollow Exp $
+
+  21 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  mod_ldap_userdir-1.1.5.ebuild:
+  remove apache-1 cruft
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org>
   mod_ldap_userdir-1.1.11.ebuild:
diff --git a/www-apache/mod_ldap_userdir/Manifest b/www-apache/mod_ldap_userdir/Manifest
index 34e9d5990628..23d5af0df57d 100644
--- a/www-apache/mod_ldap_userdir/Manifest
+++ b/www-apache/mod_ldap_userdir/Manifest
@@ -11,14 +11,14 @@ EBUILD mod_ldap_userdir-1.1.11.ebuild 1044 RMD160 6caad7c13683a4ef87dbe9cbf8b16f
 MD5 2ec5f296e24edab117b74088b9d72c34 mod_ldap_userdir-1.1.11.ebuild 1044
 RMD160 6caad7c13683a4ef87dbe9cbf8b16f1e67649110 mod_ldap_userdir-1.1.11.ebuild 1044
 SHA256 398ebcceab62dbc2380edfd56a72139bc7c4cedb30d12a81f053968fc47a1ca0 mod_ldap_userdir-1.1.11.ebuild 1044
-EBUILD mod_ldap_userdir-1.1.5.ebuild 1292 RMD160 af59d04fb1c49572d9124767de20ad213af8317a SHA1 a6dbd355c44eb04aa938368f0bbc54e69d878779 SHA256 6fd7dad6ec98b23d1f54fd58ca209b5fff578c51dd69fc9fbf4a73d0b8817594
-MD5 aceeeb0f8160375d6df7ae0089c9442f mod_ldap_userdir-1.1.5.ebuild 1292
-RMD160 af59d04fb1c49572d9124767de20ad213af8317a mod_ldap_userdir-1.1.5.ebuild 1292
-SHA256 6fd7dad6ec98b23d1f54fd58ca209b5fff578c51dd69fc9fbf4a73d0b8817594 mod_ldap_userdir-1.1.5.ebuild 1292
-MISC ChangeLog 3117 RMD160 acc113ddb722eefa16c32d1f7a23eae4886b1110 SHA1 376c0a7d22f7f8cee89314da9904d713487dcf0d SHA256 a4273c5102f01d1c67fca82d41c4238e0f279177643475584a8c009ebb56dfcf
-MD5 c16d711c95b1719d7e69a2dc34eafd85 ChangeLog 3117
-RMD160 acc113ddb722eefa16c32d1f7a23eae4886b1110 ChangeLog 3117
-SHA256 a4273c5102f01d1c67fca82d41c4238e0f279177643475584a8c009ebb56dfcf ChangeLog 3117
+EBUILD mod_ldap_userdir-1.1.5.ebuild 1051 RMD160 3da020ff1b840a94eae0d9045e052a782491e219 SHA1 81953b89af618ef7223f2750e1513d3b77c5194a SHA256 2a93e8adb2bac907c43eb2c946240c3ebb18ffd10089dcf0a347af6dbeae39a3
+MD5 fdf25b59b9b20b1bdab5d01486631cb3 mod_ldap_userdir-1.1.5.ebuild 1051
+RMD160 3da020ff1b840a94eae0d9045e052a782491e219 mod_ldap_userdir-1.1.5.ebuild 1051
+SHA256 2a93e8adb2bac907c43eb2c946240c3ebb18ffd10089dcf0a347af6dbeae39a3 mod_ldap_userdir-1.1.5.ebuild 1051
+MISC ChangeLog 3223 RMD160 09a7a0f3535e3df22c9f39d9da4c38c5452ff24e SHA1 3c4be76e375dd9665a5212c949db75335b458a72 SHA256 65bac0b00313f75d263ecba7ab0ba9756efe0d97740ccf0d119b5cfe6e5c874f
+MD5 0f15b2ada9bf604c3d95bb9959544268 ChangeLog 3223
+RMD160 09a7a0f3535e3df22c9f39d9da4c38c5452ff24e ChangeLog 3223
+SHA256 65bac0b00313f75d263ecba7ab0ba9756efe0d97740ccf0d119b5cfe6e5c874f ChangeLog 3223
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
@@ -30,9 +30,9 @@ MD5 1059291dfb83cdd50a4f6c91586f56ba files/digest-mod_ldap_userdir-1.1.5 265
 RMD160 1fb7ddad377792464fe31cc41ae8292b839279e8 files/digest-mod_ldap_userdir-1.1.5 265
 SHA256 c558fa29fd1055bd0c578e81479928063f48d922eeca6d2921693693dac62e91 files/digest-mod_ldap_userdir-1.1.5 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGtLV1I1lqEGTUzyQRAurAAKC8NY1KVFpkcdch1QLguYMkD180lgCgsmjJ
-f5B2atcmvBvU1aro3kzVaQk=
-=aH8x
+iD8DBQFG9DUzmPFBzbX68WERAtFQAJ46CXiT0O0oU2YULUS9vUdnQLIGJACghLQK
+HgBaAun34LRFoYIdt47uM1E=
+=d/3S
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
index 7940ad51de84..31324d2e0c93 100644
--- a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
+++ b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.5.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_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild,v 1.1 2007/07/29 15:02:39 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild,v 1.2 2007/09/21 21:18:34 hollow Exp $
 
 inherit apache-module
 
@@ -19,9 +19,6 @@ RDEPEND="${DEPEND}"
 
 DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
 
-APACHE1_MOD_CONF="47_mod_ldap_userdir"
-APACHE1_MOD_DEFINE="LDAP_USERDIR"
-
 APACHE2_MOD_CONF="47_mod_ldap_userdir"
 APACHE2_MOD_DEFINE="LDAP_USERDIR"
 
@@ -32,17 +29,12 @@ src_compile() {
 	use ssl && myargs="${myargs} -DTLS=1"
 	myargs="${myargs} -c ${PN}.c"
 
-	if use apache2 ; then
-		APXS2_ARGS="${myargs}"
-	else
-		APXS1_ARGS="${myargs}"
-	fi
+	APXS2_ARGS="${myargs}"
 
 	apache-module_src_compile
 }
 
 src_install() {
 	apache-module_src_install
-	use apache2 && fperms 600 "${APACHE2_MODULES_CONFDIR}"/$(basename ${APACHE2_MOD_CONF}).conf
-	use apache2 || fperms 600 "${APACHE1_MODULES_CONFDIR}"/$(basename ${APACHE1_MOD_CONF}).conf
+	fperms 600 "${APACHE2_MODULES_CONFDIR}"/$(basename ${APACHE2_MOD_CONF}).conf
 }