Version bump, cleaned out old versions

(Portage version: 2.0.53)

10 files changed, 30 insertions, 124 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index ab1eb165709e..efb9273f7efd 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/phpldapadmin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.27 2005/12/13 00:00:17 rl03 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.28 2006/01/16 18:31:11 rl03 Exp $
+
+*phpldapadmin-0.9.8 (16 Jan 2006)
+
+  16 Jan 2006; Renat Lumpau <rl03@gentoo.org> -files/welcome.php.patch,
+  -phpldapadmin-0.9.7_alpha6.ebuild, -phpldapadmin-0.9.7_rc1.ebuild,
+  -phpldapadmin-0.9.7_rc3.ebuild, +phpldapadmin-0.9.8.ebuild:
+  Version bump, cleaned out old versions
 
   13 Dec 2005; Renat Lumpau <rl03@gentoo.org>
   phpldapadmin-0.9.7_alpha6.ebuild, phpldapadmin-0.9.7_rc1.ebuild,
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 01f8fa9eaa12..aee025701645 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 30b1d4f8daae54e42d748d994d0aabc1 phpldapadmin-0.9.7.2.ebuild 857
-MD5 b8d5d85b0d2ef66c851335110f2d950d phpldapadmin-0.9.7_rc1.ebuild 919
-MD5 79890e899d5dd3ee979f75ec8de4bf1c phpldapadmin-0.9.7.ebuild 914
-MD5 d2b375f1462ee53b80b6af2b9fa6f65a phpldapadmin-0.9.7_rc3.ebuild 919
-MD5 2a84ba210f938d99badd4f399c07d65b phpldapadmin-0.9.7.1.ebuild 857
-MD5 1a4f894a7e5810533a194c09b47757d7 phpldapadmin-0.9.7_alpha6.ebuild 925
 MD5 9dba0b445d03c67ee9909d1a5bad80d3 ChangeLog 3935
-MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
 MD5 1d6220f156b7733fc0579d4a35719837 files/digest-phpldapadmin-0.9.7 70
-MD5 e85a808069c28b9286faae1a04dc2389 files/digest-phpldapadmin-0.9.7_alpha6 77
 MD5 a591c198278154127311518eb178fe06 files/digest-phpldapadmin-0.9.7.1 72
 MD5 d19d57f7dda1963adfb18d96f8090d50 files/digest-phpldapadmin-0.9.7.2 72
-MD5 306450e12d7022d610333cf736164286 files/postinstall-en.txt 124
-MD5 b798e91898b186ba4354f10a38bc47b2 files/welcome.php.patch 170
-MD5 d1ff22c7d7576d337ecf17671a2e9672 files/postinstall2-en.txt 131
+MD5 e85a808069c28b9286faae1a04dc2389 files/digest-phpldapadmin-0.9.7_alpha6 77
 MD5 447f0b97c430c87e30d406becb470446 files/digest-phpldapadmin-0.9.7_rc1 74
 MD5 2c175e57faef32f4b2b038631f048d59 files/digest-phpldapadmin-0.9.7_rc3 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDng8aEzitwsaoONoRAootAKCs14PDDPt4ZpFhkkE1sWIPqqHSBwCeJ8iw
-itaph3qwwofeb5w/dewLyzo=
-=A3+x
------END PGP SIGNATURE-----
+MD5 3a0747741c9ccb68abaf6c1a97389b48 files/digest-phpldapadmin-0.9.8 70
+MD5 306450e12d7022d610333cf736164286 files/postinstall-en.txt 124
+MD5 d1ff22c7d7576d337ecf17671a2e9672 files/postinstall2-en.txt 131
+MD5 b798e91898b186ba4354f10a38bc47b2 files/welcome.php.patch 170
+MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
+MD5 2a84ba210f938d99badd4f399c07d65b phpldapadmin-0.9.7.1.ebuild 857
+MD5 30b1d4f8daae54e42d748d994d0aabc1 phpldapadmin-0.9.7.2.ebuild 857
+MD5 79890e899d5dd3ee979f75ec8de4bf1c phpldapadmin-0.9.7.ebuild 914
+MD5 1a4f894a7e5810533a194c09b47757d7 phpldapadmin-0.9.7_alpha6.ebuild 925
+MD5 b8d5d85b0d2ef66c851335110f2d950d phpldapadmin-0.9.7_rc1.ebuild 919
+MD5 d2b375f1462ee53b80b6af2b9fa6f65a phpldapadmin-0.9.7_rc3.ebuild 919
+MD5 8f8a6f49c8a2139bcb83a9a0513adaa1 phpldapadmin-0.9.8.ebuild 856
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_alpha6 b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_alpha6
deleted file mode 100644
index 6e5ed72c1c10..000000000000
--- a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_alpha6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 08109739708f5b00c197422fb883a7b9 phpldapadmin-0.9.7-alpha6.tar.gz 739882
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_rc1 b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_rc1
deleted file mode 100644
index ca740e5202d8..000000000000
--- a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 552b37cf2adef367ba6fc1dab43f18d6 phpldapadmin-0.9.7-rc1.tar.gz 738572
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_rc3 b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_rc3
deleted file mode 100644
index 81526830926e..000000000000
--- a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 889fe5ac9c5baf1fc4b9d6a18bda2a55 phpldapadmin-0.9.7-rc3.tar.gz 744773
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.8 b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.8
new file mode 100644
index 000000000000..75c367c909c9
--- /dev/null
+++ b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.8
@@ -0,0 +1 @@
+MD5 32251f799a5b1664003b4417f6fd96a8 phpldapadmin-0.9.8.tar.gz 751893
diff --git a/net-nds/phpldapadmin/files/welcome.php.patch b/net-nds/phpldapadmin/files/welcome.php.patch
deleted file mode 100644
index aac33f508599..000000000000
--- a/net-nds/phpldapadmin/files/welcome.php.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- welcome.php.old	2005-08-31 12:21:24.000000000 -0400
-+++ welcome.php	2005-08-31 12:24:08.000000000 -0400
-@@ -39,6 +39,3 @@
- </center>
- </body>
- </html>
--
--<?php }
--?>
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
deleted file mode 100644
index e62e5bb31008..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild,v 1.4 2005/12/13 00:00:17 rl03 Exp $
-
-inherit eutils webapp
-
-MY_P=${P/_alpha/-alpha}
-
-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}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-DEPEND="virtual/php"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv config.php.example config.php
-	epatch ${FILESDIR}/welcome.php.patch
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc doc/*
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	cd ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
deleted file mode 100644
index 20cd01ec6437..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild,v 1.2 2005/12/13 00:00:17 rl03 Exp $
-
-inherit webapp versionator
-
-MY_P=${PN}-$(replace_version_separator 3 '-')
-
-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}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-DEPEND="virtual/httpd-php"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv config.php.example config.php
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc doc/*
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	cd ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild
index c6d9c2ad6ff0..f91516fdfb18 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild,v 1.3 2005/12/13 00:00:17 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild,v 1.1 2006/01/16 18:31:11 rl03 Exp $
 
-inherit webapp versionator
-
-MY_P=${PN}-$(replace_version_separator 3 '-')
+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}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE=""
-S=${WORKDIR}/${MY_P}
 
 DEPEND="virtual/httpd-php"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	mv config.php.example config.php
+	mv config/config.php.example config/config.php
 }
 
 src_install() {
@@ -31,9 +28,9 @@ src_install() {
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}
 
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
+	webapp_configfile ${MY_HTDOCSDIR}/config/config.php
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en ${FILESDIR}/postinstall2-en.txt
 
 	webapp_src_install
 }