remove broken version; cleanup ebuild

Package-Manager: portage-2.1.4.1

4 files changed, 27 insertions, 77 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/Manifest b/www-apache/mod_vhost_ldap/Manifest
index c05d43252147..9bf0294f2d88 100644
--- a/www-apache/mod_vhost_ldap/Manifest
+++ b/www-apache/mod_vhost_ldap/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99_mod_vhost_ldap.conf 274 RMD160 ee739d5165cf05b479ddf5c32587657a80ff1798 SHA1 feb6409f2bec59e6a6d8198578ee7a300c05206f SHA256 78d719363e3be8f17e83ef3af56fc5fb58e25a13d28e60c78ccddbcfee66fd46
 AUX mod_vhost_ldap-1.0.0-apache22.patch 6251 RMD160 743379f34b16f76e9bffd13e9b4af8d7ef666724 SHA1 f75401c66ff83c4532cac6d00447fd0366f0312f SHA256 3a921212c905a5e2139ecf9f2c5a05a985a8e4af83b8730fa05b04b174a052c2
 DIST mod_vhost_ldap-1.0.0.tar.bz2 7862 RMD160 da38548074175faab2c232e1e7b5cb88610405b1 SHA1 9e25626265707512798f134d2c371bf6ba6136da SHA256 e14713d736e79ca7760b8ca8bd32fd01e97ef0f14396bdea9373d7bfd8dd1f87
-EBUILD mod_vhost_ldap-1.0.0-r1.ebuild 1767 RMD160 3cfab0fb6cf004031d99bcfcdce8fd8184de970d SHA1 0f3a3fcdbbd2ea000514769e7da4a774fd68a12c SHA256 bd13dab00911b38a38e4771d81dd089fae2f2a40dae6f301483a378333e166fe
-EBUILD mod_vhost_ldap-1.0.0.ebuild 1678 RMD160 25e471b4dcb7a5b2f41c0f2ebe28accc235177b1 SHA1 eaa0cb19d61641367d505131de637bc7fce2c3ef SHA256 1ff8da27488d1425a8c832ae2d3e95522454f91ce77f1c04075d561a3cf3170b
-MISC ChangeLog 1167 RMD160 b504009dec91d1b1e18534c5ee793416d0342157 SHA1 b9f91fa298987b5a7084276abc5d31673fc22152 SHA256 cf74b10f4d4a65a527bd9e67680881d0357258eb16f88a2349bbb3fe323d2882
+EBUILD mod_vhost_ldap-1.0.0-r1.ebuild 1465 RMD160 2b1cfaf3146274895bbd389a7b1eba44dd65aeec SHA1 6502e4997b9e50bf6f80b29d4152525ba1a63f09 SHA256 c9cd79cdaedcb6d92518fa28a1a82fe974b5533697fd080f974ac303ca2b57e6
+MISC ChangeLog 1322 RMD160 edc3e6201a1cf8e8ff43ed76bf9b7dfb9954e1cd SHA1 2e9d8a03f8a5559628b16fb01ac22fa0bbd9c788 SHA256 952e761349b79c0ec8f065f380fa02fc8a28ce405ea3d0b786c47b43209cde25
 MISC metadata.xml 223 RMD160 30a6cfa82f214e7bf80161132835a25e0d3d41aa SHA1 24d1f9b12898fd70d331de23cac69b98c48ab540 SHA256 e376668f5da97bd367108a34582eb43368d4c6a591692d0f1324f5b3a0e9f2b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkerhKwACgkQmPFBzbX68WHPiwCfd5SSKqrtjO5VPFj84a8vFB2D
+oQMAnjHD7Qm0TSjcffs09N03rDGUJN0G
+=G+sd
+-----END PGP SIGNATURE-----
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
-}