Cleanup.

(Portage version: 2.1.2_rc4-r8)

3 files changed, 29 insertions, 28 deletions

diff --git a/www-apache/mod_vhost_ldap/ChangeLog b/www-apache/mod_vhost_ldap/ChangeLog
index 7bff260eec3c..5b6e56966ca0 100644
--- a/www-apache/mod_vhost_ldap/ChangeLog
+++ b/www-apache/mod_vhost_ldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_vhost_ldap
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/ChangeLog,v 1.2 2006/02/11 14:39:54 jokey Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/ChangeLog,v 1.3 2007/01/15 19:40:25 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_vhost_ldap-1.0.0.ebuild:
+  Cleanup.
 
 *mod_vhost_ldap-1.0.0 (11 Feb 2006)
 
diff --git a/www-apache/mod_vhost_ldap/metadata.xml b/www-apache/mod_vhost_ldap/metadata.xml
index a03ad51a5e30..d7391b995353 100644
--- a/www-apache/mod_vhost_ldap/metadata.xml
+++ b/www-apache/mod_vhost_ldap/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<maintainer>
-  <email>jokey@gentoo.org</email>
-</maintainer>
+	<herd>apache</herd>
+	<maintainer>
+		<email>jokey@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild
index 834e81e2c3aa..424c359b860d 100644
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild
+++ b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild
@@ -1,60 +1,57 @@
-# 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/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild,v 1.1 2006/02/11 14:39:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild,v 1.2 2007/01/15 19:40:25 chtekk Exp $
 
 inherit eutils apache-module
 
-DESCRIPTION="An Apache2 DSO for storing and configuring virtual hosts from LDAP"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="An Apache2 module for storing and configuring virtual hosts from LDAP."
 HOMEPAGE="http://alioth.debian.org/projects/modvhostldap/"
 SRC_URI="http://alioth.debian.org/download.php/1422/${P}.tar.bz2"
-# Attention: 1422 captures 1.0 download content!!!!
-
+# Attention: 1422 captures 1.0 download content!!!
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-S=${WORKDIR}
+S="${WORKDIR}/mod-vhost-ldap-${PV}"
 
-SRCDIR="${S}/mod-vhost-ldap-${PV}"
-APXS2_S="${SRCDIR}"
 APACHE2_MOD_CONF="99_${PN}"
 APACHE2_MOD_DEFINE="VHOST_LDAP"
 
-DOCFILES="${SRCDIR}/AUTHORS ${SRCDIR}/ChangeLog ${SRCDIR}/INSTALL ${SRCDIR}/README"
+DOCFILES="AUTHORS ChangeLog INSTALL README"
 
 need_apache2
 
-pkg_setup () {
+pkg_setup() {
 	if ! built_with_use net-www/apache ldap ; then
 		eerror
-		eerror "Apache needs to be built with ldap support to get this module working"
+		eerror "Apache2 needs to be built with ldap support to get this module working!"
 		eerror
-		die "Apache lacks ldap support"
+		die "Apache2 lacks ldap support"
 	fi
 }
 
-src_compile () {
-	cd ${APXS2_S}
+src_compile() {
 	sed -i s/MOD_VHOST_LDAP_VERSION/\"`cat VERSION`\"/g mod_vhost_ldap.c
 	apache-module_src_compile
 }
 
-src_install () {
-	mkdir -p ${D}/etc/openldap/schema
-	cp ${SRCDIR}/mod_vhost_ldap.schema ${D}/etc/openldap/schema
+src_install() {
+	mkdir -p "${D}/etc/openldap/schema"
+	cp -f "mod_vhost_ldap.schema" "${D}/etc/openldap/schema/"
 	apache-module_src_install
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	einfo
-	einfo "To enable ${PN}, you need to edit your /etc/conf.d/apache2 file and"
-	einfo "add '-D ${APACHE2_MOD_DEFINE}' and -D LDAP to APACHE2_OPTS."
+	einfo "To enable ${PN}, you need to edit your ${ROOT}/etc/conf.d/apache2 file and"
+	einfo "add '-D ${APACHE2_MOD_DEFINE}' and '-D LDAP' to APACHE2_OPTS."
 	einfo
 	einfo "Configuration file installed as"
 	einfo "    ${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf"
 	einfo
 	einfo "Your LDAP server needs to include mod_vhost_ldap.schema and should"
-	einfo "also maintain indices on apacheServerName and apacheServerAlias"
+	einfo "also maintain indices on apacheServerName and apacheServerAlias."
 	einfo
 }