gentoo resync : 17.02.2018

36 files changed, 406 insertions, 79 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3e6727a81cdb..2ec319ae397a 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-File/Manifest b/dev-php/PEAR-File/Manifest
index 8194ae1aa582..ef360519573c 100644
--- a/dev-php/PEAR-File/Manifest
+++ b/dev-php/PEAR-File/Manifest
@@ -1,3 +1,4 @@
 DIST File-1.4.1.tgz 8164 BLAKE2B f57a70b6cdd469c152f7beb2dffe0b278ae0eb71c412729a15b8d2a9dfef1b2bb303d96930bba64bfc1d4f2972a4f64087f972fc0367fef67e6b88c29e56a78a SHA512 78dbe4f80296f3c16df89de2f0d332b442d4787be4f7a3bb78259b0e0a0eb719bbadecba6571609ea6b6a488124ff36b6de08061e88268d5f2805fb8a3be05b0
+EBUILD PEAR-File-1.4.1-r1.ebuild 388 BLAKE2B ab18c2e8cde772a3644bb182d2ae8372e016e192248e63bead1c20eea31be46f81bf4a9a910687ba732b573e2d2c8fa4d786cd817b061ce5b45ac5b51801cb27 SHA512 fd99153f810add29dc58a72e44d717823843b144ab4aca517fd1612f183be1ab83321d4f43f3a462f89b2960e45fe36e726e4f574b7ac4d8120e253432b0c4b2
 EBUILD PEAR-File-1.4.1.ebuild 289 BLAKE2B f60371d0c2c92a19aef3a6a2c615d309be747aeafcba49b33346834d265852e18cdf982631f9354e9a143f6f3ced618ac581ba4529a7b34e678173c3e9acb756 SHA512 1f0b5d166e575555cee445ab2eaed2392536bbe4dab648db88f3cbe7fa983707def8e016d61fc9c32ec73585e43fef3a9dc2a95e6b3c18445628970facbfb240
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..e8b7c9181ee8
--- /dev/null
+++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Common file and directory routines"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+	peardev run-tests -r tests || die
+}
diff --git a/dev-php/PEAR-File_Find/Manifest b/dev-php/PEAR-File_Find/Manifest
index 90d87b9bbfd0..bb77f8e7da92 100644
--- a/dev-php/PEAR-File_Find/Manifest
+++ b/dev-php/PEAR-File_Find/Manifest
@@ -1,5 +1,5 @@
 DIST File_Find-1.3.2.tgz 8157 BLAKE2B 5993f18526fcbec1dea92bf94d1223ca37a9d83345ed0bb2c4b78831eb813ca8609c4f83b41d2948bbd8d17c498cbf704f406ad82581ea93246d164a544e7a04 SHA512 c764c3ad9b215a3c371414c94af191531ea714d5bc02b63debdf063b1a85aac952655ef64c92ce50c838bd49700956406fd4d314327f2d84c7c4b90258defce4
 DIST File_Find-1.3.3.tgz 8212 BLAKE2B be45210efcf1aad52df123dd141f1a8ea62321a25cb460da4384456baeff13b51f8850f44e08cb75baa350e7b2a1419b27d89dd5a81f58a7302ab93c95c274a3 SHA512 f912e1f680c5869380791979bd33dabce0e95e40a84ee188052b2be8280de806fd117c11d66b98b7072724ecd9d57203ee5a32fe35705c337e73393fec075bb0
 EBUILD PEAR-File_Find-1.3.2.ebuild 373 BLAKE2B 66042dd065fb151c5a1eae48a20d0004b732be0858d4ed2c84034127eb4827b265ff85b59c116d8012d56cea55c9010b30b9912a4128d916ee76d85606393e7e SHA512 686fbb9aa5b205c7acf5ad9bd9150d8ccc8d851d4081781fc545c1252d050acb15e498973e6aa65677e30428b1368297f0768a227f39dd21fa0f8e126bbc3a20
-EBUILD PEAR-File_Find-1.3.3.ebuild 1160 BLAKE2B cc51e1a63df512b22e89941b9524faab4ac2525f93ffe1fbc0358bec05aa3412ee1d72d60cad0bd7c44d60153fcfdd530585f2ffb2937ae335869f79a10c4f07 SHA512 bcc469e9730bcfe913545d1f62416a58d8705a4d1b29107fc6b15612c0c6b9aea9a2c03e47e9f253a7a20e2e8b4bdb464610b7dbab19e42fc8024fdf00734803
+EBUILD PEAR-File_Find-1.3.3.ebuild 1159 BLAKE2B cb382cb7751ca40f5d399448ac2c09583bdda6ca2e50b2b6102b26688f9a8bb69f0f4d42a563d7d0e5666d3bcd82330c27725172ae1300ec7d83c10f9e089ea2 SHA512 b559f2c4e535a8ef927dc01f8002fa52477f9001f06addd96edaf523187cf4c958f5a9256406ed49dba91763ec155c50f92f039b497e0546d8902c4d96de7a29
 MISC metadata.xml 377 BLAKE2B d299154cdb99a5ff1562f245e5a24face117c08cb2bd9f457ee83d40bde667ed659c84e94465c1cbaeb6b2220c48738d261ed690aca9bc43fc83d127adcff872 SHA512 1d640be46e06957c8f3c127a9acac3f4f6b197efdcb96b13a5fff00aa638b3cb7febb5cba261ce45bb68c2356894006e3e57343fdf8bfbdb5d60e6a89f173a73
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
index 3bfd60ffb677..b9194e0e267e 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.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
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 # Really only needs PEAR-Exception at runtime.
diff --git a/dev-php/PEAR-File_Fortune/Manifest b/dev-php/PEAR-File_Fortune/Manifest
index 88debd986bd0..827805dc5ffc 100644
--- a/dev-php/PEAR-File_Fortune/Manifest
+++ b/dev-php/PEAR-File_Fortune/Manifest
@@ -1,3 +1,3 @@
 DIST File_Fortune-1.0.0.tgz 14508 BLAKE2B df783a063df6d48692518955f8f1a6306b0e67021c0d3cf6a336ce643a907a5f89578c759f44c9ea36debac28d3819065c2763d5ff8f6c6f63ecd0ea13a68e29 SHA512 4f996e7c6efb339944cdd1cea75400a7539708661b2783fc1126697a12692b3db7a104550da8007fae4e0ac374c2c047a4c90dfa0d2c3424b84f4e1b61ae43ac
-EBUILD PEAR-File_Fortune-1.0.0.ebuild 353 BLAKE2B 4cf57e85fcf8c415977118b9fcd2bef0a9c7c3b98acc86e5a9dc7745d6ba757b73a20b62c81f6930c2655a2d9a9157351a72aa80a8d69bcf6b3ad58b412f199e SHA512 6bf61b79f7951d9fee6008cf8556e20b1d5d6429495a507b21f2081cdbd5b9174580be2f81f668f38017c9a7c43ef8cd31dbbf36e2e62b772f075315bf8a2978
+EBUILD PEAR-File_Fortune-1.0.0-r1.ebuild 421 BLAKE2B cc4be0b791cc431250ee7f3aa264e5fa7447361f4d3603c3e80fb4bc8270d57da3bdd0f09b48f04c7a5794d44738e87d3503d9d5a4c6a51f0dcb3577ab26ebe8 SHA512 c1fff21d960c87718579d2274b28262c079b530d2cb74ececd13a4b795159752d5fbaec5d56cb7d91f564429fd75f0f7f95bf0225862a7d7c4ab67db906fb9dc
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0.ebuild b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
index 1e33656d0fea..ec5a405cb607 100644
--- a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0.ebuild
+++ b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
@@ -1,16 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit php-pear-r1
+inherit php-pear-r2
 
 DESCRIPTION="Interface for reading from and writing to fortune files"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
-DEPEND=">=dev-lang/php-5.1.4:*"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-lang/php-5.1.4:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_test(){
+	phpunit tests || die
+}
diff --git a/dev-php/PEAR-File_Gettext/Manifest b/dev-php/PEAR-File_Gettext/Manifest
index 3483329defd9..76d7d72d0710 100644
--- a/dev-php/PEAR-File_Gettext/Manifest
+++ b/dev-php/PEAR-File_Gettext/Manifest
@@ -1,3 +1,4 @@
+AUX File_Gettext-0.4.2-construct.patch 1999 BLAKE2B 5feac1b3c48fef5401158a06db1410878b50d28841807ea5d2f99c7c59cc51472927f9ee85f9b29deadfbe0c964f761d2fbdcfd912ceeda6a722f463370373ff SHA512 a1ca97160f3c521ba340a89c19933daba20b0c11716349b34b330fe10f5a9e924cc28fa7248efb64648ef1ffac832a16c6051723d6f76c63a03454a523a9fe6e
 DIST File_Gettext-0.4.2.tgz 7307 BLAKE2B f1eae4724c62a44515107a0e4cb89aa7abff8f856c5f11a90f6b78dc4e5601cc024e64e8ae0344c3433ffc5355e2dbb9d7e3cc745001ad2098a073bbca0a97da SHA512 cc56430076485d90afca548c78650a2ada4eb8df7e0a58458eded2dca222466aba91d982fb0103e6b63fc4c8140c3ac4c2a4a7c3c77fbc7740922a8b4e33c6a9
-EBUILD PEAR-File_Gettext-0.4.2.ebuild 279 BLAKE2B 9a5bab308af3bfc0e4f19af4d7d4d7a373ed7961bd436f1b757024b8b5ac25e04f6b327f265bd1bb3e3773f71acca39b8423e73b5768938c895c71f5bffd77c1 SHA512 d929610b846dd4ebae53fd37d2a2db3fc89676ea7e2982c201f48e2c049eff596fe06f4f7f352246f5495af583fc630e997ac88d2e16de44f8a00d157126ec7c
+EBUILD PEAR-File_Gettext-0.4.2-r1.ebuild 338 BLAKE2B 2c1019e66b1d882a149c27c7ca77d2e3850ff2da4cde9544162310e68e7cff3f24733c03fea3a35651edf1441593dc76b3d8c71792d4fe8e36fc463e38e0f9c4 SHA512 638688b767d165d864a512f846a1823f55c6cb18b8dd6153135d391232c453b8f32d94551dfcfb6a6edc10220cfdf0d67ce9d50f9621ab88257eb1e94af9299a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
index 7c2ab3e6487d..633c8c657fc4 100644
--- a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2.ebuild
+++ b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit php-pear-r1
+inherit php-pear-r2
 
 DESCRIPTION="GNU Gettext file parser"
 
@@ -11,3 +11,4 @@ LICENSE="PHP-3"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
+PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" )
diff --git a/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch b/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch
new file mode 100644
index 000000000000..3527814485ab
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch
@@ -0,0 +1,67 @@
+diff -aurN a/File/Gettext/MO.php b/File/Gettext/MO.php
+--- a/File/Gettext/MO.php	2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext/MO.php	2018-02-16 15:15:17.725027132 -0500
+@@ -60,6 +60,10 @@
+      * @access  public
+      * @return  object      File_Gettext_MO
+      */
++    function __construct($file = '')
++    {
++        $this->file = $file;
++    }
+     function File_Gettext_MO($file = '')
+     {
+         $this->file = $file;
+diff -aurN a/File/Gettext/PO.php b/File/Gettext/PO.php
+--- a/File/Gettext/PO.php	2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext/PO.php	2018-02-16 15:14:57.997419162 -0500
+@@ -42,6 +42,10 @@
+      * @access  public
+      * @return  object      File_Gettext_PO
+      */
++    function __construct($file = '')
++    {
++        $this->file = $file;
++    }
+     function File_Gettext_PO($file = '')
+     {
+         $this->file = $file;
+diff -aurN a/File/Gettext.php b/File/Gettext.php
+--- a/File/Gettext.php	2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext.php	2018-02-16 15:14:27.629022634 -0500
+@@ -85,7 +85,7 @@
+             return File_Gettext::raiseError($php_errormsg);
+         }
+         $class = 'File_Gettext_' . $format;
+-        $obref = &new $class($file);
++        $obref = new $class($file);
+         return $obref;
+     }
+ 
+@@ -110,7 +110,7 @@
+ 
+         include_once 'File/Gettext/PO.php';
+ 
+-        $PO = &new File_Gettext_PO($pofile);
++        $PO = new File_Gettext_PO($pofile);
+         if (true !== ($e = $PO->load())) {
+             return $e;
+         }
+@@ -247,7 +247,7 @@
+     function &toMO()
+     {
+         include_once 'File/Gettext/MO.php';
+-        $MO = &new File_Gettext_MO;
++        $MO = new File_Gettext_MO;
+         $MO->fromArray($this->toArray());
+         return $MO;
+     }
+@@ -261,7 +261,7 @@
+     function &toPO()
+     {
+         include_once 'File/Gettext/PO.php';
+-        $PO = &new File_Gettext_PO;
++        $PO = new File_Gettext_PO;
+         $PO->fromArray($this->toArray());
+         return $PO;
+     }
diff --git a/dev-php/PEAR-HTML_CSS/Manifest b/dev-php/PEAR-HTML_CSS/Manifest
index 73168bdfaac3..a3bb436cb898 100644
--- a/dev-php/PEAR-HTML_CSS/Manifest
+++ b/dev-php/PEAR-HTML_CSS/Manifest
@@ -1,3 +1,4 @@
+AUX HTML_CSS-1.5.4-fix-tests.patch 4009 BLAKE2B 6285a30de1d1fae3cb2a1326e451927a8297b77184c6f6371d391358fb8c52852befedbefc4dd65140787cb69e31772a1c1a1ec3c054ba1a4a306cc217f953db SHA512 39bc6ad58740cd7d84cc79285e7cbff3070dd4c5460484cb285d29e1a179a326cb18905288cb581d720327611baf0c33b4b7bfe736fb77f9c52faeb9e0f23490
 DIST HTML_CSS-1.5.4.tgz 45553 BLAKE2B 8fef3897bb577a1c12c7dd96ea4d15de5c1b46b40546b23b7262eaaf99db83c988631639a4f4e9b7a344ec02642e49c01c3afc9858f01ccd8c8e77cb39a75008 SHA512 d9418f5fe62dff27f39a0be80378444db6f9636323dd4a85fc1173cb799aa4e74656a55a1179bfc40a926d6ac3c3d67dde378ac49c2c19468e4541e2302c3afa
-EBUILD PEAR-HTML_CSS-1.5.4-r1.ebuild 415 BLAKE2B ae0ddb8bba4a59f344854b5d43da7b4bd9fcdc134f34845946eff59fed3b4b4ac272817abd63daef63233918a52aff58afe937db9798eb76db3f3658251169b4 SHA512 43eaad075649ca70dadb0512b066c30ad740b0877082f17636d8cbe4a14aef4470db9bd7c08cc7a6fa0afb3cf96d249f80f6419e986eedb0a961a718236449bf
+EBUILD PEAR-HTML_CSS-1.5.4-r2.ebuild 658 BLAKE2B 75f540083de1bc6d789fa06b425ca70fd90d938fdbd494b27535e91313bee50869ce58974acaf09f9f752760b0ba369ca940f2ddad8c56d5368f298a86748d10 SHA512 adca37a844f597d37f51a7108c8b03296aeaba2de63010a6146d17c9e3d0c87163fd1caad6d8f7ab571e7c5e1a059d9e4cdb8d5987023441d7794c933a2c26b8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
deleted file mode 100644
index 0819717f0bbc..000000000000
--- a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
-	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0
-		    >=dev-php/phpunit-3.2.0 )"
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..c9b8063f636f
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
+	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 )"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-3.7 )"
+PATCHES=( "${FILESDIR}/HTML_CSS-1.5.4-fix-tests.patch" )
+
+src_prepare() {
+	mkdir HTML || die
+	mv CSS CSS.php HTML || die
+	default
+}
+
+src_test() {
+	ln -s ../HTML tests/HTML || die
+	phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
new file mode 100644
index 000000000000..410ad7593ec3
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
@@ -0,0 +1,112 @@
+diff -aurN a/tests/AllTests.php b/tests/AllTests.php
+--- a/tests/AllTests.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/AllTests.php	2018-02-16 16:28:52.565010362 -0500
+@@ -24,7 +24,6 @@
+ 

+ require_once 'HTML_CSS_TestSuite_Standard.php';

+ require_once 'HTML_CSS_TestSuite_Output.php';

+-require_once 'HTML_CSS_TestSuite_Bugs.php';

+ 

+ /**

+  * Class for running all test suites for HTML_CSS package.

+@@ -79,7 +78,6 @@
+         $suite = new PHPUnit_Framework_TestSuite('HTML_CSS Test Suite');

+         $suite->addTestSuite('HTML_CSS_TestSuite_Standard');

+         $suite->addTestSuite('HTML_CSS_TestSuite_Output');

+-        $suite->addTestSuite('HTML_CSS_TestSuite_Bugs');

+         return $suite;

+     }

+ 

+@@ -126,4 +124,4 @@
+ if (PHPUnit_MAIN_METHOD == 'HTML_CSS_AllTests::main') {

+     HTML_CSS_AllTests::main();

+ }

+-?>
+\ No newline at end of file
++?>

+diff -aurN a/tests/HTML_CSS_TestSuite_Output.php b/tests/HTML_CSS_TestSuite_Output.php
+--- a/tests/HTML_CSS_TestSuite_Output.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Output.php	2018-02-16 16:36:35.283820690 -0500
+@@ -18,7 +18,6 @@
+ 

+ require_once "PHPUnit/Framework/TestCase.php";

+ require_once "PHPUnit/Framework/TestSuite.php";

+-require_once "PHPUnit/Extensions/OutputTestCase.php";

+ 

+ require_once 'HTML/CSS.php';

+ require_once 'PEAR.php';

+@@ -34,7 +33,7 @@
+  * @link     http://pear.php.net/package/HTML_CSS

+  * @since    File available since Release 1.5.2

+  */

+-class HTML_CSS_TestSuite_Output extends PHPUnit_Extensions_OutputTestCase

++class HTML_CSS_TestSuite_Output extends PHPUnit_Framework_TestCase

+ {

+     /**

+      * A CSS object

+@@ -70,7 +69,12 @@
+ 

+         $this->css = new HTML_CSS($attrs, $prefs);

+ 

+-        $this->setOutputCallback(array(&$this, 'normalizeOutput'));

++        $this->setOutputCallback(array($this, 'normalizeOutput'));

++    }

++

++    protected function normalizeOutput($buffer)

++    {

++        return str_replace("\r", '', $buffer);

+     }

+ 

+     /**

+@@ -153,4 +157,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Output::main") {

+     HTML_CSS_TestSuite_Output::main();

+ }

+-?>
+\ No newline at end of file
++?>

+diff -aurN a/tests/HTML_CSS_TestSuite_Standard.php b/tests/HTML_CSS_TestSuite_Standard.php
+--- a/tests/HTML_CSS_TestSuite_Standard.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Standard.php	2018-02-16 16:47:01.837374212 -0500
+@@ -117,12 +117,10 @@
+      */

+     public function catchError($error, $code, $level)

+     {

+-        $this->assertType(PHPUnit_Framework_Constraint_IsType::TYPE_OBJECT, $error);

+-        if ($error instanceof PEAR_Error) {

+-            $this->assertEquals($error->getCode(), $code);

+-            $user_info = $error->getUserInfo();

+-            $this->assertEquals($user_info['level'], $level);

+-        }

++        $this->assertInstanceOf(PEAR_Error::class, $error);

++        $this->assertEquals($error->getCode(), $code);

++        $user_info = $error->getUserInfo();

++        $this->assertEquals($user_info['level'], $level);

+     }

+ 

+     /**

+@@ -724,7 +722,7 @@
+         $css_data = array($fn, $strcss);

+         $messages = array();

+ 

+-        $stub = $this->getMock('HTML_CSS', array('validate'));

++        $stub = $this->createMock(HTML_CSS::class);

+         $stub->expects($this->any())

+              ->method('validate')

+              ->will($this->returnValue(true));

+@@ -1578,7 +1576,7 @@
+         $this->catchError($r, HTML_CSS_ERROR_INVALID_INPUT, 'exception');

+ 

+         // validate

+-        $stub = $this->getMock('HTML_CSS', array('validate'));

++        $stub = $this->createMock(HTML_CSS::class);

+         $stub->expects($this->any())

+              ->method('validate')

+              ->will($this->returnCallback(array(&$this, 'cbMockValidator')));

+@@ -1680,4 +1678,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Standard::main") {

+     HTML_CSS_TestSuite_Standard::main();

+ }

+-?>
+\ No newline at end of file
++?>

diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index 2503659bdde9..dce8728027e8 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,3 +1,5 @@
 DIST HTTP_Request2-2.2.1.tgz 107339 BLAKE2B fa9d997c7ea59aeb8c4133944d57af3dca79e937b271ad862f8ada26631a14992f204566dc2059cd19a0169f7d89ef1b302ec9fe2b4e370a8e715a0004b474f8 SHA512 377421f521184b3dc4f28b1d37a1f673ee2b40b8786e39c3803ed6c60f57a2aa8353018ea588598b7ef23a1345227a41481519932998dd01958df623d00dcd82
+DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
 EBUILD PEAR-HTTP_Request2-2.2.1.ebuild 407 BLAKE2B 410311e2b925c6ad7b61ad6a7a672b961985a7a54fa4d81fc2d4b8e92e081a4c29826e65cbf29bf7b2b1f4c4816cb2857089984ec78193663e465eddf31b3fc7 SHA512 6523a40db4a3e29b0880e4ff99de81704ebc674a9dbb3658f1bd276cdb9679932c3bd8786b8a7801b00a6e7796feab6a640b7d1834980382963a1efd8ace1e4e
+EBUILD PEAR-HTTP_Request2-2.3.0.ebuild 716 BLAKE2B 8807fe2c7e271e09bb113d45b2fcb76c935c90867c5df67025682f88d8c22f39b261e4e7753f6616249c517ce69c67eab480efe5ca9f91a48e85cd88a7e02c2b SHA512 d9162577f1838c8da9783babb632038d3933ca37471addc7cda49db31fb156670d6485f5d89eea20611ecffdb70b137c471c7454d1d5b644a34fd7f4ffa1a414
 MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0.ebuild
new file mode 100644
index 000000000000..b2c15280e905
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides an easy way to perform HTTP requests"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+curl +fileinfo +ssl test +zlib"
+
+RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?]
+>=dev-php/PEAR-Net_URL2-2.2.0"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" HTTP/Request2/CookieJar.php || die
+	default
+}
+
+src_test() {
+	phpunit tests || die
+}
+
+src_install() {
+	php-pear-r2_src_install
+	insinto "/usr/share/php/${PEAR_PN}"
+	doins data/*
+}
diff --git a/dev-php/PEAR-Net_URL2/Manifest b/dev-php/PEAR-Net_URL2/Manifest
index 9a0794189ae5..7d9ab63fdafc 100644
--- a/dev-php/PEAR-Net_URL2/Manifest
+++ b/dev-php/PEAR-Net_URL2/Manifest
@@ -1,5 +1,5 @@
 DIST Net_URL2-2.0.5.tgz 17456 BLAKE2B d869d8b1863bbcf0f2227fbfbe01e4eccc35a67cdcadcafe45f2f55f0982e2f9b89210985813baeae9f21fa914d804a0092bea51e67a1d2dc9a3d51b3264fff8 SHA512 417af8b2978db763042d92382828f40fa409c599422d9fbe28c48fea4d23a1e5b3c83d5e616f74049009f93d69e82e87c7e656f867af4dd01ce9cb893f380382
 DIST Net_URL2-2.2.1.tgz 20010 BLAKE2B 5c8e5db577ad01dd247b72f82b9014e7cc4ef94955566b65b4210c7371702de8b1b67aa2d8bee27c5d88cabec069e3a334630429547dce2e611ce0da40210b08 SHA512 356eebcb7b077e8a57d19f7a0549c973fe4923fbd83836ac000c1068d7f19c42ebebef5e07a2a5880737d0f8b2398bb32be9fa97ef931a1009d6229dfd71b495
 EBUILD PEAR-Net_URL2-2.0.5.ebuild 311 BLAKE2B c9e496b1154ffa9ab2f2a09ce68561a9e3a5f4de08ce3f30666b49efa283516034ccbb4525bcb7fab0ac498eae59dd312eb5e3de1b4a6ab10d74b2848613abaf SHA512 750c8eb0e23fec72500333839a5bf470acbb4e4a6447b78e06db5ff0836f03810f23d0fcc758f8a9ce695ff9ea7ad70d5d094786dac52561fec011d8d6cff97f
-EBUILD PEAR-Net_URL2-2.2.1-r2.ebuild 356 BLAKE2B b1d531d668ae3f309bbe7f78b70142ce3ea362f7e386b002a46c7234f95cc56428b008332ba7405a2745dfd14d03efa21dda18f0e57b9013751fe289475a9506 SHA512 c672a769e6d5ac9792098742891bc0eb9507f3db36e2154f59bad4981bacee43b597b762d4b96c4116dd48bf779ddc7527189f0f6212d198cf43ee646d87aec9
+EBUILD PEAR-Net_URL2-2.2.1-r2.ebuild 355 BLAKE2B bb5e81f27f461ac2ea06203a087021c17e0caf11d4f22311412b943fba052b22589d627e1ca5fcb024f636c7a485845e1ba0c077d54b023609f8958d65707337 SHA512 85bb5bdb37ed0b2b722f917283f234fac5a648b8842b12defba67795e66612a0fd98e1aea1c46280ecb7c1cce38057c570d50873aa608d8139a4c962551699f7
 MISC metadata.xml 310 BLAKE2B ceeffe3f581bffc5354ffa5ae85c80bf3395578d2300566cab9ae2405485c06bb02d6a55eed89d33eb2af4be3e668073d6fed96614b4a40390ec5339f243f8be SHA512 ee52f22f04cecdd1a9cb93ad11d75a8e9889f988e189995707c28a3923bdac05c330c8f9e658717e3d0713b5f1dcdc772f4ec31fa216ee15006bc67340fcd84a
diff --git a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
index 01588f233170..ffa4c1e5ed85 100644
--- a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
+++ b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DOCS=( docs/6470.php docs/example.php )
diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
index c85a8c0de562..26c085998582 100644
--- a/dev-php/PEAR-OLE/Manifest
+++ b/dev-php/PEAR-OLE/Manifest
@@ -4,5 +4,5 @@ DIST OLE-1.0.0RC2.tgz 13981 BLAKE2B d794318e105b30ab5cc39ce7ab3f7d706bdd72344597
 DIST OLE-1.0.0RC3.tgz 14233 BLAKE2B ca8ae3959b618a0cd9344a3b07c8587f4f1d10063ff6101e8f27d0c4c8b0d08a0a258ae40ac9b7ce30622d57cc6bfbb2a5b4f5b393ef69e25c276813ee70461e SHA512 36a9bbe243d0f172bcd3fc5dd0926a0e42389b4e222cca90678f41bb968c70e4d04c959f3fe3bad1704543ecbcda871a248aa445a1dc6c2f0b73925198f5b07e
 EBUILD PEAR-OLE-1.0.0_rc2-r1.ebuild 625 BLAKE2B d4a0874f2ebc624966efbd7fea9572ed7d6835065193ae52dd58edc101ffa0c9f6a3e9582eb1385e4536ed34ccad531468b384e05be6ddfa678937bbb0e9dd03 SHA512 efd8463b6c131f75ce0fbee812a590e77dca132c7f62fdbfdd156f5b296a0a255f97c054033596ba8da82360e75e7e1ce0e782354f9973419a4ce09450baf741
 EBUILD PEAR-OLE-1.0.0_rc2-r2.ebuild 756 BLAKE2B 331f7230d0effdad12ec6d001a006320bd2218a95a63633e5f7c1db44a1ed2c2ac550e66e45077920c89629d8deb82907165b8ee295afd3c6b210056f645afbf SHA512 95e28eefaeaf15458f001c1cc5d7a9a2f799f201f8cd09ea5a98452d5e0e8af2870df8f1f13281e86297c447df3c96cb9f115aafd65d065997052c34774d15c1
-EBUILD PEAR-OLE-1.0.0_rc3.ebuild 376 BLAKE2B 28d7551f7699e5f8c5d36c318503e3dd3849e585b357cf46b7e7a4b44780d53dc6e29bb989e90fa01374b386cfa233d6789a3588d267a731f83b448970f714a5 SHA512 c687884670cf9b3b88a99e7b7f1c2744d6cfffb0ca6d51d753bdd5331da5d62cdad243687aad9ac16ae6db38c44f7676b7330c7aef1ffcd02154074b1d7c491e
+EBUILD PEAR-OLE-1.0.0_rc3.ebuild 375 BLAKE2B 4222dfb008b3399e00cf37031440f345ae0f201749bc0a382aca2917831ee9a09f3a7911e19d1b1a3d4b056e685006d62953fa6c75ed553ef90577a9f464b008 SHA512 2516ba7069dd59af319555b85ffa00606e055b48c82ae2c8b9c6c84fd33e22099183074b6b361f2e9cfd6fb9adc5bfaf833d64db5e15c265de3a00052c37f3d9
 MISC metadata.xml 365 BLAKE2B d3239ca6d5ef2cac6033276506a09ac2dc02805de0cc194f700be394828c56d754d364fa1b12895f3a78d2fc7145c57b8a097fbbc02bcebd006da21759a42793 SHA512 3871e3db946f3c1d55f06eb228b38e4b3d596b40781c0062c5aa5dad7b785312db6ddf41e16f372f3541c1eaf30264b78bd84db2a4c2843376af4111a50479ae
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
index 65f0246057f1..111377cdd9f1 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.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
@@ -11,5 +11,5 @@ DESCRIPTION="Package for reading and writing OLE containers"
 HOMEPAGE="https://pear.php.net/package/OLE"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
index 4c61f4e3ed18..5695f5faa5a7 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/Manifest
+++ b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_PackageFileManager-1.7.2.tgz 38104 BLAKE2B 126578a570db3e92b8c3b3d04588a77e81b14ed6b6c40e9a6c90739d2ae86bfaad8cac2b5ece4deaea9ea1e356d2645997402200236e394f68c0dc5fa9eaafe5 SHA512 4a0a201fea221a8e2d21199f99d4f145e39f42344a0057f32bfefd96aa2635e12ea75ee6b6ac64c52a8d35be5e2a65fa5399b3195592dea9ba10191c45fc0056
-EBUILD PEAR-PEAR_PackageFileManager-1.7.2-r1.ebuild 484 BLAKE2B 11d3cbe2515968a7403bbfe33f9f6542ebc6f8ce63855880fd2159e0c7467948e6a3012a768244c5eed3e81fa69885f23e79037992877374265386c4b3cb5d56 SHA512 d005e9e346e13baaa80687cc379f30e546873934e5a87a087240e171e5ab8cb366ae14416e9a7e0a504a11978d701835f0d6d596573ac6be12877c16964b4e99
+EBUILD PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild 426 BLAKE2B ea7ad04a92fdc84aa9d7ff2cddfd2cede42c93772efce964406213060cd3982515ce047ba3da25466062d2c5f19d21e7c405d830e54e76cbdc77a89690643a37 SHA512 5eac9a418d350650a680bde42b0da7c800ef10cfa7f05e1ccc6db7d2baa11639b8ab98fcf8c669ee755319b39af3427fdbd42f9618ee2f23367d77d2c61bce7c
 MISC metadata.xml 325 BLAKE2B 626bdcf012d0b1bf419e317ae321a2de1f7e902f67ab5bad48d52992ded8537fd496e9e11c5e2bcb8bca10c5b79820bf34722f9192e6cad8df5bb24c97e83f60 SHA512 81cbf761721cbd85615855d2bd77c3d7354c891c62ef2daaf711a2e32ebda7b968366d5d8c3c8322f2a8e122c48933b796439340d1fd1693e3db2dc36c2c324f
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r1.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
index 1e153900c988..b0973dc62119 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r1.ebuild
+++ b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.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
@@ -9,10 +9,9 @@ DESCRIPTION="Updates an existing package.xml file with a new filelist and change
 LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
+IUSE=""
 
 RDEPEND=">=dev-lang/php-5.3:*
 	>=dev-php/PEAR-PEAR-1.10.1
 	dev-php/PEAR-PEAR_PackageFileManager2
-	dev-php/PEAR-PEAR_PackageFileManager_Plugins
-	!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"
+	dev-php/PEAR-PEAR_PackageFileManager_Plugins"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
index 6a6b96caec2f..6901ffa659ed 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_PackageFileManager2-1.0.4.tgz 43365 BLAKE2B 5eae7eb6f2ae91487ab83dc048ff2fa4c63a4f8208e88e0897340ef63aded28b355f22aec8e12e4da918ed1f24434c6269b53f4755ec80cf4edf7a240e03e545 SHA512 2748ebb21158521a74246ea410f9a30ae6d4b41e88aba543888238c5fc53060e6cf5c537cb95f595147690a2cbdfaaa34a6b3280924ee153cd3d47f2deb3a636
-EBUILD PEAR-PEAR_PackageFileManager2-1.0.4-r1.ebuild 445 BLAKE2B 9f7f23095267b780cf92743dae3cadeed9da7be3cd3d12e5a78d68d07ffd9d485858a46f7efdee961d8ee8547cd0d7d16750c2098337ee98e754da9096fa13d3 SHA512 de37c3aacc1807c399b8aa20e7f0edc14b0035c88f1490de6cef272a6482a925ec6b8c6a59f769817aa2c4bbde1bd3f68a773fafc03962a3ced5ae7a9b203caa
+EBUILD PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild 387 BLAKE2B e41776339c8d2ebf530126add435d4364d6f51fd3eb996c4e3d9420fe3434db1bbd2fa9811e5b8a27c8854fb6898cfdb0f5112fa731e5932abfb826758b45605 SHA512 b67af6ee028bc546e29922385f7b3e023a2b83dfb0f438939b9345473962567729a3752dc2b287077f7f16328e534d34a8357c8763f6ce43d798d62f8d284cdf
 MISC metadata.xml 326 BLAKE2B 12d60b4e028e6262c9954ed790f50a24d93b9fd0b3bfa2b94f50c0576b9cdacb7e61dfb1e394a581e700de4163df92d979a2873ed4b13e20dd12fd8811174954 SHA512 11103fa47012eb0dee5fb6c58c151873ec563fe56ed6a9ea1787a4a229f56ba6848eac9498936ef559f80c18985202a28205f8019bbc1c9956e7e0e941c2add4
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r1.ebuild b/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild
index 80087437242b..e896e2b1d697 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r1.ebuild
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.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
@@ -9,9 +9,8 @@ DESCRIPTION="Updates an existing package.xml file with a new filelist and change
 LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
+IUSE=""
 
 RDEPEND=">=dev-lang/php-5.3:*
 	>=dev-php/PEAR-PEAR-1.10.1
-	dev-php/PEAR-PEAR_PackageFileManager_Plugins
-	!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"
+	dev-php/PEAR-PEAR_PackageFileManager_Plugins"
diff --git a/dev-php/PEAR-Pager/Manifest b/dev-php/PEAR-Pager/Manifest
index 8fd05528f253..399943bcf8c9 100644
--- a/dev-php/PEAR-Pager/Manifest
+++ b/dev-php/PEAR-Pager/Manifest
@@ -1,5 +1,5 @@
 DIST Pager-2.4.9.tgz 36055 BLAKE2B 87abbc81c567f38b042655f3eca5e1aaeb16a0698c1fcdabc66c759a8e2c80bcecff1b14842bfc8eb650c61042d0fb7a19f430095b0af8fee26e0f8d4425e6e4 SHA512 1bd4cef68d0f0ef3a6cf4b44eec1d6ec99725bcbc4ac575a111e8de67538c09a4b09fe0dbbd57cdfd6d4f395e55857eb71cb6914a94e7efd03e6f6d78a592864
 DIST Pager-2.5.1.tgz 36596 BLAKE2B a41317844cd79852dd2df88dc1d3fe42f68c1dcb6308846dee119e29b5c2b1ecb16cb2669029be4b31f13d3e6a1ff315f92847554d0b18f5845425a714ea9593 SHA512 59c93117196876e87ced8549b94e31255d280bc6a47a3d2197677d118c6bba77a4a4f404266f03eb42da5da1682c13e19610fe37c244bc9aa379b14931779f71
 EBUILD PEAR-Pager-2.4.9.ebuild 254 BLAKE2B 7207674ba6a2d111f4d18763a7c27e48bf3002973f4fef90a434de27fc042d5f21c57ecfaae2c36e9b653e707970e56ebef2747d55837e7b6d75e9da1b38c2eb SHA512 05fc2a8ff219b73c14bc59f0d1277d06270f352b688986ef30c34dc41aa5941b184afd166e70d3b6b87b0e44bb07799393c0381bc063c0b49aac200a640e673b
-EBUILD PEAR-Pager-2.5.1.ebuild 296 BLAKE2B 18786403e6027e0bc68960fc95689d8d10251ab276f11b268cb081d31594ee3a962eddd1f16667a2d4cb45c5d87a673c12504f5f9573d9859fee02dd4192bd4a SHA512 bcc442bd25023e9a42b6b97a2e3eeb759efa15906d6b6928fa2cb213a5c45c086cf180c64b572cc0f8033ecdd78bbdb87d148e2ee2a85c89f150eb1a718e65c4
+EBUILD PEAR-Pager-2.5.1.ebuild 295 BLAKE2B bc469d16326522bf9b127772c64ffff73b124be70fe5f9d4656b5a054a67238c9ec6c2186c4c66ba1fe80c031b519f83582e17481d96d7287908e9c440dbc493 SHA512 cb3601e80fb4e325a115b957640a8b23362f4cc14b0783baa7a068d3392e93ce38ce0ccc1d89984929ba6d465ae9cd339a55756d8658f1f70d3f88d0757f3768
 MISC metadata.xml 369 BLAKE2B 56492dbfe99972e9578a8c20602d5062261b5ce0f0348a76cec46c816d5e41b60fbf4ed9ee77548e6b545ed4024cd6e3e972b29ded9ad71446eb5e9a12b2c7f3 SHA512 5bb1d6cb8e32ac1072ee2f8224112a2758003ceaf9caa327ccc0c3c546ac4e4148e2681fb9d75376ad75c7a38a67d6a3bee4b238e6874f2729e67667cfd6ab65
diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
index 1159b32d07d0..dd211efd7e7c 100644
--- a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
+++ b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.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
@@ -9,7 +9,7 @@ DESCRIPTION="Data paging class"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/php-5.6.0:*"
diff --git a/dev-php/PEAR-Services_JSON/Manifest b/dev-php/PEAR-Services_JSON/Manifest
index ba88dd22f1d3..4a4443c817f3 100644
--- a/dev-php/PEAR-Services_JSON/Manifest
+++ b/dev-php/PEAR-Services_JSON/Manifest
@@ -1,3 +1,5 @@
+AUX JSON-1.0.3-constructor.patch 1705 BLAKE2B fe8af8e0f1b3ff1632dc55501484e803d612b4a4c7b8dc5ede6ad57af95286574f213f87901e9491515582eab4dc0b48de2dc43995eb7d27e9bb69630ce0d74a SHA512 e61b88d35cb9a58622e0e7c58767306712cd9a39c908e64f0c2e2e51f277a43b2d0af177c1050d0bfc8c7fa387d868949644c62554f9a8d3f83157b3ec8577e5
+AUX JSON-1.0.3-upstream-typo.patch 758 BLAKE2B 9a443f2a4f9a52df75b11c46522d6894872dbfe97db165ce595b4237f773a6bf8143b4a1d1335282baf32487cd22403f444175ea62b40aed87dfec083a16d6d5 SHA512 455b44ac00f6efb8eae96f2a2cc83aa2c3d36f318e587f0412e45338625dd2566facdf9ff042f97d98780a25bd9d5ddd8a81faa422ba9afd211e3df4e7b30976
 DIST Services_JSON-1.0.3.tgz 9529 BLAKE2B 5a35899d53b66f3534afd64105c361e7aafa22641f540ef5ed38789ccc771f4e62577b1044af8d617579aed36e014e38e6bc30f39b476b09b47202d8822028d7 SHA512 2a94bebb662e250d56ae1f02f6debbff9e956820a603b8c4520f48ad0ed67a40c342d4eb000be9a9cf0e5b91c7bf9ebf98fae87f9ecca217b94b12441b746e5e
-EBUILD PEAR-Services_JSON-1.0.3.ebuild 283 BLAKE2B 18e1621f1b200f782fdf4e24048f76f58ac3091b8e3a7b3ea3c9ed5b585b2f6b33ab68e1c2b40429bf1158aa088a8609f420edd12ba571f36326fe5eb5508d9d SHA512 1e66e0af3fa5882a0a209bdbe7723cff27e180734d5f0445fea349c955a114ea19c19a5ff204f93392c8f174043dc2fd37073dc9e426911670d70a712dbb3a12
+EBUILD PEAR-Services_JSON-1.0.3-r1.ebuild 476 BLAKE2B ad30d170717d858beaf1b956759ea4374d0eb66f2b8ede32c929efe55c949cd199994053b412d8858e38db724b1ad81492b9ecf2c3e94d07a7a9491339d060ef SHA512 eb642f611fbdb5617d0cf19a6ac03d66f8514ff9f57bc567c07a3d2ae0070e744de8d0b84339f85e1edc53e6245e65a403551b02de70a7ed38b4d901ee3e7847
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..9e52d443b4b0
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+IUSE=""
+DESCRIPTION="PHP implementaion of json_encode/decode"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" )
+
+src_install() {
+	php-pear-r2_src_install
+	insinto /usr/share/php/Services
+	doins JSON.php
+}
diff --git a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3.ebuild b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3.ebuild
deleted file mode 100644
index a947e5e37ffb..000000000000
--- a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-IUSE=""
-DESCRIPTION="PHP implementaion of json_encode/decode"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch
new file mode 100644
index 000000000000..d7348f0f858e
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch
@@ -0,0 +1,42 @@
+diff -aurN a/JSON.php b/JSON.php
+--- a/JSON.php	2011-01-13 21:40:48.000000000 -0500
++++ b/JSON.php	2018-02-15 11:42:06.551287857 -0500
+@@ -139,6 +139,14 @@
+     *                                   strings or numbers, if you return an object, make sure it does
+     *                                   not have a toJSON method, otherwise an error will occur.
+     */
++    function __construct($use = 0)
++    {
++        $this->use = $use;
++        $this->_mb_strlen            = function_exists('mb_strlen');
++        $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
++        $this->_mb_substr            = function_exists('mb_substr');
++    }
++
+     function Services_JSON($use = 0)
+     {
+         $this->use = $use;
+@@ -909,6 +917,11 @@
+ 
+     class Services_JSON_Error extends PEAR_Error
+     {
++        function __construct($message = 'unknown error', $code = null,
++                                     $mode = null, $options = null, $userinfo = null)
++        {
++            parent::__construct($message, $code, $mode, $options, $userinfo);
++        }
+         function Services_JSON_Error($message = 'unknown error', $code = null,
+                                      $mode = null, $options = null, $userinfo = null)
+         {
+@@ -923,6 +936,11 @@
+      */
+     class Services_JSON_Error
+     {
++        function __construct($message = 'unknown error', $code = null,
++                                     $mode = null, $options = null, $userinfo = null)
++        {
++            return;
++        }
+         function Services_JSON_Error($message = 'unknown error', $code = null,
+                                      $mode = null, $options = null, $userinfo = null)
+         {
diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch
new file mode 100644
index 000000000000..c7d8be3aa910
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch
@@ -0,0 +1,20 @@
+--- a/JSON.php	2011/01/28 00:16:42	307804
++++ b/JSON.php	2013/04/30 02:37:26	330165
+@@ -554,7 +544,7 @@
+                         
+                         return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+                         ? 'null'
+-                        : new Services_JSON_Error(class_name($var).
++                        : new Services_JSON_Error(get_class($var).
+                             " toJSON returned an object with a toJSON method.");
+                             
+                     }
+@@ -995,7 +985,7 @@
+         function Services_JSON_Error($message = 'unknown error', $code = null,
+                                      $mode = null, $options = null, $userinfo = null)
+         {
+-
++            return;
+         }
+     }
+     
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest b/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
index cd00eab63a0f..1b8250482e54 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
@@ -1,5 +1,5 @@
 DIST Spreadsheet_Excel_Writer-0.9.3.tgz 57258 BLAKE2B 43bb6c5c1642c27fce594e22225475987506b0c00d0cdde70aaf1ceac01042931ea740c49f6dcdabc727a4127d91a07e3754c8671f14457d93aeb5c8a377d872 SHA512 6337fe5e7f75e00c5698df1d530684ab8756f1865c98ce9708035fa45eb64943d433dd6d8906a7146417f733053e3702094aa94a70343f990574425882a490e4
 DIST Spreadsheet_Excel_Writer-0.9.4.tgz 58480 BLAKE2B 3469f9ab5965f6c4ef84d05c8f8ad76e57d354c6d7890327ac83b04bfe03dd675a9a9c60fc3f35eef005bfc338f3d91ed3c37d76d781d053bde15f3195d56193 SHA512 e8254e6e15862147830fd4300d6fb88978d84ad350e2e969af1d02df282c54798a429717874f8d12dc031bbc6dbe752e6b740fcd2b7094dc9eda666145f50431
 EBUILD PEAR-Spreadsheet_Excel_Writer-0.9.3.ebuild 353 BLAKE2B caf0ea2a797367c3cb2aaef30a607aa281c5b8e5cdf71045c6c7896ddc754bb26c209c8419acdd10d2038534f408d51f03886ad48735d84ef9f1d38a4a919d8c SHA512 14b6b9db55363a580d3589e248a611f191e9903051acb1f1ebdb2ded6945ef64a5f89f233b489d4ec5fe228d14daf0e7d9b57d60c320b8361cb4e6efc4d4110c
-EBUILD PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild 370 BLAKE2B 97f5ab084c30a7cb29ddfb4f34e2bce4eaf2f1e2728a46445fafe4af662e21e52e97d2689cd5aa64b56bf163565fe3493d67def83a6d02b6963a2879e0ed5246 SHA512 29e2928aa337a7b04710421d2ce6bf17791c27273a8f58490848edfc98ee5c9157e1d2be69445dabd1169f439dc2db6eff3ae2da94d430e1911bec6881f7149a
+EBUILD PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild 369 BLAKE2B 586e2c256b089aefdd75ac01c3429b2972bed37b95254244e104bb901b78ce8feaa30645709e78d74e775db48337e98868f125bfbddebfe3f7ec769cd2ffca38 SHA512 81d579ea62d497590f2056dcf3a4f49126e2c3c14416475a989c2196e54e83525f759c8772595750cd8996966ab7c827a958528d8a84bce92ba39148f82daf45
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
index efb3b433ed87..533136f4f7b0 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Package for generating Excel spreadsheets"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RDEPEND=">=dev-lang/php-5.4:*[iconv]
 	>=dev-php/PEAR-OLE-0.5-r1"
 IUSE=""
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest b/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
index aeefb36913dd..8cb757a2936b 100644
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
@@ -1,3 +1,3 @@
 DIST Text_CAPTCHA_Numeral-1.3.2.tgz 7741 BLAKE2B 34ffcf435d4737d4d894fe43bf1ee8e88e2050323d5bd5186c270df25045b6938e0eb9072471c83ae5c2bfb7a7e1bf970b2e0dce05eb8d9b7f8a64c7f78c3116 SHA512 be3660b20b857092859d7bbb3cbb35c08dc79a2ea3ebcca035b1defae07dfcd36ce00a47f1708ce4f1bb412c23a7cc867d8b677032e7c0ce13e910fb038a5b5d
-EBUILD PEAR-Text_CAPTCHA_Numeral-1.3.2.ebuild 275 BLAKE2B 5b3785d1b31527c27c9bd1c914f8241d984fa92a87ca98a751ee74c55fff02f4d980c96c03267bb37026463c00af01b003612b9702446f4c6dfd591bae7ae260 SHA512 408a7bcf60e73762ea555472179e4360743f1cda2055dac884fe51fb4464c2f6e196e9874ad516f1ecb110be42c7251cb0f23cefd16deab4187746d4f101abf4
+EBUILD PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild 426 BLAKE2B dc91d6a8972e06629a67fb787f823140e1db3ce082959c324b9b47152128477173a346f2b1549f037722ddb99652cbaaf1263c30f207c11c0a44e28a91ed680b SHA512 f930850b2eb6daa4dce0069eeddeea8278e5220cb19704b2eb6e471a95dd5b512ca675c098162a93367b597d72873800f184cc8be70d20382738287653019721
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..b370be7a4616
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Generates mathematical operations and answers to prove user is human"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+HTML_DOCS=( examples/liveNumeral.php examples/numeral1.php )
+
+src_test() {
+	peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2.ebuild b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2.ebuild
deleted file mode 100644
index 0ca9ee78505d..000000000000
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Generates mathematical operations and answers to prove user is human"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""