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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 12 insertions, 48 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/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]"