remove broken version; cleanup ebuild

(Portage version: 2.1.4.1)

3 files changed, 15 insertions, 74 deletions

diff --git a/www-apache/mod_vhost_ldap/ChangeLog b/www-apache/mod_vhost_ldap/ChangeLog
index a3c26cd902e2..c06a0b073f70 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/ChangeLog,v 1.5 2008/01/29 18:15:51 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/ChangeLog,v 1.6 2008/02/07 22:22:16 hollow Exp $
+
+  07 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  -mod_vhost_ldap-1.0.0.ebuild, mod_vhost_ldap-1.0.0-r1.ebuild:
+  remove broken version; cleanup ebuild
 
 *mod_vhost_ldap-1.0.0-r1 (29 Jan 2008)
 
diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild
index ed6e6a27da25..7cfa99311b0e 100644
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild
+++ b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.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_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild,v 1.1 2008/01/29 18:15:51 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild,v 1.2 2008/02/07 22:22:16 hollow Exp $
 
 inherit eutils apache-module
 
@@ -9,19 +9,19 @@ 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!!!
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S="${WORKDIR}/mod-vhost-ldap-${PV}"
-
 APACHE2_MOD_CONF="99_${PN}"
-APACHE2_MOD_DEFINE="VHOST_LDAP"
+APACHE2_MOD_DEFINE="VHOST_LDAP LDAP"
 
 DOCFILES="AUTHORS ChangeLog INSTALL README"
 
-need_apache2
+need_apache2_2
+
+S="${WORKDIR}/mod-vhost-ldap-${PV}"
 
 pkg_setup() {
 	if ! built_with_use www-servers/apache ldap ; then
@@ -35,28 +35,22 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}"/${P}-apache22.patch
 }
 
 src_compile() {
-	sed -i s/MOD_VHOST_LDAP_VERSION/\"$(cat VERSION)\"/g mod_vhost_ldap.c
+	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 -f "mod_vhost_ldap.schema" "${D}/etc/openldap/schema/"
+	mkdir -p "${D}"/etc/openldap/schema
+	cp -f mod_vhost_ldap.schema "${D}"/etc/openldap/schema/
 	apache-module_src_install
 }
 
 pkg_postinst() {
-	einfo
-	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 "    ${APACHE_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf"
+	apache-module_pkg_postinst
 	einfo
 	einfo "Your LDAP server needs to include mod_vhost_ldap.schema and should"
 	einfo "also maintain indices on apacheServerName and apacheServerAlias."
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
deleted file mode 100644
index 04a785ad74b1..000000000000
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 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.4 2008/01/29 18:15:51 hollow Exp $
-
-inherit eutils apache-module
-
-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!!!
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/mod-vhost-ldap-${PV}"
-
-APACHE2_MOD_CONF="99_${PN}"
-APACHE2_MOD_DEFINE="VHOST_LDAP"
-
-DOCFILES="AUTHORS ChangeLog INSTALL README"
-
-need_apache2
-
-pkg_setup() {
-	if ! built_with_use www-servers/apache ldap ; then
-		eerror
-		eerror "Apache2 needs to be built with ldap support to get this module working!"
-		eerror
-		die "Apache2 lacks ldap support"
-	fi
-}
-
-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 -f "mod_vhost_ldap.schema" "${D}/etc/openldap/schema/"
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	einfo
-	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 "    ${APACHE_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
-}