cleanup, move 1.1.5 to EAPI4 to get rid of depend.php

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 14 insertions, 54 deletions

diff --git a/dev-php/PEAR-Net_LDAP/ChangeLog b/dev-php/PEAR-Net_LDAP/ChangeLog
index 2f11d563e4e0..ffa924aa9a1d 100644
--- a/dev-php/PEAR-Net_LDAP/ChangeLog
+++ b/dev-php/PEAR-Net_LDAP/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/PEAR-Net_LDAP
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP/ChangeLog,v 1.11 2009/08/22 19:34:57 beandog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP/ChangeLog,v 1.12 2012/07/01 21:33:46 mabi Exp $
+
+  01 Jul 2012; Matti Bickel <mabi@gentoo.org> -PEAR-Net_LDAP-1.1.0.ebuild,
+  -PEAR-Net_LDAP-1.1.1.ebuild, PEAR-Net_LDAP-1.1.5.ebuild:
+  cleanup, move 1.1.5 to EAPI4 to get rid of depend.php
 
 *PEAR-Net_LDAP-1.1.5 (22 Aug 2009)
 
diff --git a/dev-php/PEAR-Net_LDAP/Manifest b/dev-php/PEAR-Net_LDAP/Manifest
index 94584e06c8d5..fc8b673fb96f 100644
--- a/dev-php/PEAR-Net_LDAP/Manifest
+++ b/dev-php/PEAR-Net_LDAP/Manifest
@@ -1,10 +1,6 @@
 DIST Net_LDAP-1.0.0.tgz 52986 RMD160 fcf1ecfc93cc0b315f8161cfb28f1006a0272c7b SHA1 8e0a73128b739e9ac88254f5387e3fc67dbb3565 SHA256 c7ded6e08fa7fe5d83b79bd896d90e5fc4d7396e16d5ed1b50c05aca4f869f69
-DIST Net_LDAP-1.1.0.tgz 73381 RMD160 93129adeb675077e6f0034dccecbda745738c667 SHA1 c171f5af4408dec627c16b44f976f83ea3721dfe SHA256 98604d3bc49c34de24ec2a17dadebd8943639e0b80ad1470478d31180f17f986
-DIST Net_LDAP-1.1.1.tgz 73746 RMD160 bff4fa8c9a0c19a306ba7e46dc4cb5589376b7be SHA1 97f794e6d5d449caeba114cc0e745a30b619d96c SHA256 ce7487c188eec6f5f4e878c80fe57900a3ff26cc9ee108809b7f31233e5dde4f
 DIST Net_LDAP-1.1.5.tgz 74782 RMD160 313d755f471159118574f4e5ee2df5cb7a663f4a SHA1 2a7ffddc37173f041bf6fa979c6705bb9d6f6fd9 SHA256 bb2f40a9d08eed1968582d4dc9342e15e93b9222e0a8b6b60ae83c34b25a51b2
 EBUILD PEAR-Net_LDAP-1.0.0.ebuild 480 RMD160 d8885275c9f4fbe0f97c429b95c79cc68edcd0c0 SHA1 db1eed50c2840f172f5c8cb527558089ef5c52a3 SHA256 e0d59144c521d6e32a535040eb500c3da03aecc0415e00cac9856bc0ac48dcb1
-EBUILD PEAR-Net_LDAP-1.1.0.ebuild 484 RMD160 80b7ba4a5161907cbd3546625798cfd3c224ff99 SHA1 e2fba5f14437e129faef053a8e5a27648c1195e3 SHA256 886c29f35daa457fa4417bea259e4ab7c2d3f995e70059e1c7a1efdf8c09ed7c
-EBUILD PEAR-Net_LDAP-1.1.1.ebuild 484 RMD160 e7cef27047336a503bc9fa1f17d7c45b3e1748ed SHA1 d86995afecfdcd251008be9d3ee395b8d37df17f SHA256 b3165d0ab2f4ca7f4603ba1775af3327f86ba2a6d18e0050f8835d5d91661849
-EBUILD PEAR-Net_LDAP-1.1.5.ebuild 486 RMD160 22c647aa522c49f5966d3440fac046f146c34ce6 SHA1 f99eec9f4a0aad440bfb181dea91a30d322be913 SHA256 d3e6e177ead6602753d902e35198f0c164e3926a40a303a16bdbccbe2628219a
-MISC ChangeLog 1955 RMD160 2dbee386d5f15eee8436b7726f0187e0a402b5bb SHA1 16111c74e44573bf0c1dc27a7086b303605d7d57 SHA256 ef4690761f26ee1ac24dcac1b13b9e4061a521981f2b7b898313d2d0a34bd930
+EBUILD PEAR-Net_LDAP-1.1.5.ebuild 454 RMD160 c5781378f684f5a6e50954c025dcb0d8d68071eb SHA1 d844ff31033993fe6630d36141d9ecd5f0f9c8c1 SHA256 790d4cd983196d829c990e96c272cde32324486cc2b87cf845384a7c83869a6a
+MISC ChangeLog 2143 RMD160 1a69f48760007c02ac33641437c9567fa1347d52 SHA1 bb686dc0c3ce3761273ac6c4734d82af4bcdabfc SHA256 c9ce5e7ac92f1e9f4bca76625b332df9db2d4bdfcb997fb12e27f938d52e944a
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.0.ebuild b/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.0.ebuild
deleted file mode 100644
index 0d0afba620c2..000000000000
--- a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.0.ebuild,v 1.1 2008/03/03 16:56:22 jokey Exp $
-
-inherit php-pear-r1 depend.php
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	require_php_with_use ldap
-}
diff --git a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.1.ebuild b/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.1.ebuild
deleted file mode 100644
index d2426692d801..000000000000
--- a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.1.ebuild,v 1.1 2008/03/19 20:57:41 jokey Exp $
-
-inherit php-pear-r1 depend.php
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	require_php_with_use ldap
-}
diff --git a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.5.ebuild b/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.5.ebuild
index 94a0b6b11f99..4291538b426c 100644
--- a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.5.ebuild
+++ b/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.5.ebuild,v 1.1 2009/08/22 19:34:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.1.5.ebuild,v 1.2 2012/07/01 21:33:46 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI=4
+
+inherit php-pear-r1
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
@@ -12,8 +14,4 @@ SLOT="0"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	require_php_with_use ldap
-}
+RDEPEND="dev-lang/php[ldap]"