Cleanup.

(Portage version: 2.1.2_rc4-r8)

3 files changed, 22 insertions, 17 deletions

diff --git a/net-www/mod_ldap_userdir/ChangeLog b/net-www/mod_ldap_userdir/ChangeLog
index 4f3a48e6563f..84f11524d92a 100644
--- a/net-www/mod_ldap_userdir/ChangeLog
+++ b/net-www/mod_ldap_userdir/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_ldap_userdir
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/ChangeLog,v 1.14 2006/06/04 20:00:59 vericgar Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/ChangeLog,v 1.15 2007/01/14 17:08:55 chtekk Exp $
+
+  14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/1.1.4-r1/47_mod_ldap_userdir.conf, files/47_mod_ldap_userdir.conf,
+  mod_ldap_userdir-1.1.5.ebuild:
+  Cleanup.
 
   04 Jun 2006; Michael Stewart <vericgar@gentoo.org>
   -mod_ldap_userdir-1.1.1.ebuild, -mod_ldap_userdir-1.1.4.ebuild,
diff --git a/net-www/mod_ldap_userdir/files/47_mod_ldap_userdir.conf b/net-www/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
index b4c48d217073..9bed1105ce05 100644
--- a/net-www/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
+++ b/net-www/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
@@ -1,6 +1,6 @@
-<IfDefine LDAPuserdir>
+<IfDefine LDAP_USERDIR>
   <IfModule !mod_ldap_userdir.c>
-    LoadModule ldap_userdir_module	extramodules/mod_ldap_userdir.so
+    LoadModule ldap_userdir_module	modules/mod_ldap_userdir.so
   </IfModule>
 </IfDefine>
 
diff --git a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
index 4f538f0c58d5..57f487d45866 100644
--- a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
+++ b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
@@ -1,38 +1,38 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild,v 1.5 2006/06/04 18:34:42 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild,v 1.6 2007/01/14 17:08:55 chtekk Exp $
 
 inherit apache-module
 
-IUSE="apache2 ssl"
-DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
-HOMEPAGE="http://horde.net/~jwm/software/mod_ldap_userdir/"
 KEYWORDS="ppc x86"
 
+DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
+HOMEPAGE="http://horde.net/~jwm/software/mod_ldap_userdir/"
 SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
+LICENSE="GPL-1"
+SLOT="0"
+IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )
 		net-nds/openldap"
 RDEPEND="${DEPEND}"
-LICENSE="GPL-1"
-SLOT="0"
 
 DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
 
-APACHE1_MOD_CONF="1.1.4-r1/47_mod_ldap_userdir"
+APACHE1_MOD_CONF="47_mod_ldap_userdir"
 APACHE1_MOD_DEFINE="LDAP_USERDIR"
 
-APACHE2_MOD_CONF="1.1.4-r1/47_mod_ldap_userdir"
+APACHE2_MOD_CONF="47_mod_ldap_userdir"
 APACHE2_MOD_DEFINE="LDAP_USERDIR"
 
 need_apache
 
 src_compile() {
 	local myargs="-lldap -llber"
-	useq ssl && myargs="${myargs} -DTLS=1"
+	use ssl && myargs="${myargs} -DTLS=1"
 	myargs="${myargs} -c ${PN}.c"
 
-	if useq apache2; then
+	if use apache2 ; then
 		APXS2_ARGS="${myargs}"
 	else
 		APXS1_ARGS="${myargs}"
@@ -43,6 +43,6 @@ src_compile() {
 
 src_install() {
 	apache-module_src_install
-	useq apache2 && fperms 600 ${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf
-	useq apache2 || fperms 600 ${APACHE1_MODULES_CONFDIR}/$(basename ${APACHE1_MOD_CONF}).conf
+	use apache2 && fperms 600 "${APACHE2_MODULES_CONFDIR}"/$(basename ${APACHE2_MOD_CONF}).conf
+	use apache2 || fperms 600 "${APACHE1_MODULES_CONFDIR}"/$(basename ${APACHE1_MOD_CONF}).conf
 }