Fixes for #121815.

(Portage version: 2.1_pre3-r1)

4 files changed, 18 insertions, 20 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index bca7bc3b7823..4490489421df 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/phpldapadmin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.29 2006/02/06 15:38:36 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.30 2006/02/06 15:42:37 rl03 Exp $
+
+  06 Feb 2006; Renat Lumpau <rl03@gentoo.org> phpldapadmin-0.9.7.ebuild,
+  phpldapadmin-0.9.8.ebuild:
+  Fixes for #121815.
 
   06 Feb 2006; Renat Lumpau <rl03@gentoo.org> -phpldapadmin-0.9.7.1.ebuild,
   -phpldapadmin-0.9.7.2.ebuild:
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 52df0a206577..347ea8542058 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d94bba1b82d094c6bc7d86d1799122eb ChangeLog 4339
 MD5 1d6220f156b7733fc0579d4a35719837 files/digest-phpldapadmin-0.9.7 70
 MD5 3a0747741c9ccb68abaf6c1a97389b48 files/digest-phpldapadmin-0.9.8 70
 MD5 306450e12d7022d610333cf736164286 files/postinstall-en.txt 124
 MD5 d1ff22c7d7576d337ecf17671a2e9672 files/postinstall2-en.txt 131
 MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
-MD5 79890e899d5dd3ee979f75ec8de4bf1c phpldapadmin-0.9.7.ebuild 914
-MD5 86312e03f34128bb657e1e7e79e759a6 phpldapadmin-0.9.8.ebuild 854
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD522IEzitwsaoONoRAlVsAKDK5OPVzinbFrBixfV4JaBHy1qd5wCeKrh2
-ZbZetfQV6DUIKKkMiMAPUjk=
-=ITxe
------END PGP SIGNATURE-----
+MD5 ef9e5bf163f102318f2f460e235050a8 phpldapadmin-0.9.7.ebuild 941
+MD5 17de4ac87d6f6740e22145cd59c9d555 phpldapadmin-0.9.8.ebuild 881
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
index dca508ab7a99..ec7804b7c709 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
@@ -1,8 +1,8 @@
-# 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.ebuild,v 1.3 2005/12/13 00:00:17 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild,v 1.4 2006/02/06 15:42:37 rl03 Exp $
 
-inherit webapp versionator
+inherit webapp versionator depend.php
 
 MY_P=${PN}-$(replace_version_separator 3 '-')
 
@@ -15,7 +15,9 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 S=${WORKDIR}/${MY_P}
 
-DEPEND="virtual/httpd-php"
+pkg_setup() {
+	require_php_with_use pcre
+}
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild
index f91516fdfb18..a877e3b9540a 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild
@@ -1,8 +1,8 @@
 # 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.8.ebuild,v 1.1 2006/01/16 18:31:11 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.8.ebuild,v 1.2 2006/02/06 15:42:37 rl03 Exp $
 
-inherit webapp
+inherit webapp depend.php
 
 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server."
 HOMEPAGE="http://phpldapadmin.sourceforge.net"
@@ -12,7 +12,9 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE=""
 
-DEPEND="virtual/httpd-php"
+pkg_setup() {
+	require_php_with_use pcre
+}
 
 src_unpack() {
 	unpack ${A}