cleanup, make new ebuilds use EAPI2 USE deps instead of depend.php (bug #335280)

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

6 files changed, 25 insertions, 54 deletions

diff --git a/dev-php/PEAR-Net_FTP/ChangeLog b/dev-php/PEAR-Net_FTP/ChangeLog
index dd8cf34bd3fd..dd4e6e3d4b7a 100644
--- a/dev-php/PEAR-Net_FTP/ChangeLog
+++ b/dev-php/PEAR-Net_FTP/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/PEAR-Net_FTP
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/ChangeLog,v 1.23 2009/08/22 19:39:01 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/ChangeLog,v 1.24 2010/09/19 12:00:22 mabi Exp $
+
+*PEAR-Net_FTP-1.3.7-r1 (19 Sep 2010)
+
+  19 Sep 2010; Matti Bickel <mabi@gentoo.org> -PEAR-Net_FTP-1.3.2.ebuild,
+  -PEAR-Net_FTP-1.3.7.ebuild, +PEAR-Net_FTP-1.3.7-r1.ebuild,
+  -PEAR-Net_FTP-1.4.0_alpha1.ebuild, PEAR-Net_FTP-1.4.0_alpha2.ebuild:
+  cleanup, make new ebuilds use EAPI2 USE deps instead of depend.php (bug
+  #335280)
 
 *PEAR-Net_FTP-1.4.0_alpha2 (22 Aug 2009)
 
diff --git a/dev-php/PEAR-Net_FTP/Manifest b/dev-php/PEAR-Net_FTP/Manifest
index 0de1aa0374be..1ae5270bf3a3 100644
--- a/dev-php/PEAR-Net_FTP/Manifest
+++ b/dev-php/PEAR-Net_FTP/Manifest
@@ -1,12 +1,8 @@
-DIST Net_FTP-1.3.2.tgz 24992 RMD160 627792732efc503ffe47c6ce9f7d6fb1fe67ff02 SHA1 29ac10a9e78022921cddd890d38cb3bd4774889c SHA256 d90eb1d01e4e2779a8cb8793df80790844aff400dd39fc1028ddb0a5eb0d9a55
 DIST Net_FTP-1.3.4.tgz 30576 RMD160 7346017f7754679889ffcc11f9711b954248b347 SHA1 86302d0b1ac2ccd1058c3e6720e2eacbbbfe5803 SHA256 8deef8d272a76d6824afffdb59e5af12da1e44f22609f91044c34c1f769379a6
 DIST Net_FTP-1.3.7.tgz 31749 RMD160 c862cf894d03a9dac7a544d03349567d46df5810 SHA1 42c9258c44f90dc8d038eacaf3979f21f2f3174c SHA256 31ac1237d2d542b898a995893c0b13f7107c66b7be768c9ebf2628738ca97a5d
-DIST Net_FTP-1.4.0a1.tgz 32347 RMD160 875646bda1aa068f927a50f2a5edd6a9413bd857 SHA1 f3228112333a3acb8aaf7e9c04eb3bc74c38d9b8 SHA256 efff9b85388afe5bdb33c16124f18fccb804fb41cab7f9551c73f380499e28b4
 DIST Net_FTP-1.4.0a2.tgz 34284 RMD160 616946e4a1f759b44e39c6e3b832d59939864091 SHA1 294faff86bd61b942dedc098936341c9a3a60ada SHA256 ac2383a9a55cdc0a9cd714df5efff780f1afc4896b8b390951bda88c71dcd3ed
-EBUILD PEAR-Net_FTP-1.3.2.ebuild 468 RMD160 f709571f01424ef3fb218a142f3d53124c33baae SHA1 bccc01b8f24f740dbd9c0e03ebeda15a7e8c8fa7 SHA256 389daf1159e98a2418c53619f32ac1a9a7df50dd6195f0aa9b4679f08a75267d
 EBUILD PEAR-Net_FTP-1.3.4.ebuild 467 RMD160 3c75ef6287a44ad08437d00cd773074b0384e30c SHA1 cb7ab0a429c5924c0d8a9efe467f4b05cf83b989 SHA256 6c8c9368c8982d5ffc5363965ddce6e43483a6adb6d945af5ef6a5d2efbed128
-EBUILD PEAR-Net_FTP-1.3.7.ebuild 479 RMD160 f896a3398e888f9b4d34307653c627b196289d1f SHA1 7c480bce8ee4e26f9bca1db696b0d8ce6f3db4e3 SHA256 222ff4353ed698380f32647d56226b65340988c7c5d7320ede343f969126a878
-EBUILD PEAR-Net_FTP-1.4.0_alpha1.ebuild 486 RMD160 cc42a8b4683af8f4f21a243cbc31c02b1f71d078 SHA1 cf1fb3aeca964f3246004cb9e20b24571fa49466 SHA256 4e8e903b2b10563cd08bced82e4ce9fce3a3f79ce91de69f7cc1794ef9726bfa
-EBUILD PEAR-Net_FTP-1.4.0_alpha2.ebuild 486 RMD160 d8b2cf7c2fd2d80f24f380813aa3c662db780fbc SHA1 c423ed01aaf445175c9433de4c9cd2193c757ad4 SHA256 f2abc71837cecfe4f6906f60df286c3e0b4b665963f1497c29a78db4f16ad06d
-MISC ChangeLog 3132 RMD160 3a1fe4688626cacadbffde61dfeaa1ed12be447a SHA1 011e1a3285d92d63bc02bd58c136a1889c0b85d7 SHA256 491e86ed1f88d3ee82bc960908ef2414fea8e43bdbf754f50ced9566ded21c24
+EBUILD PEAR-Net_FTP-1.3.7-r1.ebuild 464 RMD160 62bb6b6a737941a23b8716bf32e8fd6b2a888cdb SHA1 78dddc2d3c7a98e3f176ba0cab959d8fc91b4fc0 SHA256 8eb65d62aac6fec3865cbff7192f6f31e8bac7c3c41aa03ad53e9106a0c005bb
+EBUILD PEAR-Net_FTP-1.4.0_alpha2.ebuild 467 RMD160 8b6ac85ad22233c80f0664a2d394777efcda7995 SHA1 29d0dad3204875f01a2fc587f57a9750c85070a7 SHA256 091c35737b31db63200bc41e5b72e82cc810793816f53c829fe82b67e7487c46
+MISC ChangeLog 3459 RMD160 bb1e9702078c176ad0815972389fa9744c989e2f SHA1 268ee6cfbdf75c05c9764444797dc3c1a488287a SHA256 3f713257c87625ef5452dfd6f1cee16a6cfc3fae9c521773c516e479adaae2a5
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.2.ebuild b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.2.ebuild
deleted file mode 100644
index 52d105357b73..000000000000
--- a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.2.ebuild
+++ /dev/null
@@ -1,16 +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_FTP/PEAR-Net_FTP-1.3.2.ebuild,v 1.16 2008/01/10 10:06:30 vapier Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Provides an OO interface to the PHP FTP functions"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use ftp
-}
diff --git a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7.ebuild b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild
index c336e0a5f097..d241aa9f7979 100644
--- a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7.ebuild
+++ b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild
@@ -1,8 +1,10 @@
-# 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/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7.ebuild,v 1.1 2009/08/22 19:37:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild,v 1.1 2010/09/19 12:00:22 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="3"
+
+inherit php-pear-r1
 
 DESCRIPTION="Provides an OO interface to the PHP FTP functions"
 
@@ -11,6 +13,4 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-pkg_setup() {
-	require_php_with_use ftp
-}
+RDEPEND="dev-lang/php[ftp]"
diff --git a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha1.ebuild b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha1.ebuild
deleted file mode 100644
index 9c55c3e6edef..000000000000
--- a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha1.ebuild,v 1.1 2007/12/24 12:42:53 armin76 Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Provides an OO interface to the PHP FTP functions"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use ftp
-}
diff --git a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha2.ebuild b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha2.ebuild
index 7556059eefc9..6dd5d40fec75 100644
--- a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha2.ebuild
+++ b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha2.ebuild
@@ -1,8 +1,10 @@
-# 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/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha2.ebuild,v 1.1 2009/08/22 19:39:01 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha2.ebuild,v 1.2 2010/09/19 12:00:22 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="3"
+
+inherit php-pear-r1
 
 DESCRIPTION="Provides an OO interface to the PHP FTP functions"
 
@@ -10,7 +12,4 @@ LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
-
-pkg_setup() {
-	require_php_with_use ftp
-}
+RDEPEND="dev-lang/php[ftp]"