gentoo resync : 15.02.2018

3 files changed, 8 insertions, 30 deletions

diff --git a/dev-php/PEAR-Console_Getargs/Manifest b/dev-php/PEAR-Console_Getargs/Manifest
index 5d817d2fa63d..bbbfb523f35d 100644
--- a/dev-php/PEAR-Console_Getargs/Manifest
+++ b/dev-php/PEAR-Console_Getargs/Manifest
@@ -1,4 +1,3 @@
-AUX new-reference-fix.patch 741 BLAKE2B a67770fe868c63a1461dd5e79752a767ff7a1f228e19b8362dc5204804b7af5b78fe4d3f2b698babc2eaf6c26243d958f175bddd083b9cb5df47eb7b42f06749 SHA512 dc3f89ae5a4ec4e81df7ca47ae28c0a9d9b21a8623b836431e5b4222dea28d43ee254e7debd4a4aec584f23e081df69978d44aade04daef1fb09d6b40c0a035f
-DIST Console_Getargs-1.3.5.tgz 18207 BLAKE2B d68ea1220700d43a9d7a0844d8659f9e95b377f9a9c609501d0b325083013ac220367c98b545917066e952a8c304703dddf920cdb80c129f222873934895822e SHA512 2e79bfc3947dbce928ae592d825ea16414de147a10f7c41a896d9a557c40a1e83842e39de6e6a78918d91235da73307f84b837a3d049b36cacd202c4b8aa7fd6
-EBUILD PEAR-Console_Getargs-1.3.5-r1.ebuild 363 BLAKE2B aef14fdbc92a87b7312c921044df978a1ba3fa8a9ab90ff5286e62f1b68017a588a278adf6d02b6df53dcb802219875a3e55e32fe0a2160d2048139f2221ad94 SHA512 71cf43f3582410d896ff45afd4c4b4558963a0b8244d8afc36ddcd26daf4c61d75bb17f16b94e959b6877b6351cdd005b4c45a3b7a2343d1bf1647e6aaa9be4c
+DIST Console_Getargs-1.4.0.tgz 18267 BLAKE2B c0aab73414a0b6dec9818faa2eae4a4f54d70168d089bb64497599e88f4b8ff86e4195e3705a75bece25f6c7d1054759b846be75f7fc749f1d50b4447ad9ec50 SHA512 927777f48599f64e2cdb05b80a473741718493e9efc20988f2993e6b092852f1432e2e9732c1470f7d580fc7e4000d563b7915a94305fe572b7f6dc27da0858e
+EBUILD PEAR-Console_Getargs-1.4.0.ebuild 364 BLAKE2B dc45652e41be48b28ac977a7e4229c1b32287fd927e9408cc28c2709e7f18fe244363b081eb30e3db31f79778304fbb5b6cec097b4caa81ede8b8d4142a21158 SHA512 e7a30f133d1eb61f9ec5e77aec78bf0aa6765be0906e4b98ee79fd5c173b298f370152df67059af9e6dec137ec73451b6b01e66a621756da8a9c5c7440f0985b
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.3.5-r1.ebuild b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
index 991a8089f5af..58692f2f12eb 100644
--- a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.3.5-r1.ebuild
+++ b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,9 +10,10 @@ DESCRIPTION="A command-line arguments parser"
 LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
-src_prepare() {
-	eapply "${FILESDIR}/new-reference-fix.patch"
-	eapply_user
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+	phpunit tests/ || die
 }
diff --git a/dev-php/PEAR-Console_Getargs/files/new-reference-fix.patch b/dev-php/PEAR-Console_Getargs/files/new-reference-fix.patch
deleted file mode 100644
index a69aa2b9bde5..000000000000
--- a/dev-php/PEAR-Console_Getargs/files/new-reference-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c769f79831c43f1cad0b4f8831276da93d28f479 Mon Sep 17 00:00:00 2001
-From: Daniel O'Connor <daniel.oconnor@gmail.com>
-Date: Sun, 6 Nov 2011 13:25:04 +1030
-Subject: [PATCH] &new vs new
-
----
- Console/Getargs.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Console/Getargs.php b/Console/Getargs.php
-index 8ba21c6..c6826ea 100644
---- a/Console/Getargs.php
-+++ b/Console/Getargs.php
-@@ -224,7 +224,7 @@ class Console_Getargs
-     function &factory($config = array(), $arguments = null)
-     {
-         // Create the options object.
--        $obj = & new Console_Getargs_Options();
-+        $obj = new Console_Getargs_Options();
- 
-         // Try to set up the arguments.
-         $err = $obj->init($config, $arguments);