Version bump to 1.2.0.4 , bug 288359

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 9 insertions, 84 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index d4fe99f4e7c0..c0ec972b8326 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/phpldapadmin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.48 2009/08/11 20:20:21 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.49 2009/10/09 20:20:46 vostorga Exp $
+
+*phpldapadmin-1.2.0.4 (09 Oct 2009)
+
+  09 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  -phpldapadmin-1.1.0.5.ebuild, -phpldapadmin-1.1.0.7.ebuild,
+  -phpldapadmin-1.2.0.ebuild, +phpldapadmin-1.2.0.4.ebuild:
+  Version bump to 1.2.0.4 , bug 288359
 
 *phpldapadmin-1.2.0 (11 Aug 2009)
 
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.ebuild
deleted file mode 100644
index 9eb91ea4b3fa..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.ebuild,v 1.3 2008/04/03 10:27:45 hollow Exp $
-
-inherit webapp depend.php
-
-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="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use hash ldap pcre session xml nls
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv config/config.php.example config/config.php
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-
-	webapp_src_install
-}
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.1.0.7.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.1.0.7.ebuild
deleted file mode 100644
index 2927d40dbc94..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-1.1.0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.1.0.7.ebuild,v 1.1 2009/08/02 17:02:13 vostorga Exp $
-
-inherit webapp depend.php
-
-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="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use hash ldap pcre session xml nls
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv config/config.php.example config/config.php
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
-
-	webapp_src_install
-}
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.0.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.0.4.ebuild
index d85e823e60e5..19930daa8412 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.0.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.2.0.ebuild,v 1.1 2009/08/11 20:20:21 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.2.0.4.ebuild,v 1.1 2009/10/09 20:20:46 vostorga Exp $
 
 inherit webapp depend.php