EAPI bump; drop old

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

4 files changed, 19 insertions, 54 deletions

diff --git a/dev-php/pear/ChangeLog b/dev-php/pear/ChangeLog
index 12df3a94f1ba..f0ae698e6ffa 100644
--- a/dev-php/pear/ChangeLog
+++ b/dev-php/pear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/pear
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pear/ChangeLog,v 1.40 2014/01/26 18:24:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pear/ChangeLog,v 1.41 2014/10/08 01:25:40 grknight Exp $
+
+  08 Oct 2014; Brian Evans <grknight@gentoo.org> -pear-1.9.3.ebuild,
+  pear-1.9.4.ebuild:
+  EAPI bump; drop old
 
   26 Jan 2014; Ole Markus With <olemarkus@gentoo.org> pear-1.9.3.ebuild,
   pear-1.9.4.ebuild:
diff --git a/dev-php/pear/Manifest b/dev-php/pear/Manifest
index 81352327615f..c7aff75bc5f8 100644
--- a/dev-php/pear/Manifest
+++ b/dev-php/pear/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD pear-1.9.3.ebuild 1112 SHA256 18bc7949d0e6dc4ae4e60bc074d308a89d1d66e9e5ccb0289ec2812257062e66 SHA512 667b705a1535d1c1aec09d1a9c0b5c9fd1bed599d3b1af1e69bab98c38ee5439f29e66b7432279ae800ab5c5d2e7c348547338831b504b56f59655aa85060fb5 WHIRLPOOL 0c6344257c0f76e71680439f0749ae0b4be458854f769db8655f422efaf977a9014c9000374716dcd389315d91d6ef4cb7a7d8c4ddbacf419d7a0ddb62d84c1e
-EBUILD pear-1.9.4.ebuild 1112 SHA256 3fea6c67ad995d3d1c3f541d14eaec129ef1170276c100480cb154006a782269 SHA512 0b782de1edd4c71f85807532f9bcb5226cf19add340d3119dbf5593b9bf57923d13f8e24afe04dbc3a2d2e8e537be73043cf8814e1129e30a1aca7ff45b6ef7d WHIRLPOOL 9085f5601ad047332ad85db60a7dc6dc67d2b2f00c0383944d9594ed95ace9704f144e6a4eaa37512ef91b986cad2a300a8583a1bea3f509c42458b2036de69f
-MISC ChangeLog 4429 SHA256 6ad186df263f53d7e581060bcc3ba92c4be2dfa441c1de4c03b3a2eb1a2e6582 SHA512 cb87cb3f46cd7f9a9566943fd85f76f4b0f3d908706aa22f5a869e27b99133edd65db595e226177c2be416c4776fd4ce070d1f94983da423055b2f5d8c3a8420 WHIRLPOOL 24bc888b79f8d1420cd7651beff00fa183dfe8079a02cb664a1c2e6786e285320e5edbf8fe365b26c0da811b597b7e78fb91eae6f28773a280c9398e4dc09fe5
+EBUILD pear-1.9.4.ebuild 1135 SHA256 8c91f6d88bf499f9534fe25a04d8050ff2c08bef8766d6e2ff6e6c64b5283015 SHA512 73b6170c9a48bf39ae463dd8a76db0661cd656e16bfa3b5dc2c02d465dcf36ed4a5a20b61eaa00e67c8ee820ef9fbc8128573a82a08adf8e57a0e066055a571e WHIRLPOOL aa04fa4d1fdfcfc702b780687ec20cb321d0498202896ac70176ca8f332b5981baf4b7f55bd457157dfc800869fed8590a28ff073b752b5a9c907e785cfad184
+MISC ChangeLog 4541 SHA256 b1ef0695dcb973214b61fbef529c26b9418de61126d7937abaa992715067c0cd SHA512 3c1ef994b33ebf27afbcd67c84c2900b4ddede9f9912b2f716b45f45ce9262024cebcd86a76434f4b9eb180b9243d9c1cbaccdbdb23ec58b3d5e0426a0352767 WHIRLPOOL b01089a4a527bc867ae17f3643515a40847930404b63496e845999337090b6dcf5d18f72fced7109e7db48e5958987a9d284065a879a5895f9967cc657d11046
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQF8BAEBCABmBQJS5VNsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1Sc0IALhj5lqxIyZCCvug2yPpRz+1
-Wz3yf2dMwnarUGxLEAWhNrnlQhMuC0Po1frnm3bs2IR9YCHG5IMtOZRdR0XrmkYm
-skUE5VWnvvgJuvFgHGvZIi00g2j9WWLsBCpMwI7gNRqdbMsZY44P+qd9FDeacSuk
-oppBSxPfg3oNfwtnRaBRjmAmHkUWth8M39wklTeIqjpTsgmKJxu4zH7kReOpWQxd
-hF8gYklrxGIbLFOJuAwONvbRUCHv3wr2g7hfaKyXcGKz7N/nQ9ymcqFytR8lp/TL
-wgPiu1VQtRqQjkEPS0l7heH97bTJwXIhif9PG6gGzdmyMY+hFP7IZ7ykezgb/mY=
-=WM82
+iQEcBAEBCAAGBQJUNJKaAAoJEE4V4vFnx44dKpQH/2ofSYYUTUddhV0erIj3iw9W
+/R6OORn05TfE0Ly7tjHgg0Los0rCKBrYbr848C366fEUhjK35H134uCbo2Lgml0Y
+7NYBsfxCAwWruMOLoEXyvEwX8Kjm5qUI5xcdEtqtkWn0rYscolIGHE2/J303D+wI
+vlb9FbKmNnMiKTx+5ycHyPbKtfltw7UUcf+Esbn4lsurEKJlcS9oVmeTk11T1pBX
+CEhIs1o6tew+6DOePa7SmaakPX6pd4ukMXhvls8jkb1a0Jb8DjRui1h1Iybrzf2v
+b0r+LwQBZF3Mi56QX5aBAic4d4bI/MlnxL0RkkWc4sA1OhqhthcV6311A1D4xiw=
+=3bKS
 -----END PGP SIGNATURE-----
diff --git a/dev-php/pear/pear-1.9.3.ebuild b/dev-php/pear/pear-1.9.3.ebuild
deleted file mode 100644
index fc0fc52c588c..000000000000
--- a/dev-php/pear/pear-1.9.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pear/pear-1.9.3.ebuild,v 1.8 2014/01/26 18:24:24 olemarkus Exp $
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="PEAR - PHP Extension and Application Repository"
-HOMEPAGE="http://pear.php.net/"
-SRC_URI=""
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="!<dev-php/PEAR-PEAR-1.8.1
-	~dev-php/PEAR-PEAR-${PV}
-	>=dev-php/PEAR-Archive_Tar-1.3.7
-	>=dev-php/PEAR-Console_Getopt-1.2.3
-	>=dev-php/PEAR-Structures_Graph-1.0.2
-	>=dev-php/PEAR-XML_Util-1.2.1"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	:;
-}
-
-pkg_postinst() {
-	pear clear-cache
-
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net components.ez.no
-	pear.propelorm.org pear.phing.info	pear.symfony-project.com pear.phpunit.de
-	pear.php-baustelle.de pear.phpontrax.com pear.agavi.org"
-
-	for chan in ${pearchans} ; do
-		pear channel-discover ${chan}
-		pear channel-update ${chan}
-	done
-}
diff --git a/dev-php/pear/pear-1.9.4.ebuild b/dev-php/pear/pear-1.9.4.ebuild
index eb353c789529..4665eba3a3e5 100644
--- a/dev-php/pear/pear-1.9.4.ebuild
+++ b/dev-php/pear/pear-1.9.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pear/pear-1.9.4.ebuild,v 1.9 2014/01/26 18:24:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pear/pear-1.9.4.ebuild,v 1.10 2014/10/08 01:25:40 grknight Exp $
+
+EAPI=5
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 
@@ -10,6 +12,7 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+S="${WORKDIR}"
 
 DEPEND="!<dev-php/PEAR-PEAR-1.8.1
 	~dev-php/PEAR-PEAR-${PV}