Added phpldapadmin-1.1.0.5 as requested by uberlord.

(Portage version: 2.1.4_rc7)

4 files changed, 13 insertions, 89 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 1fa3b62a0c67..c122c1bc12dc 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/phpldapadmin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.42 2008/01/08 19:08:17 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.43 2008/02/22 12:47:03 wrobel Exp $
+
+*phpldapadmin-1.1.0.5 (22 Feb 2008)
+
+  22 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org>
+  -phpldapadmin-0.9.8.4.ebuild, -phpldapadmin-1.0.2.ebuild,
+  -phpldapadmin-1.1.0.3.ebuild, +phpldapadmin-1.1.0.5.ebuild:
+  Added phpldapadmin-1.1.0.5 as requested by uberlord.
 
 *phpldapadmin-1.1.0.3 (08 Jan 2008)
 
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.8.4.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.8.4.ebuild
deleted file mode 100644
index a49f1abb18dd..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.8.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.8.4.ebuild,v 1.1 2007/05/26 23:42:55 rl03 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_php4
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use ldap pcre session expat
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv config/config.php.example config/config.php
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc doc/*
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	cd ${D}${MY_HTDOCSDIR}
-
-	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.0.2.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.0.2.ebuild
deleted file mode 100644
index b5f2f06c1870..000000000000
--- a/net-nds/phpldapadmin/phpldapadmin-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.0.2.ebuild,v 1.2 2007/08/16 07:01:18 opfer 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_php5
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use 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 doc/*
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	cd ${D}${MY_HTDOCSDIR}
-
-	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.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.ebuild
index 1b595c54ba99..bdee0142622f 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.1.0.3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.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/net-nds/phpldapadmin/phpldapadmin-1.1.0.3.ebuild,v 1.1 2008/01/08 19:08:17 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.1.0.5.ebuild,v 1.1 2008/02/22 12:47:03 wrobel Exp $
 
 inherit webapp depend.php
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-need_php5
+need_php_httpd
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -28,13 +28,12 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc doc/* doc/certs/*
+	dodoc INSTALL
 
-	cp -r . "${D}${MY_HTDOCSDIR}"
-	cd "${D}${MY_HTDOCSDIR}"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
 
 	webapp_configfile "${MY_HTDOCSDIR}"/config/config.php
-
 	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
 
 	webapp_src_install