eapi bump for bug #298205

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 7c9b4207f22e2d26df2931f7b7449c336f013b4c..bb7510bd97704c1e4c59d5e18dcd90fa5711f180 100644 (file)
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.50 2009/11/03 17:37:09 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.51 2010/07/03 15:41:09 mabi Exp $
+
+*phpldapadmin-1.2.0.4-r1 (03 Jul 2010)
+
+  03 Jul 2010; Matti Bickel <mabi@gentoo.org> -phpldapadmin-1.2.0.4.ebuild,
+  +phpldapadmin-1.2.0.4-r1.ebuild:
+  eapi bump for php-5.3 (bug #298205)
 
   03 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   phpldapadmin-1.2.0.4.ebuild:

diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index a2e65425c4080cf651001522f2e1b86f9d2f3ad0..f97c17eadca79a33ea72fd99c4d9cd78f2594f4a 100644 (file)
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall2-en.txt 131 RMD160 f1f681b3b5094f555e6adfca8d70d4ca1b14ae4b SHA1 deecc59339d6c83dad797c0f8cfab9ea0110153a SHA256 e2dc7bea366789a303eb9a90d1bced655cea00469202859af40bf19c00505d38
 DIST phpldapadmin-1.2.0.4.tgz 1291545 RMD160 23b6a9afd438add7ed48ff390d5b4d4400df54b4 SHA1 7b364065e91f4dca606432c42fa2ae48e54f04ce SHA256 e4887ed0db63c926162d79d603add21a669103ad2f75a7b90686a18eed8a6330
-EBUILD phpldapadmin-1.2.0.4.ebuild 957 RMD160 3b9d862b3f29358bcab6f74d40c5b4d2aeb743b4 SHA1 6855ff8c4a09295b79df080aeac8f0baabc46217 SHA256 9c4ea1f532dd44208ca1a650ecf1050325a0038edebdae462e9e2f5959e6e52c
-MISC ChangeLog 7872 RMD160 3591e06d832f18d52716c808f30734b4d385bfc0 SHA1 41433ac82982aa833485db76b4adb3ebca8a42d7 SHA256 b5cf3e916dd5c780a18ef94ec957d5212c59315993c02d152f346de7a8799da8
+EBUILD phpldapadmin-1.2.0.4-r1.ebuild 983 RMD160 2228477215296b381a25ece0ac9f81d4cdead10e SHA1 340b6602090d046c526914f56a2ad55023f3e334 SHA256 cbb2de3c6c29336841d910feaf10b559158f85031f47b52d3f1574f2d985b79b
+MISC ChangeLog 8059 RMD160 e4abfae2676d1aa931c27a4a15d03a815f4fd36e SHA1 1a32682d6bbb0e4c3e48ab11580c0ad2487ec7e0 SHA256 615f41a2bb400ba1fb40b30aea045572d7e68a69896bfb278d0187ad3b35d3c7
 MISC metadata.xml 370 RMD160 1e683538571368a5033eaeb2ba358710ba825aa8 SHA1 044285a73d0a6b43568dc5959a1043d9603f136f SHA256 d387ae449792182b0abd370fbbcd87f354170b54fb42a0c088fd511c9040da6a

diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.0.4.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.0.4-r1.ebuild
similarity index 78%
rename from net-nds/phpldapadmin/phpldapadmin-1.2.0.4.ebuild
rename to net-nds/phpldapadmin/phpldapadmin-1.2.0.4-r1.ebuild
index f5c2d1d687d34d8946ad61ed14259d51a482e768..6dcea61940f3851778714e1cfd3bf7e11e25977d 100644 (file)
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.0.4.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.0.4-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4.ebuild,v 1.2 2009/11/03 17:37:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.2.0.4-r1.ebuild,v 1.1 2010/07/03 15:41:09 mabi Exp $
+
+EAPI="2"
 
 inherit webapp depend.php
 
@@ -12,14 +14,12 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
+RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
+                || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
 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}"