move to EAPI4 to get rid of depend.php

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

4 files changed, 24 insertions, 21 deletions

diff --git a/dev-php/PEAR-PEAR_PackageFileManager/ChangeLog b/dev-php/PEAR-PEAR_PackageFileManager/ChangeLog
index e721da0763d4..3000f611a252 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/ChangeLog
+++ b/dev-php/PEAR-PEAR_PackageFileManager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-PEAR_PackageFileManager
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR_PackageFileManager/ChangeLog,v 1.6 2010/02/16 05:05:18 beandog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR_PackageFileManager/ChangeLog,v 1.7 2012/07/01 21:40:22 mabi Exp $
+
+  01 Jul 2012; Matti Bickel <mabi@gentoo.org>
+  PEAR-PEAR_PackageFileManager-1.6.3.ebuild,
+  PEAR-PEAR_PackageFileManager-1.7.0.ebuild:
+  move to EAPI4 to get rid of depend.php
 
 *PEAR-PEAR_PackageFileManager-1.7.0 (16 Feb 2010)
 
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
index ae1b693a93cd..769773650b85 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/Manifest
+++ b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
@@ -1,6 +1,6 @@
 DIST PEAR_PackageFileManager-1.6.3.tgz 82393 RMD160 8d948a6872b87351f1ca0a927f6da9fd31b94189 SHA1 7391b40f5f4483b6afaa151e213505b0d6ffc727 SHA256 c2b392a4807510659bfe77470d7732b21eab2aa752d2a53601d55ff335f9068d
 DIST PEAR_PackageFileManager-1.7.0.tgz 37799 RMD160 496734b79ffefe7448f87ba4fd5b264f11f73524 SHA1 f15844d062b31ed0a9e3b05af96d741f4e36b7ab SHA256 188a2adfef7d93e20002c9909ebe2372af6380466a926b57e83c1221f9da4ee6
-EBUILD PEAR-PEAR_PackageFileManager-1.6.3.ebuild 572 RMD160 0cb43e1b39dbe893ab110271a95ef4a6397cf43b SHA1 5b78c98c3566b926e56714a8b311869fd52ec8af SHA256 36eb48b3b314d89c7a710553b35f38130036bea1056d3b4aa2241a2fc92513d7
-EBUILD PEAR-PEAR_PackageFileManager-1.7.0.ebuild 604 RMD160 d74a8e7c9f0ff474f84e78bae3991f81ad902d97 SHA1 413cb495bbf860746bf0075019b230177fd1f575 SHA256 6e2588e396a8ff04fb824a91334c2712147cbfe457dae4eea797969b80e08638
-MISC ChangeLog 1896 RMD160 3c6d6d6eb745484b7bed29d3e6ac350293acca96 SHA1 6ff8ee8168af0b1e7cba3f1bae69ef3ef7f7de35 SHA256 59f7801d385d3c7914477d35c30f2fd8f4df0d579c42da5a2c961a6057b4b422
+EBUILD PEAR-PEAR_PackageFileManager-1.6.3.ebuild 544 RMD160 2761147ee888063d124d50b58a5dabb747f6b5ad SHA1 43650cf46ec0bd9ec6bd6632f0a597fdbd9a34fd SHA256 8efcc7e3d732076fc6db712ebb7c0c434f9bde452cb53fcbee125d11e8cd98a0
+EBUILD PEAR-PEAR_PackageFileManager-1.7.0.ebuild 574 RMD160 76d84e0a11b722990b0d4be3e0e3e0a6641d901b SHA1 7c87ecf744d12e4ad4ab4e696472bbe5ef8d8633 SHA256 44f2ba76f897d9742c56b63808bbff01ea7dad7490d2d7e8c91c9c6d0c677702
+MISC ChangeLog 2071 RMD160 f8cd9f2c2db26443a8b7ea38d3a3032d4a845d44 SHA1 d2267c8b4a73ef34f1906baa363076854f7f548f SHA256 b9525c4eabfe0b382e49631f2f5fcfe68e2e6a1dce7397aebfcfb8a2a794a9f6
 MISC metadata.xml 156 RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 SHA1 1f452f476317b4634c684eabfd8840d06d35b414 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild
index 3696510f1a95..3a3ee2183593 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild
+++ b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 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-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild,v 1.3 2008/03/17 12:49:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild,v 1.4 2012/07/01 21:40:22 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI=4
+
+inherit php-pear-r1
 
 DESCRIPTION="Takes an existing package.xml file and updates it with a new filelist and changelog."
 
@@ -11,8 +13,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 
-RDEPEND="!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"
-
-pkg_setup() {
-	require_php_with_use xml simplexml
-}
+RDEPEND="dev-lang/php[xml,simplexml]
+	!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.0.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.0.ebuild
index 2b3fd9db7a36..801a67e04ac3 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.0.ebuild
+++ b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 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-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.0.ebuild,v 1.1 2010/02/16 05:05:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.0.ebuild,v 1.2 2012/07/01 21:40:22 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI=4
+
+inherit php-pear-r1
 
 DESCRIPTION="Takes an existing package.xml file and updates it with a new filelist and changelog."
 
@@ -12,8 +14,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 
 DEPEND=">=dev-php/pear-1.8.1"
-RDEPEND="!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"
-
-pkg_setup() {
-	require_php_with_use xml simplexml
-}
+RDEPEND="dev-lang/php[xml,simplexml]
+	!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"