Small fixes for bug #115349.

(Portage version: 2.0.51.22-r2)

8 files changed, 25 insertions, 30 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 698fe4e5046c..ab1eb165709e 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2005/12/11 14:13:18 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.27 2005/12/13 00:00:17 rl03 Exp $
+
+  13 Dec 2005; Renat Lumpau <rl03@gentoo.org>
+  phpldapadmin-0.9.7_alpha6.ebuild, phpldapadmin-0.9.7_rc1.ebuild,
+  phpldapadmin-0.9.7_rc3.ebuild, phpldapadmin-0.9.7.ebuild,
+  phpldapadmin-0.9.7.1.ebuild, phpldapadmin-0.9.7.2.ebuild:
+  Small fixes for bug #115349.
 
 *phpldapadmin-0.9.7.2 (11 Dec 2005)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 5d83165e2c6f..c8aa6787935e 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41db040a58cf7a6109c24bfb034ccc79 phpldapadmin-0.9.7.2.ebuild 865
-MD5 d55331f61ac1b9170e9c0e84e618a052 phpldapadmin-0.9.7_rc1.ebuild 926
-MD5 f1bb785a034c4427b247374b8f0bcca5 phpldapadmin-0.9.7.ebuild 924
-MD5 6cccc5d24079054bc1adee53a30c8a3e phpldapadmin-0.9.7_rc3.ebuild 931
-MD5 a386e1f47ca9469f8a277a97c98a0216 phpldapadmin-0.9.7.1.ebuild 886
-MD5 c5200090167e9f1607361765e78b0216 phpldapadmin-0.9.7_alpha6.ebuild 937
+MD5 667e9a98cae2c50b65a13e9efaebb6fb phpldapadmin-0.9.7.2.ebuild 857
+MD5 d20f891bad9ba44f26fabed0de3cde1f phpldapadmin-0.9.7_rc1.ebuild 918
+MD5 10153fe7eb2dede9b89a5f4fb2d1b5d3 phpldapadmin-0.9.7.ebuild 916
+MD5 2eb0e701823ae2000ffb097059848810 phpldapadmin-0.9.7_rc3.ebuild 923
+MD5 355c4e068acf6862a3beaf68b3948951 phpldapadmin-0.9.7.1.ebuild 860
+MD5 7861da802eea6c264d859ab4cd9ef1bd phpldapadmin-0.9.7_alpha6.ebuild 929
 MD5 6713585ed5ec961c6a97cd498b787347 ChangeLog 3670
 MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
 MD5 1d6220f156b7733fc0579d4a35719837 files/digest-phpldapadmin-0.9.7 70
@@ -18,10 +15,3 @@ MD5 b798e91898b186ba4354f10a38bc47b2 files/welcome.php.patch 170
 MD5 d1ff22c7d7576d337ecf17671a2e9672 files/postinstall2-en.txt 131
 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)
-
-iD8DBQFDnDQJEzitwsaoONoRAkl2AJsF7nmj4j+vU0SD1wcZkiT2sNhFFQCgnUlH
-uiV0VzccTF7Q2OpNvg5/aGY=
-=8QEU
------END PGP SIGNATURE-----
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild
index bdfb7fd52c41..ea57ee8bcc1c 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2005/11/02 23:44:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild,v 1.2 2005/12/13 00:00:17 rl03 Exp $
 
 inherit webapp
 
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE=""
-S=${WORKDIR}/${P}
 
 DEPEND="virtual/httpd-php"
 
@@ -25,7 +24,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL doc/*
+	dodoc doc/*
 
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7.2.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7.2.ebuild
index 32702a1b8595..01b35a985e3e 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7.2.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2005/12/11 14:13:18 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7.2.ebuild,v 1.2 2005/12/13 00:00:17 rl03 Exp $
 
 inherit webapp
 
@@ -24,7 +24,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL doc/*
+	dodoc doc/*
 
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
index 7c86ca8cc32d..dca508ab7a99 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2005/12/11 05:11:29 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild,v 1.3 2005/12/13 00:00:17 rl03 Exp $
 
 inherit webapp versionator
 
@@ -26,7 +26,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL doc/*
+	dodoc doc/*
 
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
index 5cec8331ccd5..e62e5bb31008 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/09/16 04:14:06 agriffis Exp $
+# $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
 
@@ -27,7 +27,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL doc/*
+	dodoc doc/*
 
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild
index d05fb5393910..c6d9c2ad6ff0 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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_rc1.ebuild,v 1.2 2005/09/10 00:33:29 dju Exp $
+# $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 $
 
 inherit webapp versionator
 
@@ -26,7 +26,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL doc/*
+	dodoc doc/*
 
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
index 60cefeb7d221..20cd01ec6437 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/09/20 23:03:52 strerror Exp $
+# $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
 
@@ -26,7 +26,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc INSTALL doc/*
+	dodoc doc/*
 
 	cp -r . ${D}${MY_HTDOCSDIR}
 	cd ${D}${MY_HTDOCSDIR}