version bumped. closes 50764

6 files changed, 51 insertions, 52 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 59787ee77c79..5c1844596067 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/phpldapadmin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.8 2004/08/04 16:32:00 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.9 2004/08/04 16:35:49 mholzer Exp $
+
+*phpldapadmin-0.9.4b (04 Aug 2004)
+
+  04 Aug 2004; Martin Holzer <mholzer@gentoo.org> phpldapadmin-0.9.4b.ebuild:
+  version bumped. closes 50764
 
 *phpldapadmin-0.9.3-r1 (04 Aug 2004)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 86c5353edfed..90df3f42695f 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,7 +1,7 @@
-MD5 a09f116dc9e04e43a7162e3ccf5ef75d ChangeLog 1177
+MD5 291b24908ef702b03ec35fdba5f602c7 ChangeLog 1323
 MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
-MD5 840037f39bc23a8d531977b59c2bb18e phpldapadmin-0.9.3.ebuild 1361
+MD5 a8a9d5812da239b9df352ca284220349 phpldapadmin-0.9.4b.ebuild 1019
 MD5 f2ae08526f8d3cbc43a130eb092847ed phpldapadmin-0.9.3-r1.ebuild 1021
-MD5 c9e6d258869de2000613c894755b019e files/digest-phpldapadmin-0.9.3 70
 MD5 4a3de5c22fb420c075cca598a6101e1b files/postinstall-en.txt 186
 MD5 c9e6d258869de2000613c894755b019e files/digest-phpldapadmin-0.9.3-r1 70
+MD5 71bd382aa585d743841f99e6b6234f05 files/digest-phpldapadmin-0.9.4b 71
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.3 b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.3
deleted file mode 100644
index 173369050557..000000000000
--- a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f51c805ff9d2bbfb5af44247c9de0577 phpldapadmin-0.9.3.tar.gz 231903
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.4b b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.4b
new file mode 100644
index 000000000000..3e0950cd71ce
--- /dev/null
+++ b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.4b
@@ -0,0 +1 @@
+MD5 0aa6021da066c637e56354980dccddbe phpldapadmin-0.9.4b.tar.gz 375889
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.3.ebuild
deleted file mode 100644
index 564779e039d8..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.3.ebuild,v 1.5 2004/06/25 00:23:31 agriffis Exp $
-
-inherit webapp-apache
-
-DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server."
-HOMEPAGE="http://phpldapadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/phpldapadmin/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE=""
-
-DEPEND="virtual/php"
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-
-	# Check for "ldap" in USE vars for mod_php
-	webapp-check-php ldap
-
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing for ${WEBAPP_SERVER}"
-}
-
-src_install() {
-	dodir "${HTTPD_ROOT}/phpldapadmin"
-	cp -a * "${D}/${HTTPD_ROOT}/phpldapadmin"
-	dodoc INSTALL LICENSE VERSION doc/CREDITS doc/ChangeLog doc/INSTALL-de.txt doc/INSTALL-es.txt doc/INSTALL-fr.txt doc/ROADMAP
-
-	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpldapadmin"
-	chmod 0775 "${D}/${HTTPD_ROOT}/phpldapadmin"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "phpLDAPadmin is installed.  You will need to"
-	einfo "configure it by creating/editing the config.php"
-	einfo "at:"
-	einfo
-	einfo "${HTTPD_ROOT}/phpldapadmin/config.php"
-	einfo
-	einfo "There is a config.php.example for your reference."
-	einfo
-}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.4b.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.4b.ebuild
new file mode 100644
index 000000000000..cf253c70730e
--- /dev/null
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.4b.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.4b.ebuild,v 1.1 2004/08/04 16:35:49 mholzer Exp $
+
+inherit webapp
+
+DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server."
+HOMEPAGE="http://phpldapadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE=""
+
+DEPEND="virtual/php"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv config.php.example config.php
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="INSTALL LICENSE VERSION doc/CREDITS doc/ChangeLog doc/INSTALL-de.txt doc/INSTALL-es.txt doc/INSTALL-fr.txt doc/ROADMAP"
+
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}