cleanup, fixes #218991

Package-Manager: portage-2.1.5_rc6

3 files changed, 21 insertions, 17 deletions

diff --git a/www-apache/mod_ldap_userdir/ChangeLog b/www-apache/mod_ldap_userdir/ChangeLog
index 3a6913e9cd28..d4316eb77eb7 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/ChangeLog,v 1.8 2008/02/02 10:44:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/ChangeLog,v 1.9 2008/04/25 12:20:46 hollow Exp $
+
+  25 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  mod_ldap_userdir-1.1.12.ebuild:
+  cleanup, fixes #218991
 
 *mod_ldap_userdir-1.1.12 (02 Feb 2008)
 
diff --git a/www-apache/mod_ldap_userdir/Manifest b/www-apache/mod_ldap_userdir/Manifest
index e953b85ba821..c6bf6c0f389b 100644
--- a/www-apache/mod_ldap_userdir/Manifest
+++ b/www-apache/mod_ldap_userdir/Manifest
@@ -6,14 +6,14 @@ DIST mod_ldap_userdir-1.1.11.tar.gz 43036 RMD160 ff5793c5c7388445560e07688b74871
 DIST mod_ldap_userdir-1.1.12.tar.gz 46947 RMD160 aea889490f2ab4d6b2bf37da17f531ad7af2bfae SHA1 a06ad104467c6311ac9703548d7f0f33c43eacb9 SHA256 7c43b1d5cdf3d260b97d413150cef5774bf5cfc4f7d2b189fc12c5aa6240d3d0
 DIST mod_ldap_userdir-1.1.5.tar.gz 37203 RMD160 bcc0818a41ef0e7a31231995f94d69a3ffe95bf1 SHA1 c19ac1980bb81437508669f4c9e2948b8b8fde80 SHA256 d8f6a38e4b34d965ca5490ccf5869cec972ce35de4748ce1bbcba8a3ee59c9c7
 EBUILD mod_ldap_userdir-1.1.11.ebuild 1043 RMD160 68398ad0b012622feea40406ada9c8135fcc141f SHA1 4af907226e90dea809f00676b8757ba7d2121d05 SHA256 2bf11ff047c402e35e018d9f5a8c9d4d5c7a3f80c97f0b95eee1d9a33fa50c2b
-EBUILD mod_ldap_userdir-1.1.12.ebuild 1032 RMD160 fa31e6557c6ee5335c644fc12ef76632108a1fed SHA1 c35b3f13921b15f81a9c73e6b064ddeebdbff668 SHA256 52e57f2c051945277ecb727cfb6ae54336f7cefae1bac9053a8ed41dd04b03f2
+EBUILD mod_ldap_userdir-1.1.12.ebuild 986 RMD160 84456924e9f03821441006b3e10a4cacbf11d4ac SHA1 ed94fbd6a77b130b4117999b1e299cda07129d18 SHA256 022dab0e3eb8b7d6f4e4e51605e7f784f73bb43e2062e8a39df62dad5c599dfe
 EBUILD mod_ldap_userdir-1.1.5.ebuild 1050 RMD160 94cecb6c0ddad614696b40a18db22390f8443436 SHA1 74af354f687309e57ab6587d209d79cf443aa688 SHA256 1bc89469b3804f40977e39091b1838e32e996ad1a3b4e5af85fe89efd96a6949
-MISC ChangeLog 3644 RMD160 d2659a0699793c590084eb2bcb6142ce0a622317 SHA1 757e7b44976ac55957c8b7ae97d8293aacdc756a SHA256 1845e6c8e4269b070bdf9362de03dae47de9d74cae9e64f66554ec47900f7317
+MISC ChangeLog 3754 RMD160 09018603a0ccaca9a0668bffcd80336fa8df91d3 SHA1 2f3b074a8c44e22bf63e19058da641f2e6f91985 SHA256 281c2ef3b6aa77f2a88b4acade98bd41b04c4d325384774e0691110e4f3e5e5b
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkekSZwACgkQmPFBzbX68WHqEACbBrbbA+hWNQIe+SyrywN+lsw0
-UlwAn3Bs2slMEcW6pe7U1DOP5sGVkI8z
-=4ydk
+iEYEARECAAYFAkgRzKgACgkQmPFBzbX68WGQ2QCfel2FzghtBexELMFbaLEUgKBQ
+cGgAn2qhTeowI2j6O+4rzZh0LbBziEAz
+=y9d/
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild
index 619ec3aef2c7..ab3ad56f7874 100644
--- a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild
+++ b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.12.ebuild,v 1.1 2008/02/02 10:44:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.12.ebuild,v 1.2 2008/04/25 12:20:46 hollow Exp $
 
 inherit apache-module
 
@@ -10,28 +10,28 @@ SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )
 		net-nds/openldap"
 RDEPEND="${DEPEND}"
 
-DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
+need_apache2_2
 
-APXS2_ARGS="-lldap -llber -c ${PN}.c"
-APACHE2_MOD_CONF="47_mod_ldap_userdir"
+APACHE2_MOD_CONF="47_${PN}"
 APACHE2_MOD_DEFINE="LDAP_USERDIR"
 
-need_apache2_2
+DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
 
 src_compile() {
-	econf || die "econf failed"
-	use ssl && APXS2_ARGS="${APXS2_ARGS} -DTLS=1"
-	apache-module_src_compile
+	econf --with-apxs="${APXS}" \
+		$(use_enable ssl tls) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	apache-module_src_install
-	fperms 600 "${APACHE_MODULES_CONFDIR}"/47_mod_ldap_userdir.conf
+	fperms 600 "${APACHE_MODULES_CONFDIR}"/47_${PN}.conf
 }