gentoo resync : 28.04.2018

61 files changed, 230 insertions, 420 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index bd15eb793cb5..1fe3bc803f30 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Cache_Lite/Manifest b/dev-php/PEAR-Cache_Lite/Manifest
index f8864f094add..dd6e52554f2c 100644
--- a/dev-php/PEAR-Cache_Lite/Manifest
+++ b/dev-php/PEAR-Cache_Lite/Manifest
@@ -1,7 +1,3 @@
-DIST Cache_Lite-1.7.16.tgz 32997 BLAKE2B a717ab816f2206f50a725c2424559d450c111f929c3c1ab48492737e557b8aef2ac79a0473f73ee337c501cde61dfb5d5a9b621d1bd984d288f5852c7452c86b SHA512 d2682ccc5e748d7233f79e51a8c0fae0fe77cec56730d0832e4c1f468227ee431b8e29b582b82f36a6274d50a0bbd12a9870bfeacb7c6943ad3002131aab455b
-DIST Cache_Lite-1.8.0.tgz 33424 BLAKE2B f0211bbfa12aef58bfec0eea0dd96712799a353bf2df3af8f1b63fdaa4e27714a8fce10a74bc87aeb55cbb9c76de494ffc6136489f7afd1e7f64febc444d27bd SHA512 7ff7d1d1f054e1711dbaf5e9c402414c6f2e89e09a25a0b81f207288da3bba373b4e9e2c8a92b638d502d064581b7eade73f66672beaf2e3725957a6dc45c03c
 DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
-EBUILD PEAR-Cache_Lite-1.7.16.ebuild 276 BLAKE2B f991980e20d925ecdaa65ae0a87e942f44631ac2ad144efad7418376fbcd763b9e7e4dae6c2c1ff20f8ceb5f8da6242cd4654c7dea5c80169bff28f3735301d7 SHA512 d0d6f99e49362e4a40918dcf90f6e3dc22f8da87031946a4dcb9b386c2cdde5a9495121fef81d399ec6571f510008190528c1b79e67d673c89075bae39f3aff3
-EBUILD PEAR-Cache_Lite-1.8.0-r1.ebuild 485 BLAKE2B 4e9c67dbf9108d6f62733bd217ffb5359199a9e750593619cfa24b917c03884648e1bc432d7436972457ac46296e9fe0c1ff98583b6e1879eace389453110a51 SHA512 c63a8c215953bdb63207bdf66fe81f1da388e89611afa7c610263704608c68455c9f94410121871346f148bf1d704f9b948ed94031eeaf6d6713adb2888207f3
-EBUILD PEAR-Cache_Lite-1.8.2.ebuild 454 BLAKE2B 651c607566bf6a53a69c61876412c2287900f9b4024359aeac09d2e39cb6f002b19415b356a19714e99858cb3f9069559f6884de73a22863e6841b835728b006 SHA512 bda54e2579320ae0da19aefc45136b7a1351adca14518eac5ea74b78fd44fc939ff7c4749d6a959a2d06c5e64dbca92cea156e765341697d1d9b3f33b2cf492b
+EBUILD PEAR-Cache_Lite-1.8.2.ebuild 446 BLAKE2B 3b40eeac7f0e14cecb9b0e1bcd72a85d9f3074eba2196661f985bde606f5816ce8e7a27aaf3338c329a7d25db3bb18e9ba349e22b289893d71b3e2edd079ce6f SHA512 dccdbdee24bd6d4502e30848e1f8a8fc8dac08c6ff5a617d578c4e99393b755861a98e7c4c29a476ecbf1b956fb1cafdc3e7895d5fe02053ac45559e6ea1a93d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild
deleted file mode 100644
index 179c7dd9a6ff..000000000000
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.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
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-DESCRIPTION="Fast and safe little cache system"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.0-r1.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.0-r1.ebuild
deleted file mode 100644
index ccc9c00bfc61..000000000000
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit php-pear-r2
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-DESCRIPTION="Fast and safe little cache system"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-php/pear-1.10.1"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	peardev run-tests -r || die
-}
-
-src_install() {
-	local DOCS=( README.md TODO docs/technical docs/examples )
-	php-pear-r2_src_install
-}
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
index 04b0fff79130..460d3047f136 100644
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 DESCRIPTION="Fast and safe little cache system"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-Config/Manifest b/dev-php/PEAR-Config/Manifest
index 98f2a7ea6230..8cdd95a0e39a 100644
--- a/dev-php/PEAR-Config/Manifest
+++ b/dev-php/PEAR-Config/Manifest
@@ -1,5 +1,3 @@
-DIST Config-1.10.12.tgz 32291 BLAKE2B 8df42a9c3c34c7fe6cb7f5ffae75488e4cb557bde97c84e044356471d618cfa9ca9ce350cf5346bf9251e89f9716126b1bc342b4765ea81de2235fdcc51527e9 SHA512 c4ebb92d1440fbbb5119341eae7d90944661da35236af1d7ea8ed6753913aa2805a2256e8cb58b7c72f0ff0c56022c72e7d432be9e3e729001004192cbef0642
 DIST Config-2.0.0_pre20140323.tar.gz 34309 BLAKE2B 4c9af6b488f874f58a54a6051a41dbbfd04d2ca042089ce1433b5a11ec2e3e7d35c0b4a08bae7cb5081a7da0d5d08c5f14e982178e1cc409194f80cc46cd4e32 SHA512 7056724cde7d39f5a2ac69c8e2dffd0ff57cb8caba6f014b5cb2a3b047946ca160fb4c30c01cf1986286d885893c9e0f504cee8920b46324987f707b5408be24
-EBUILD PEAR-Config-1.10.12-r1.ebuild 360 BLAKE2B 3c361c2b2b0d208a4b0f976aab3fcdbc40fd4077f174383dc46b8a501d54f1e16cc3f889a2d25c53d483fea236ddf7eff93f43f1b2f1651cb6541caf9588cdd9 SHA512 7db6f984939aaab86aacce3179c9dc1be773ef9135971bf191cce69b5a582fc723853d46ed94116ee543e1cb286f03e4fca9be93e58109e52cad5d90d0cf5ccd
-EBUILD PEAR-Config-2.0.0_pre20140323.ebuild 726 BLAKE2B b95046909f2c8308c48ca129e99c8aca27618037aba006f7829a8e264d6eccb3a722f76cc41d5b3ff56ed1dfaef9377af5534c09dff45d3c415696b5e66d1fa6 SHA512 fedd4b188eb9fecc35ff71d4b1bbb6fec3493668e83b68b2c3f491b2e75808c5f0a2bc2100dbd89b6d8a9d755be0c89ff5e4477ce10d172531e503ac64152b1c
+EBUILD PEAR-Config-2.0.0_pre20140323-r1.ebuild 921 BLAKE2B f34e1a351860a1965aff01998724d3cf42f07b3502eeebb84c689cf740d84c6a00d17015138d59abc8db57f18fff826d5a5eb65fd2b29fe698204415a0eef3ae SHA512 6154d657b0ff663c4b3f33f517bb26199491cf7380ea1ae0931892b3188de622b833d17c0422d58f496453b695f93e3374873784ec068959b3ecc8c0e4504a45
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Config/PEAR-Config-1.10.12-r1.ebuild b/dev-php/PEAR-Config/PEAR-Config-1.10.12-r1.ebuild
deleted file mode 100644
index fc014c497089..000000000000
--- a/dev-php/PEAR-Config/PEAR-Config-1.10.12-r1.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="Provides multiple methods for configuration manipulation"
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xml"
-RDEPEND="xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util )"
diff --git a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323.ebuild b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
index 684a28704a96..fd949ea89cfc 100644
--- a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323.ebuild
+++ b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.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,8 +9,9 @@ DESCRIPTION="Provides multiple methods for configuration manipulation"
 LICENSE="PHP-2.02"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xml"
+IUSE="test xml"
 RDEPEND="xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util )"
+DEPEND="test? ( ${RDEPEND} )"
 SRC_URI="https://github.com/pear/Config/archive/606a24034ad80f9d6ccb5a8b698b702b392e4674.tar.gz -> ${PEAR_P}.tar.gz"
 DOCS=( docs/TODO )
 HTML_DOCS=( docs/Apache.php docs/IniCommented.php docs/IniFromScratch.php )
@@ -18,5 +19,11 @@ HTML_DOCS=( docs/Apache.php docs/IniCommented.php docs/IniFromScratch.php )
 src_prepare() {
 	# Move snapshot location to where the eclass expects
 	mv "${S}/package.xml" "${WORKDIR}/package.xml" || die
+	sed -i 's/&new/new/' test/phpt_test.php.inc || die
+	sed -i 's/& new/ new/' test/bug6441.phpt || die
 	eapply_user
 }
+
+src_test() {
+	pear run-tests test || die "Tests failed"
+}
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index e2c38d233812..73160f30d294 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,6 +1,4 @@
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
-DIST Crypt_GPG-1.6.0b3.tgz 345445 BLAKE2B ab9318fa026f3dbde5974da9581b9fdf73245e78a8b5e891b2151aa7ebc8e1356a090e21a05129f4d3aa110a78082621ab386625069936f4644a1fff2bb461ef SHA512 0a3cb665fac8e84a0699600155cb74e2394e4759fe0b111d971d253ca511a371d06d826e54abadfbb3f707833cd3d6b369f52d04541b3e04f217056ec8439f4c
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
-EBUILD PEAR-Crypt_GPG-1.6.0_beta3.ebuild 1152 BLAKE2B 72202660f6f43e52b5819bf0c8be115a90d59a4bf1770d73174ce23a91e442ebd7d80755a83c044b911b27a8a3d1781ea1504c6edc9d908169df6ac7aed3acfd SHA512 34df8399c2027aa5d78ff5a21f57fe4f5e8b877fd46abc199522b5eb731ef73055c115ef2136da3a75ac1660a67a79bd4d1dd8c73978aa538322d90b655818c6
-EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1149 BLAKE2B fb3b84d4d80c2fc84de4abab4b696b6899e1a3e25f3f71ca7e39a5d477ae52ad00032213a3aff363b02547afbe3d6d85ecfd00b9f91c6339fc637a36ab83fb03 SHA512 0cc721add3a3307bf6bf940c9e3a97ce556afb8ee45dc2756865675924572976222975a1e00816452456db134432e0eb675b6069c27944c987fc55d1b8573809
+EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1143 BLAKE2B 9c3d6abc1c26edce890974074f198ad25c2cdc0994f15f6c1ed87535838a59c3591f1cb07b9bbbc01d52d53bb7831578e3ebeef918df949da6b3f45925994bad SHA512 39411280c81f82f849145f85f3db8752b230f3ecb44b39a1f661bfd946f6ba61b78ad55ebb42d98d15e63864a5d4f70454ff1857ae4fef3052f9e0d1e81663af
 MISC metadata.xml 377 BLAKE2B d87bdb689ac2ef20b8d02bc7f9db6a3f23fa5bcaae752c4f5b1b0e5bbc67251779c0204b2943d044a1ca287bb07ddac9ef0ae960eb7f543e162ef6cabcbed65e SHA512 df55d57721b34bddab42639c469517c86139d60d4a4536b26b61cb35eb688c9d713cf90f92b2272e189e360042a2322e8f87480f4554a7c3cf9ffa314d053186
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0_beta3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0_beta3.ebuild
deleted file mode 100644
index 23527ba9fca7..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0_beta3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/beta/b}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-# Really only needs PEAR_Exception, not PEAR-PEAR.
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-PEAR"
-DEPEND="test? (	${RDEPEND} dev-php/phpunit )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
index 610e5dd784fa..f07396ab6c05 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="app-crypt/gnupg
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index e71f10d62516..d3e67e48e658 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,4 +1,3 @@
 DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
-EBUILD PEAR-DB-1.9.2-r1.ebuild 743 BLAKE2B 886cdc117866398fef64e97df920b072bbb386d68148e7c8d3139968add18972c3ed71c680064e56c51710880228f5cae402605d01d5deb156c9664de3d879ee SHA512 bd8b29feb116d587ed39ac5937bdc9503ff52406d1a9c6fa07a592abe71c847357127394dcb7107d531f227d0a27b975e416b58b12995c2dc619943ad7216f0e
-EBUILD PEAR-DB-1.9.2.ebuild 638 BLAKE2B 94fb169cfe7b8a70195253c8514266abeb99e9fda6a0034cf9ebe0d0b13b812fde272e293795a338196ab33ea827f9581b2e551f2567b87c6770f5693fcb8b9f SHA512 00770a73bd9fc2fa300fc08e705c68ca287373c4d0e3fb51fe580876d9825147fbaa474b7afa65277d2e5c2edca1221cdc51bd388c984e6e2130dfbca9149825
+EBUILD PEAR-DB-1.9.2-r1.ebuild 734 BLAKE2B 55553e5f5029189f6ab184bd99b339a06bf0e40b1639ffe12eabdcf50b6a54dbf1783156daf55d80b9467cca5e50b11f1a32e5c439e3b083c9fc026dc5c7c204 SHA512 149ebb0686cccb7be2de824b8cf170e2c08fc45c0fd0f0ddd7b53cf5c50138fd9a53ad6a00c2e0be6dca1a9faa38ec32857d8239f014c34718f2909002097f4a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
index ef5e7305e352..662cd70f7987 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 
 DESCRIPTION="Database abstraction layer for PHP"
 LICENSE="PHP-3"
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2.ebuild
deleted file mode 100644
index a24fd9cfb061..000000000000
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Database abstraction layer for PHP"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="test"
-
-src_test() {
-	# Requires the "pear" executable from dev-php/PEAR-PEAR, and also
-	# a working version of the cli SAPI eselected.
-	pear run-tests tests || die
-
-	# The command succeeds regardless of whether or not the test suite
-	# passed, but this file is only written when there was a failure.
-	[[ -f run-tests.log ]] && die "test suite failed"
-}
diff --git a/dev-php/PEAR-DB_DataObject/Manifest b/dev-php/PEAR-DB_DataObject/Manifest
index af7b299bcfda..55c7404afb34 100644
--- a/dev-php/PEAR-DB_DataObject/Manifest
+++ b/dev-php/PEAR-DB_DataObject/Manifest
@@ -1,5 +1,3 @@
-DIST DB_DataObject-1.11.3.tgz 81873 BLAKE2B f8d51e73eb38ba50157413e51720d60e236a2e3b351b79d866381d7ef80103b5c16b54af7a5a6a425ac3d59ae606973043a62a038b196753d38053fd3be61661 SHA512 bf74b99b6d28e8c5074dd9058ad6624ed93cd4578164d71fcf2c70070a81f5bb5dfc46d11d5a1408ad5bac12ac6d36cd47dbe102b16ffbf9c091153e9e400d8f
 DIST DB_DataObject-1.11.5.tgz 83878 BLAKE2B 0d73cde628a61e208c665546d15b4e7f4203c04dd4c5e7cc86c36ca46b60d8fcd28643b2ff720b940d1fb4fc86fdee650fec784cbda7885a31c9c120d90edbeb SHA512 bc8c5d0994fba78c6f8137682da87018e7660ceb39f5583aabf424509bf0ab263b8f32f6676821acaf69ed991778ad85f5f3fc156799c0811b2ec39546688bc6
-EBUILD PEAR-DB_DataObject-1.11.3.ebuild 690 BLAKE2B a128f979cddde5bc617c941c7db592e840dc9263ea8c1acf5c624e30eab8fba9937b0b54bcfc3d006b04de08ef3ed84ae8a5afabe2f2c78dc0d76caa3987593a SHA512 2e6a0b69c87d4a80793400448ee647d19f8218830b7624645707f44c237450587ec3f17678aa0884709430d3f10a2376942a729a13cb686796e6293a834b704c
 EBUILD PEAR-DB_DataObject-1.11.5-r1.ebuild 867 BLAKE2B 880ce15c067451e81ffdf0f858cdffe4d1e40904500d2010e1ec53660073dc5b0cd5db4694fb05c6f6b6e178b3d92fddc97bf9a79a42076834065a099bf988a1 SHA512 a372ea8869a78ea427e70092798f62d6bdcc31f48e08d231978071306000c0b6c1f9ab89bbb3e8cad20674f9ade1c4a4f2717649686aa4e9404cd927cdbee40d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
deleted file mode 100644
index 280cf2221018..000000000000
--- a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="A SQL Builder, Object Interface to Database Tables"
-LICENSE="PHP-2.02 PHP-3"
-SLOT="0"
-IUSE="minimal"
-
-DEPEND=""
-RDEPEND="|| ( >=dev-php/PEAR-DB-1.7.6-r1 >=dev-php/PEAR-MDB2-2.0.0_rc1 )
-	>=dev-php/PEAR-Date-1.4.3-r1
-	!minimal? ( >=dev-php/PEAR-Validate-0.5.0-r1 )"
-
-src_prepare() {
-	# don't install windows-only stuff
-	sed -re 's:<file baseinstalldir="DB" md5sum=".{32}" name="scripts/DB_DataObject_createTables.bat" role="script" />::' -i "${WORKDIR}/package.xml" || die "sed failed"
-}
diff --git a/dev-php/PEAR-File/Manifest b/dev-php/PEAR-File/Manifest
index ef360519573c..950f9f09944b 100644
--- a/dev-php/PEAR-File/Manifest
+++ b/dev-php/PEAR-File/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD PEAR-File-1.4.1-r1.ebuild 379 BLAKE2B 97361481a212750ee3050e77d836fb68a77ef1f6488ebb32ab1a2c79ecf267afef3a6db836f059cc19ce1d188055cc04a870320d149272d53e21a98c449a49db SHA512 91261bbc68ee7c932c2027692c6038f0937ecfd9ec425f74cba9b2a29638217e1e76e8fe9ca30f8026de42d461dcd2fa8ea1094bb36b8765d8feabed18dca975
 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
index e8b7c9181ee8..8550040aaa74 100644
--- a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Common file and directory routines"
 
 LICENSE="PHP-3"
 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="test"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1.ebuild
deleted file mode 100644
index d6f058be8e4e..000000000000
--- a/dev-php/PEAR-File/PEAR-File-1.4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Common file and directory routines"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
index b189b7f40df3..3fcf85056715 100644
--- a/dev-php/PEAR-HTTP/Manifest
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -1,3 +1,4 @@
 DIST HTTP-1.4.1.tgz 8635 BLAKE2B 2d834adcd5f5f2123f0d477bcb1b8189312d7fd8e2ff8e23f23a12ce762dbcda359ac61b192b58f60749c527c0545c3ef321a9610f3fbb0eacd3545e42f86e6b SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c
 EBUILD PEAR-HTTP-1.4.1-r2.ebuild 338 BLAKE2B c984568acc2db99309ed09476a952f9f2d168e04257612f39ffc350fb9aae5eed5a8aad8e80e6da319e6ba9410c4ff1813032d92d6669499c4e6e250719fd469 SHA512 cb8a997c78b8cb26c81d0e2fc240ca614aad0b462cdfb4036fd1e05a169310569785915c83a90374f0fa2c602a2dc2e017517af626a31cfcd77ce83b49286f4b
+EBUILD PEAR-HTTP-1.4.1-r3.ebuild 456 BLAKE2B c8ab9d3d6c2a0eea7c3aefa56f2bccd93e748471cfeb340a290fc004d09e0662a14f42ae527b94fdf04ada63446f08864daa1b4a5eaf3dc8f8c653290af75221 SHA512 ed05ac3a36f79ba61dec79d50b645a86dc4694c57b47cd92f6bc32aadef6fefb52bf0c517289e883137589d2191f1a0445fc92aeb0b09e0264028712b5a966a1
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
new file mode 100644
index 000000000000..93359ae15479
--- /dev/null
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 eutils
+
+DESCRIPTION="Miscellaneous HTTP utilities"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_prepare() {
+	# fix nasty DOS linebreaks
+	edos2unix HTTP.php
+	default
+}
+
+src_test() {
+	pear run-tests tests || die "Tests failed"
+}
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index dce8728027e8..d908bf539e9b 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,5 +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
+EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 731 BLAKE2B 753e629af80fd656fcf083a594932d2a99c921937957d318227df261a4de3f9055b1e2edac82ea94f7655a0c440fc49a22b1f8fa72ea395719b9e415efe0d8bf SHA512 75e9477773dd68dbb333aed62ab4cc84b520765f1b87d53da0733080219a41b41230f529084d538764394405d78c67ed56cfa3febb6221ac93ef6092d031046f
 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-r1.ebuild
index b2c15280e905..99f16b6faf11 100644
--- 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-r1.ebuild
@@ -27,6 +27,6 @@ src_test() {
 
 src_install() {
 	php-pear-r2_src_install
-	insinto "/usr/share/php/${PEAR_PN}"
+	insinto "/usr/share/php/data/${PHP_PEAR_PKG_NAME}"
 	doins data/*
 }
diff --git a/dev-php/PEAR-HTTP_Session2/Manifest b/dev-php/PEAR-HTTP_Session2/Manifest
index 26834234243a..59d9bb526a53 100644
--- a/dev-php/PEAR-HTTP_Session2/Manifest
+++ b/dev-php/PEAR-HTTP_Session2/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP_Session2-0.7.3.tgz 16362 BLAKE2B a4f2329adcc8df3434518245010487d8e0e4346359b4576f2c68b8a3533e20ee9a9013ea0d2c632d62b1eda2472665f3080c3deb8f73e9f9a66b087a1aac7adb SHA512 ad598f1b4ca84310c339afe31f45aafc4b8245716be39e220cd9a62ea64f1a0aef0872b0a9b076ecc7f0d9fad4a4fa7dada7b4c46c2eddf4f26a9f5ef2c759c2
-EBUILD PEAR-HTTP_Session2-0.7.3-r1.ebuild 383 BLAKE2B 1bd67facabb51354e26c67f3e4edd315a4bdb1673026dc447df5d497fdeee1a7a86cb4489469784cd8838fbc300f0ee51667b0c51610369e80f0d6a0b022e2ac SHA512 14cd4f9423c9afdff75281921a1e188980c39bb2c7136e850965eb846c1342029f340ed4d6582df821c12feae865b5f08da4928bf5b7ac97745930d828a68cc5
+EBUILD PEAR-HTTP_Session2-0.7.3-r2.ebuild 474 BLAKE2B 855200131aef276320e48018a2a214c1789228d590ba673403b5e1527aa36fbc1ce647f9828c315c9bd4fa297170f4158fb26625e4a76da3cda9e105ac3d5c81 SHA512 8d5d2dfd70b1924040042cdab62f8bba6ed7ac5b506bd15524d564b8a550cd7af2f78b3fe6efe1cb89c398893c9d73c3299f0ee76073bf9f70b28a969484633b
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r1.ebuild b/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
index bc9f35b10853..2a2f0882b48d 100644
--- a/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2017 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="Wraps PHP's session functions providing extras like db storage for session data"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
+IUSE="minimal test"
 
-RDEPEND="${DEPEND}
-	!minimal? ( >=dev-php/PEAR-MDB2-2.4.1
+RDEPEND="!minimal? ( >=dev-php/PEAR-MDB2-2.4.1
 			>=dev-php/PEAR-DB-1.7.11 )"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+	pear run-tests tests || die "Tests failed"
+}
diff --git a/dev-php/PEAR-Image_Text/Manifest b/dev-php/PEAR-Image_Text/Manifest
index 6ba23aa4f4c5..3a6e2622c135 100644
--- a/dev-php/PEAR-Image_Text/Manifest
+++ b/dev-php/PEAR-Image_Text/Manifest
@@ -1,4 +1,3 @@
 DIST Image_Text-0.7.0.tgz 102049 BLAKE2B e4c9cfd1b775891adaede8fc6619c4d32a1078d37939214eb7b21ab0ed8133f6c25e1f79823988103393ce2ba90a0e23109b1f0e9e4e393b460ac2b8bcf1f2c6 SHA512 6644cda649ecf2861af1999a7a1b8c59e2c39f178eaf818c2f3afa532b6eb1fee16eff1f3cb1ef471d5480c023452ab9226edd7ee2232353120ec2976d67b1c5
-EBUILD PEAR-Image_Text-0.7.0-r1.ebuild 373 BLAKE2B f70a64b34afb78aa6a5c0a1c753288c2edfb1547454e2ddf81936dcc2fa4841305c364f4b688b931d25d7bf78604b09371bb2f59dba35615c984541798223157 SHA512 0514a703c309b09eb7ac2727fa0d787b451fe27489c5e00c818b2c5d3131e98b869aeb1bb014fb0d55cf8cf2a3595380f21170da69215571c64275083764a28f
-EBUILD PEAR-Image_Text-0.7.0.ebuild 272 BLAKE2B ecf7a0defafa065523c895c9a1943d44b60fb9cac093e8709e6c39d276f88eb34113a04c074e4ef22e453467c3d6a6d6843f92bb4432e1464feb932d2649fca8 SHA512 db6c72d21efab51b654076fc118962ac58b99d603aa55e243a41682c86870d30c7a54bbbf0fabb0101eb33e003d7bcbc67580232e8b1ddb8ac6960a4f52c92c3
+EBUILD PEAR-Image_Text-0.7.0-r1.ebuild 371 BLAKE2B 118b76b28caab94c98ddf555cd0a863791b98de83246ab57fba20f6ba971e7ea84259708138b234de378d2b67030b17e57c7ac7c73ecafa93db0ce0ff28f7c4e SHA512 6d84183fa4c8a9bc1da14c855d0ea9ec6d22a31405361d0d83753cbbc66b47cb237491604f61f2864e4f9ee98aeaf894b7e009075f38752738870a600234c9b6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
index 421c6aa7e993..5e2acb0c8d48 100644
--- a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
+++ b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Advanced text manipulations in images"
 LICENSE="PHP-3"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-lang/php:*[gd,truetype]"
diff --git a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0.ebuild b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0.ebuild
deleted file mode 100644
index d1f334209cf9..000000000000
--- a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0.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="Advanced text manipulations in images"
-LICENSE="PHP-3"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[gd]"
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index e65541c674f6..9cf01defbc8f 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,5 +1,3 @@
 DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
-DIST Mail_Mime-1.9.0.tgz 35042 BLAKE2B d969899ce5094d3b839845ddd30a0bbe5ce5c0e886a3dc628837241eb0faa172aced2e66375ec9314a479352269180188b8a6940c1b86698fc05b4339440ffa3 SHA512 915084166943be396603cc63736818fd4401e21b417d159cb47cf22c0de4153a7ecc4496c192212ac5c952196a35a56936def16305fb69beec64582994574fb7
-EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 633 BLAKE2B 5d48767e9aaae411ace8fb7747a94b122bec33e7d3f633f7b51d723395eeb71800e4a2aabf8c3b9df1006570beb9da7dc0a75e284de2dad2015521c9fd6bdf08 SHA512 8da412f0309f10168967c38348f5101e19619a5a1651bf10e554ab65139c1b726dc61ed915f4a1ed5b1d5d14cd1f9ab03d2877f29b511597c0cba2461341ce87
-EBUILD PEAR-Mail_Mime-1.9.0.ebuild 376 BLAKE2B 094ffdf98ece617da7e11c44cd6fb3d99c19913da404758014e9b84362b86ddb39f44744a05ff8978d77264b98e95d9c27969d60ce92a3c23af62c8388701cf8 SHA512 bc8985e025ceca0496aed478c7095c768ee017637ffc6a649530f8763b7f5c202515c10cf4ee9d57e42d05108aef3d3d125f30fd37ee9a076af164b638ff2510
+EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 626 BLAKE2B 62004ae4cbff447620ca35c2cea251b6441fcd1415f2fbde011787bbd64f0d0e7e6ea21c73629f81bb17055e5f6d1c8c467b4597a6fe768bd08443f8ad8e27f7 SHA512 bef124576c9f109ed44f83f8f33d78a76c5850b90cc7e71a556607585a71a171554e2469cc59108b9924e88be9ad207231fcf65c7aab3a381f35145b6962149d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
index 0961c06963bb..e3f9693a17f6 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
 
 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="test"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.9.0.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.9.0.ebuild
deleted file mode 100644
index 6b8fd5a9a0b8..000000000000
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.9.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides classes to deal with creation and manipulation of mime messages"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.0:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-php/PEAR-Mail_mimeDecode/Manifest b/dev-php/PEAR-Mail_mimeDecode/Manifest
index 4b446c31b7da..e850ee18df28 100644
--- a/dev-php/PEAR-Mail_mimeDecode/Manifest
+++ b/dev-php/PEAR-Mail_mimeDecode/Manifest
@@ -1,5 +1,3 @@
-DIST Mail_mimeDecode-1.5.5.tgz 11554 BLAKE2B 90cc9cbee9118d4cbf934fbf6f6462daeba9d494879840de6bc3f00b69062eeec25c5ac8cdc5802e7dbfb0bb6efbcaf7b9e792245b69c57f7b961008cc75e561 SHA512 3b000517891258c848024617cb9e811f4d39d829739b6f026e3476895b62430c86b274e0deda49532fee280b51deb02614f8b68724c80b54e4a51d04786ef43d
 DIST Mail_mimeDecode-1.5.6.tgz 13258 BLAKE2B 7e027cf9bf2a450bde639f8c530f216cc8dfd9eab719829dedad029d98fc5c4806279d13ec3ffb5191ba23edf64ae658ca0ec8d83f116da3fafbd23d758a9f00 SHA512 fe46ff2542acd3b180981c7dae41a1979b2edb3bfa5ad716a1ff39a255c2c04d92a7d770ae6531e38f3b869173f576fba44410c8e03269510d71dce5fa345bd1
-EBUILD PEAR-Mail_mimeDecode-1.5.5.ebuild 510 BLAKE2B d1dd44d46b393b0234fe2399691a9f4adff6ff5a66de4ba105052fec776309deaeca1991156f1b0189c7332a4c8d94a0b94c865d2cfc266b8b1f2c6c50aa807f SHA512 6a28e3a63b0e4b1bc683950aed4351c6f2a359e809e78a24d88ce7a9753a413088cd8c84124a0a57f2ef44b43271d849cc76a10fafcff6a6957b08d0473e7f8d
-EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 466 BLAKE2B f509167921859910d067e21f39eda9fe48fe782e80eb374a78e42a341ffd69665896e21afaa6e84c9d8c48bc081bd8347cd1caab32f8fe25d9b131ed002c9b17 SHA512 37e97b8ccdac6392084ba3b8266dfdeb9c4d7a1080e3a08e1333950cd136f86bfe397a9d5722f2fd0217c5395aca267ac4be489eef3a4f095d5a3fd01d488f4d
+EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 457 BLAKE2B aa05548ab64f76f06df201ba4543d929dd844faca2cbd68a4b127a00ef00a67071ccd69d9ac59fc9991183abc4fb0ea95f4bbb05d10dc026b2100e003a809962 SHA512 b0ce42e8c08ddd620469530ab04f0462d98fec1c8e947dd3701c6674054aef954aba46c10ad5700c658c58bab1742f6e9818a49370a48f6c029adf04263be002
 MISC metadata.xml 317 BLAKE2B 00a849c6fe77dbad0b85efe11bf5826ee7d1527a66615400579b33ad6da1bfbb9e86c70bacec14fe304d20e5672cfd394643b4df5caac1af6fe9991deab8ab59 SHA512 00a0f91819696baf2e347036e70f5c32925ed6694144dfbd68e3aca5a62e3c6a157eabc8b4b74d3392008468eb23ee9c4639031e31334733e33be85bc19e2237
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.5.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.5.ebuild
deleted file mode 100644
index 13c38378f7e0..000000000000
--- a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-# >=PEAR-Mail_Mime-1.5.2 in in DEPEND to avoid blockers and circular deps
-# with this package; using PDEPEND in PEAR-Mail_Mime for the same reason
-
-DEPEND=">=dev-php/PEAR-Mail_Mime-1.5.2"
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
index adf9177c8b57..c964c6908cfa 100644
--- a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
 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="test"
 
 RDEPEND=">=dev-php/PEAR-Mail_Mime-1.5.2"
diff --git a/dev-php/PEAR-Net_Socket/Manifest b/dev-php/PEAR-Net_Socket/Manifest
index bac7bbd4b640..5a667b7cf6ec 100644
--- a/dev-php/PEAR-Net_Socket/Manifest
+++ b/dev-php/PEAR-Net_Socket/Manifest
@@ -1,7 +1,3 @@
-DIST Net_Socket-1.0.14.tgz 5600 BLAKE2B 952a41ae595b1ae300274a00e24d3b5543ea5eb5465c586fe6497f5524fc516ae1cc27f2709794e372124c5b0fae9f5c7917744b8e1cb24fe8e4faa8bab4aad1 SHA512 1c4ad8bdb96830e32caa7ffe739ba8785bc07a1737ef85b7694b878a38bd693b10ad426361a4a8f758a63ec6fa407650ec9b5d2df086999a041529128f7fa403
-DIST Net_Socket-1.1.0.tgz 5933 BLAKE2B 9a66b944968ce05466d4aefc663279a9d8302511f15718d2f33aa5dcf59e4bc018862bc3b42af9a1bf9bdf5756bfc991e5cfc8afa09bf80cc946a57b0cb5aa72 SHA512 e2dcccc21451ec7fd232764ae061c0b63689c0f6c5f972aa408b74490504f2540bf525f6a0decbcef60ad7fe78f3718b8cc21bf625f31c3811f3ff5824e07b4b
 DIST Net_Socket-1.2.2.tgz 6903 BLAKE2B a0ee530ebb2962de8560d5cb2147ee831d62c5deac056a7f4944b451853b3ab65f1f46332700d4e18a1ff6e1cce138bf46f5053586bc7f8073143c6aa101e9c6 SHA512 fd415fbd4a6801b63cda3168ff275fdeae233a3cc4c62f9bfe561f83f24f89795a7e7ad862641a73bb6d6e3c0da8b56cd00e7e7a1db616de040ea7883d84caa5
-EBUILD PEAR-Net_Socket-1.0.14-r3.ebuild 554 BLAKE2B 6c80a3f65f7458796e2bd34a4ec4c679b8400f43c14b06e8c045c3f0033c2c192dc7cc57ab01ef3d13e8ccfe0070ac1adbc6e0b24d7c4140e7c8266570beadbd SHA512 2d9930222bd7ed37b0c27cb307c15ae6cba533b050a29cc9b11af7b563d11221e2501e4d550854b77f41d1f8d8919b130adee22cff062634c2766771ab8b355c
-EBUILD PEAR-Net_Socket-1.1.0.ebuild 345 BLAKE2B ec9234a695da56757cc7b39b32c31a403163ff806e8a848fa258cf85e19b24d1adb87b587b0756934f640d806242aee6a6349045cd5737cd2f9a62d22fe6970d SHA512 ec8870e45866e813f6fc03ba505039445d894e39868f126a1d8f0325e478130e194c0832c8fef3fd929f34619e916706032cc5afd461108ac7fd6dc73182e707
-EBUILD PEAR-Net_Socket-1.2.2.ebuild 340 BLAKE2B 1112969e5ee88c3c6d43d11fab01ffab866b0c32bb92b9e43f58f0188593567a1b8c7a8991e285bcd4b85b085e8168eef455a9dab157e2332c48d083030c8624 SHA512 f2afdbfb0754918b0b062556fffffa0005126c679056ae6edb3060e863fc59eb5766d750c49d9b7e61f974eeea173f89cf46e56181871a45ac8ef81af452404a
+EBUILD PEAR-Net_Socket-1.2.2.ebuild 333 BLAKE2B 8d603b96f43de495426a1c15dbc8545bc2e62681fd6214a0d7232ee7602e0fbb0991273c97520f176ddd1690f18a204181709481e3d8a2f2bd55acc249a5f382 SHA512 5c5771b9fbacaaa7cd99707982fb11fd0027a71c93512fc03ffb293ee82034e7012025ce6b080e40833f5d1087ff409ef537518375d2958e7c59708357e12dbb
 MISC metadata.xml 379 BLAKE2B 233538cb7305e5b6f2cad2b743cbae9116c3307b72ae0645e34fdaf76f72b1fcbe9618f4ba35ab5b3942bbc2a5fd7491e4cfcd7d63f1074fd50e27552a0003d6 SHA512 bde8388227ab4467df4613b0ab02b20286f3700c3c48649dd445085c98f9885f7e46603b2977ff539e5b2577c6f703c7d397a5b0a14538f093698aaa0662deb0
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild
deleted file mode 100644
index b02f5ac1eb63..000000000000
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PHP class interface to TCP sockets"
-HOMEPAGE="https://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 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-DEPEND=""
-RDEPEND="dev-lang/php:*
-	dev-php/PEAR-PEAR"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Net
-}
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.1.0.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.1.0.ebuild
deleted file mode 100644
index ea3c7a4512ff..000000000000
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="PHP class interface to TCP sockets"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
index b579e6eeb8d3..da84124a22fb 100644
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
+++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="PHP class interface to TCP sockets"
 LICENSE="BSD-2"
 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=""
 DEPEND=""
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest
index a69ffa26ee17..896db2de72cf 100644
--- a/dev-php/PEAR-Validate/Manifest
+++ b/dev-php/PEAR-Validate/Manifest
@@ -1,5 +1,4 @@
 AUX 0.8.5-fix-test-php7.patch 905 BLAKE2B 5d000b990cd38d697af861ff828f2e9efd8fdef0e2a6fec87fbc60208c1a9f40686c5c0be63cdf862221311f235f87bccb975cf78bb4d5f2b03be6916d3899bb SHA512 44aa6cb09f19ad3246bc7e6d825de786139da433564b902bfff020be52b14f554f752f0ca7f790d378a74a3a62e15cf13383a9bff25db2f67e4496d5bcef5e7b
 DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63
-EBUILD PEAR-Validate-0.8.5-r1.ebuild 549 BLAKE2B 6d7ba004da69f7dbb3b61e1e4f1cf82ce93e4114bb053c749b85206bb1743a1e516c4b2e3bf3416e82533e4fe94af7e423eefb639848c892b18998a66c6c71a6 SHA512 5e54805118a4b2f3d40d79a91e62d3ea5731ca0cb2690363921a7d189629f8b6ffb0c4612b44ba2a733dfa6d147a31804c70e0d28ad1e38084399a07f872e5a2
-EBUILD PEAR-Validate-0.8.5.ebuild 290 BLAKE2B fa9926af4fc63048b70691fea65f6e29f8452b11b169c86824c356a8d413b82587656aca2eba1732675166c42b8fc65e80ed93b89d7aca9aac25097954f58395 SHA512 7fa9c4dc4f9f0e052923c492f4f431c7f74411beba76b3bb3e5c87c6b82ca22bad7664b2b2def9f64c221c7618dce4ee690e0fb7a73ef11c55d337f8cbec96d2
+EBUILD PEAR-Validate-0.8.5-r1.ebuild 541 BLAKE2B 9ca8ea0fd971fa165ac0e8cf9f5e83a5f7a30aecaa477c31f1aae3fb5cc02615d470ff2adc89d745f5aa9e3ba6f3e08eb7a66dd0509ac6ba8931adbaa9e056f2 SHA512 46c9b99ec0de1cfc902c9bc36a90125825c95437f4d78ed79ed71dde19a9a168c67ed4e47bda7e21ac4f2fe3a3a792f9287e38a114bdec8a92b0ecfbc23d4af2
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
index e8e5e342cc58..61561fcf8e93 100644
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 
 DESCRIPTION="Validation class"
 LICENSE="BSD"
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5.ebuild
deleted file mode 100644
index cfae3c79c0c3..000000000000
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Validation class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest
index af2a0288e810..db08d3916d08 100644
--- a/dev-php/PEAR-VersionControl_SVN/Manifest
+++ b/dev-php/PEAR-VersionControl_SVN/Manifest
@@ -1,4 +1,5 @@
+DIST PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz 36697 BLAKE2B 998e9c08d19284de2bd723fff07bc4c319ed65b12baad012f5f8e6b283060cd25cdefa5141e71f8368555d963e7ab1eec7b8e41d38cbd9a89dbd6977f72b5102 SHA512 aaba6fcd65d3906c9d98085b109d1357578be7557a9ac5b5997ae9a9896cb0970f3bf707246e5afc68dfbb8268a8fad36265b484220387b56e8de85e390db82a
 DIST VersionControl_SVN-0.5.2.tgz 31356 BLAKE2B d59971b0677d3e88b47f1fb249c6ba6971db7b868e390589705058fa0cc19a3b4e7a2da38db78b37a9fa7b8f9233297a4fb5376b1b225c8e93f41bbe65c99007 SHA512 09aaab0461a52fe87e5723472b9978c8f928a4741e11a69672ae1350ecdf90b287d951b8343b5fbfbc1d7cd449055cb249f229a1e943cdcd807e9b36e0a48b86
 EBUILD PEAR-VersionControl_SVN-0.5.2-r1.ebuild 586 BLAKE2B fe71070981e12a7151c32e16d4f4d08259dd4fbb79b4b70f43eb18a39763e4cd3de7c734cabf4759f6eda80de2f0711d62466607332b2a128c1077db84efd767 SHA512 12ce42b63818dc4bfd2960ee83c640767ca70fb782853aa1783e160699b793bec7d3d3f69a39e812d0a8dd0c3182b77fce0e9678b3c2061bcf896aea23eeb004
-EBUILD PEAR-VersionControl_SVN-0.5.2.ebuild 569 BLAKE2B 071f00ded3f1ce5eb099beffe4f54ea69b7b29331a58bcf5e7ddb42175936192a23db5906f418109444b35cce55bbf24113cdbb40827d1c2b3221b5874fbb470 SHA512 e256c1a7fb6e061825708c0140042d465f2acf822be27c117ade573973928b67a3f91ea89402cd61442e74c95d8bfb961401cdeffb44c8a38480464bf3993c25
+EBUILD PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild 938 BLAKE2B ff3f32f8a981a526a31251ee0d3a62c0d2d55fedfaa1ecf43a3963cee1fc0d64f3bddc554d8ebc5f9052b117997042d250c690c884eef3a2d16edf687177bc15 SHA512 5a2fd603d9f1e31d1e820575c870c55e98b5b6dc1bdb6119a20ced539c147e13b4ecb6ab669dd1585e9a33c71723fb8975b5926dffd50c671b212969206e7e2c
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2.ebuild
deleted file mode 100644
index b5fa0ac56497..000000000000
--- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-RDEPEND=""
-
-src_prepare() {
-	einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
-	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
-	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
-}
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
new file mode 100644
index 000000000000..e228a7700964
--- /dev/null
+++ b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
+SRC_URI="https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RDEPEND=""
+DEPEND="test? ( dev-vcs/subversion dev-php/phpunit )"
+S="${WORKDIR}/PEAR-${PHP_PEAR_PKG_NAME}-${PV}"
+
+src_prepare() {
+	einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
+	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
+	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
+	sed -i 's/ +%d / %i /' tests/resetxml_19910.phpt || die
+	default
+}
+
+src_test() {
+	phpunit tests || die "Tests failed"
+}
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 3a65730a2919..9cd281933b26 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,3 +1,5 @@
+DIST adodb-5.20.12.tar.gz 464962 BLAKE2B 51b1bec4c9bda427988848cd0ff810058e159c75946ea4d14d1ab639545f0c95a8a1a2b8193c8c0403e37fc2e3b858f97b255b9b615b65786d1593269e9da731 SHA512 ac8f36dba459bac15f16ecfd1ece69edc922e67b6aec3641a0c8ffc50c6b1c437ecce2e5652c31f2e472f7abefb3ac5a8a2bef188959007442799784ab764c1e
 DIST adodb-5.20.9.tar.gz 464257 BLAKE2B 38a37e4a5b1ac86b37cbd164c79e2112c78fb22530a225d2cac4f916703d4c2bd300a47a214344d8ae9e5c94467ec34cab96ab36a10ad8dad581ec74c73ae111 SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f
+EBUILD adodb-5.20.12.ebuild 1455 BLAKE2B 9087e612637399203355a6213a9012c6b204818a67928abc2a6ef28bdae9f82c15d888690bbe8ebf6f65866029558c7740a38aac697531bc1f8709ad57e84511 SHA512 300defd6824492d2ca77da9528c07e3b0320220b6b7fb305dc586d56b4f60eabdf5614f25bb16f3cf9c2395d35008196f46e1f0fb4939149ff8359cad7e638d1
 EBUILD adodb-5.20.9.ebuild 1443 BLAKE2B 6c0e8504d8e99042a95fdf9af07eeeea4bf9f3a3bd2e6ba156cd147eeda622fb9a71880f2e1ea19d01e82b7f44dd43adcdfdfb4ffe0b65ecde9aed02a21000c8 SHA512 258c809d092bc37c9e87e3501f3f95ce4ea85b8b1ac3e252b659a5834c831908ed1c61eebf7806486e3e3fd50c7799a596b9d495e896784fd8fd0c8906618540
 MISC metadata.xml 377 BLAKE2B 29889d626a5c0b8d16ae7cf02f45a0e6ebee2d633110a534bcc37c9539c4fc4b8ce15ecfd8ae3768b0f79ab34f088416b1bdb4403c7769f3c6e45477d0a2bf8d SHA512 f83ababfd8add084a2dcf96d74eadae96b35b5d71ea30a98a41b5ee3d222fcabcfb63607e4517be261bfa246d461684fd95b3bb01cb58464ff8f986d123aa23b
diff --git a/dev-php/adodb/adodb-5.20.12.ebuild b/dev-php/adodb/adodb-5.20.12.ebuild
new file mode 100644
index 000000000000..f6b55b30633b
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="https://github.com/ADOdb"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+	DOCS+=" pear/readme.Auth.txt"
+
+	dodoc $DOCS
+	rm -f $DOCS || die "failed to remove docs before installation"
+
+	insinto "/usr/share/php/${PN}"
+	doins *.php
+	doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 0058f45860e1..0f6771e3d12c 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,5 +1,3 @@
-DIST awl-0.56.tar.gz 769208 BLAKE2B 08513675d8d26fab26429a6e51cfd7dc3b00aa7cec6538789e6bbd2853989bf563ffba0df3cda61359f30ab672a74798251213e58423cbc4a77185ffd74e6716 SHA512 6336d6f938330eee0b51f04665776269d974086ba56a3c8f4b7f53e7e17b637d899e9b329aeba3dcd690673a1a95a8cf03ae8417ebb9f356294314790915886a
-DIST awl-0.59.tar.gz 601449 BLAKE2B 606c52bdad06e6fa130fd20f7da25bc75c7357c81c1d34d88bb62c43b56857eb95492581b8845ff97416d94d64135ccaa5bcba0b3989a115156ade05bc1b26b8 SHA512 d3e82e7f3269c1c02c801628498768ec94a8d215b719369e8ee997d67c86c5e4e780571852a077511ffffbe91ade1d05bfc60ee03624fbaada1ce23f7335d3e3
-EBUILD awl-0.56.ebuild 710 BLAKE2B f337c86868e39557069e05eeae6718504e4333f19fe1f30f842202ada99ba3173650b8da2438e75b600f047e7abaedb83f99a152410ce1b456b7ed289ad178b7 SHA512 ea8e35d70ec67e67731796f57dd006e6dd875c7dbe544d60ae1a8aaa6004234bba878900d30b9ea9c004fbc43191a9c70114c868225b4d6d1d32518aab009a83
-EBUILD awl-0.59.ebuild 620 BLAKE2B 32bd7e413e5419d4e8833b26f854ec136ee10be2e60f590424135b2398c199d4e1ad54a304172d9be4063c157225273104415e70f6727432899ade2248fc1f4e SHA512 fa4cd3dfd29e5450dd61208a086f2527bef1c0f7252840081f44f521fac0b09dd22bbcbb7097955498e3e22542d52642205c924d848f801b591956bfb8985f36
-MISC metadata.xml 346 BLAKE2B dcaf62bc7a00cfa20175ee9a029ea85ae9afd300924d69d4ee5243b2ea38263a3ded54e9ecf68436b49ba8830a9808339d33a2b0b828d899069416b72f937237 SHA512 027cb2cedae394feac3b1c136a384cc5c030554774e766558ba87fe4e6a468e6e93086e8c551699a2adaaf23c717299e43b56e156159b04bef841d45fd31aa02
+DIST awl-0.59.tar.xz 124652 BLAKE2B 45b6271c175c23597c56f3d2ecc906ffc7d32feb4d8d51529e8ff861791b901f7076a1ed2aaa2309101c7d0e8aa1a48327f2d2cc4fca2738fffc55fe7665c310 SHA512 98a7bf336d5677146e06d3d8f320b67ae2a034d2b7ad32d64998993ed29431fbcf8f7c8f972ccfa55d81af32f1b413e265850181a505022e9ad350a8a670e6b6
+EBUILD awl-0.59.ebuild 613 BLAKE2B fbb8d746e412553b9b605848eaa43e93df88ad4699c200a209cc110fdc6ae63f62a4912bda122fe6236294d17e4aceaf57e8508d1afb993f7cc145dd7c9ba5aa SHA512 31a39ddd2ebc4533c14fc4b7c164cc04404c1ff10ab5d2ed53817ca5e0ba161e2e6efb67c09439638a91308df17b14c5d0d43cee1efff61047bae6bdfbafe6d0
+MISC metadata.xml 476 BLAKE2B a082768fe63887996c15e2736d62a055692bc4fa0ad815f201bd9301b73dab3b084e10915e65d5443ffbab66d70ab9b42e12b2ccaf18e2f1a909879c3aa6bcc2 SHA512 e8607666ba3713a2484d18bbdd9387fe20705903f6688b0209a32f97d6c3cedb9d02ca8f205c7499aa431cad2b2ba2fb017e7cf2ff8b8970dbe10664d5c0eebb
diff --git a/dev-php/awl/awl-0.56.ebuild b/dev-php/awl/awl-0.56.ebuild
deleted file mode 100644
index 8a65231a9a6d..000000000000
--- a/dev-php/awl/awl-0.56.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Andrew McMillan's Web Libraries"
-HOMEPAGE="https://gitlab.com/davical-project/awl"
-SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=r${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="test? ( dev-php/phpunit )"
-RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
-
-src_unpack() {
-	default_src_unpack
-	mv awl-* awl-${PV} || die "Ouch"
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
-
-src_install() {
-	dodoc debian/changelog
-	use doc && dohtml -r "docs/api/"
-	insinto "/usr/share/php/${PN}"
-	doins -r dba inc
-}
diff --git a/dev-php/awl/awl-0.59.ebuild b/dev-php/awl/awl-0.59.ebuild
index 24b33af893f7..3364d36a1b4d 100644
--- a/dev-php/awl/awl-0.59.ebuild
+++ b/dev-php/awl/awl-0.59.ebuild
@@ -3,11 +3,9 @@
 
 EAPI=6
 
-inherit vcs-snapshot
-
 DESCRIPTION="Andrew McMillan's Web Libraries"
 HOMEPAGE="https://gitlab.com/davical-project/awl"
-SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=r${PV} -> ${P}.tar.gz"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,6 +15,8 @@ IUSE="test"
 DEPEND="test? ( dev-php/phpunit )"
 RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
 
+S="${WORKDIR}"
+
 src_compile() {
 	:
 }
@@ -26,7 +26,7 @@ src_test() {
 }
 
 src_install() {
-	dodoc debian/changelog
+	einstalldocs
 	insinto /usr/share/php/${PN}
 	doins -r dba inc
 }
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
index 459eb5cd3042..ce3237c0bb82 100644
--- a/dev-php/awl/metadata.xml
+++ b/dev-php/awl/metadata.xml
@@ -2,10 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
+		<email>till2.schaefer@uni-dortmund.de</email>
+		<name>Till Schäfer</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index d097e9abb62c..3db6f2f6c211 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,5 +1,7 @@
 DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
 DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
+DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
 EBUILD doctrine-1.2.5.ebuild 554 BLAKE2B 03013de408e92ee015d63b9e822c9d0d86a35283b4a8c956e8419c1110addb5cd80a7f00b773aa94865262879fe52317c6ca5d771307b3b2ebe0729310c80963 SHA512 dcc2d0fe9989f65594acac7e6434a7283e3ee508671af784a52ca7d288b6fe3387198ae5fa9ab1e054dad99f581e865f7471fecc371426d110f80dc062e30134
 EBUILD doctrine-2.4.6.ebuild 530 BLAKE2B 90907972a6eaaecf10d395ff3949698fca3d4241baced39c7a3454f501cc996ed300a614f9acd378559d2ed7cc4a4857b6daf614f54f3a6f68076d9ef2fe9bb1 SHA512 6061717df6e2855b3001c44ca31dcc5c2071fd349aedb0f58d03ff6f93c557a0d56018201e28fbd33b70427247602a05f0604f16258bd3aebd44f95192cf3a86
+EBUILD doctrine-2.6.1.ebuild 671 BLAKE2B 83913b194988708e0cfbc021979c287514cd41ee59a4bcc0f93be3259faff7cad40c34160e6fe97058cf93a141f265644a0f7d8b2964f3e4751356632499b0f0 SHA512 85b19e202a3d3d0d8a0c5ce0a09638f0e9df03e017023b23d5505a8b86f568ba7945dd0d4fd8440e6c8b6a21b8653273c8fd6311c486ce6d7ebf82d38a4a3120
 MISC metadata.xml 332 BLAKE2B 34b5c4879dbbabaf08883df45cc3fbed8c8c9e4af84defb70af64a25863914320e637f2fe0d388c21066b55921edf68cec06d0fb24de4464bb785a63d7cdcc72 SHA512 44f05e8196f20572f12f8ced92fdc76a78198ada035dd4eff11d37fea991aefd35364b07beb3abb213b63c900e7b9ed2b3e23f4d32fa0680928a342e0a5df8db
diff --git a/dev-php/doctrine/doctrine-2.6.1.ebuild b/dev-php/doctrine/doctrine-2.6.1.ebuild
new file mode 100644
index 000000000000..c716c1274c2c
--- /dev/null
+++ b/dev-php/doctrine/doctrine-2.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}2-${PV}"
+DESCRIPTION="An object relational mapper for PHP"
+HOMEPAGE="http://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-7.1:*[cli,pdo]"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r lib/Doctrine
+	insinto /usr/share/php/Doctrine
+	exeinto /usr/share/php/Doctrine
+	doins bin/doctrine.php
+	doexe bin/doctrine
+	dosym ../share/php/Doctrine/doctrine /usr/bin/doctrine
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index dd85e59a89a5..400109766ccf 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -3,5 +3,5 @@ DIST igbinary-2.0.4.tar.gz 179588 BLAKE2B 40624f4572622d42f57cea48739deb7374f459
 DIST igbinary-2.0.5.tar.gz 183869 BLAKE2B 8bb56ff0213c77dbc17cf65962e23579935b2330ca2107b8e6e00461a486e60df4209c375e9f74d17bb0a745136fa776233b41cfc51ffb5e1dc1c8fdb4a8bbf2 SHA512 e0abae97b5a0c9ab30ea00a490294f18f91b66b728a05186167e15c0a631d4de82b8a24d370a0d58cf5552adde68dd1b3fe56e877d382fbbdac02cfc18e49063
 EBUILD igbinary-2.0.1.ebuild 574 BLAKE2B 4d078b52245b95d27aa040aff32ce303e7b46b31b10dba9666d6d4242edb93dd80d67c684732fa6efa8582488d2fdae5d758e9b4be48fd9b51bb059b2fc7b1d5 SHA512 d87d6379ee99b42860507955214f0fbd181a68c2ad1be33d74e0cf8b3126def3c114a17c674ada6e8258aedba85fd468239b82443e9a338b1ff401102ada6304
 EBUILD igbinary-2.0.4.ebuild 576 BLAKE2B 6e531bdf7061e41bd1b8fceb54d8e2fb15cd7e6b29c1704d7c2d5114ded5ec9d3691106b16114e8595a98c764923160d87a2f29e3a5e81dbfd796f25151e94d5 SHA512 4ae1113e8f5d6db14dcd4f85166394aa710ffb22a9b84c57a8797074671e4474f31b1460b81da1ad600141cd921b1fd36f3f4596f33a064d3bb33165564cf44b
-EBUILD igbinary-2.0.5.ebuild 585 BLAKE2B 24d7d29a7b0846ad8b42cdd50e3e9f8e03e889f0787c635e993584ce66098bdd5cce0a520aa997c9e5cbc37741a7c9d8c947444bbea42c418a42cce337b1ede6 SHA512 f57860093276c7688dc5a32dc51f2f1bb56fbed2d5a8069c302516f6bf4743841d618e9fcff9ba9e0ae179b34971c0c4fa7ed1f750402497764fa8e614b67b9b
+EBUILD igbinary-2.0.5.ebuild 584 BLAKE2B 6c928e2f63bc4af2255092a71c39e916db15b1ece4f1aa171719ad31a744231aedc099e938a66eaca37c9b936d607e060fb1ac19e0519c186c6988ae11a8ed23 SHA512 ae02b0f4099d8f65f796d60ccb11c8aa05b7d7218b6b7eae137229f5269d6168a0caea1e5215795cb12a1379442b7e7ac3ffff3dcb391154951a5da643aa285a
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-2.0.5.ebuild b/dev-php/igbinary/igbinary-2.0.5.ebuild
index 114414a580a1..7bb040ccb2de 100644
--- a/dev-php/igbinary/igbinary-2.0.5.ebuild
+++ b/dev-php/igbinary/igbinary-2.0.5.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-source-r3
 
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/${PN}/${PN}"
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 130b2d45ca53..5cf472d882c3 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -5,5 +5,5 @@ DIST pecl-memcached-3.0.0.tar.gz 83732 BLAKE2B 0e38d34b6ccd72f1e58305c3b4fbb3437
 EBUILD pecl-memcached-2.2.0-r2.ebuild 1326 BLAKE2B 5e8263a0affd9dd1fe3ddab2fb0e40ae9b7b7b93241d785facde7941164dcc85d4b1fb7c55c7690df75b2d6f3ec2fd2296963183763b1397036de12687cf095f SHA512 91b5c873c5a4e484c56e9ab3080972fd4bcd553c7e1630eabb7f552747a9004a3bdb3cf74993d214d6281358b4e0fde6ba3af1a8e55d0603f3828b579f499434
 EBUILD pecl-memcached-3.0.0.ebuild 1671 BLAKE2B b927ba0eef69a46c03b0a3d23f5779abdef82d14b57c268c9b9e20047212d75344025bf4160cb827f81cfa238f484b3866f488575f5cde57c621c51dbbc7bd4a SHA512 9bc30d5a84abff5cd98a9cab7b07ec00681b1e66142dc39290b6faad653266a736f05f8b6156510cf34a1d288efe68f823ff3444b465ffa1d714afe363ac0b6e
 EBUILD pecl-memcached-3.0.3.ebuild 1438 BLAKE2B 9968ae8d4b03469f33773eda816c4740294b7cddd2ada6404711beb3ee369aa8e176cb79311c0a7438d1e27fbc26bc595ccc9112cdf4e877c0d13143d3cb6699 SHA512 f62be49b9f34d5143812488d460764584521e9c2416067f38006d6c6183438613bbed1f1137b2bf644d3883c29e78b43b00f9481b7343a7077dd1c90e9d0bee2
-EBUILD pecl-memcached-3.0.4.ebuild 1622 BLAKE2B dfecadae2efc6b34a3442810b753d97157fdd59cfe2118321253a4e4b1b528521dfa6c511f3cb49ccd0579f95946a11a22a253329ff8b0897286bd05f4e5cf43 SHA512 f47c459a8e86ece1467ed4dfc824509ed344fda58c9274d840f401dc573c3d405bef1cca964f5d64a4b31d968434c370cecc4161caeba7075ff1ed54e2dc4e15
+EBUILD pecl-memcached-3.0.4.ebuild 1621 BLAKE2B b771c0067cb973665106bfe3b1530182a5c1653a3fe0ec69db0e7402ab9f88ebb5d29aaf1d35f82a678e2785a44421545b427b74323542034ffb90f1115b0ab5 SHA512 846c2260afd11e1ecb707c3b45fb9b1d8597e91d07e419a27e292b2041041c352098fbed14367b39df1e4cfad7aa6e9d98ff95463a00ae1aef53c673825ca0c8
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
index 6b5b2b389544..852b0db4b78d 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-0 php7-1 php7-2" # But only truly build for these two.
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
 SLOT="7"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples igbinary json sasl +session "
 
 COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
diff --git a/dev-php/php-openid/Manifest b/dev-php/php-openid/Manifest
index 53b965dac37f..1a9d34eddcf7 100644
--- a/dev-php/php-openid/Manifest
+++ b/dev-php/php-openid/Manifest
@@ -1,3 +1,3 @@
-DIST php-openid-fff9217fb1acda132702730b66b10981ea9d4cac.tar.gz 396390 BLAKE2B 68cd024d88666d60e8490a1fa00f939160a249b1146caf80649f05637db3847712b869ecfbfa838ecf7af11f33241d3fa8135969473a3a5a1779d920d7fba94e SHA512 930567426a5aa7d5967f4ef231f78c5719e174e6be7b78f62ecdd9e2bc2ec99e7c6051585ae3a92c6e005e05460d394d81b4c0cdb80ac0ffdfe5eaf6fdb9f625
-EBUILD php-openid-2.2.3_pre20140423.ebuild 804 BLAKE2B 0d900f00edb165e602b5b8619250b22351b3e2419b89710ca5c918afaa1e717b20ce2e1d1554faa56b9dbf80ee5547102c9d685fd995dd24ba1bb018b31486d7 SHA512 6da6cdf4bb63bb36fb19a3a88d075b4340344c858641cf8f67665f1b034ee7a150e868910ad241ec29ce56a11bbba27de6ba9dc2a5790b1dcf7e149d021c1bb5
+DIST php-openid-26d5e12ea2a1eae180b11b061160d6f78fbedd17.tar.gz 399502 BLAKE2B f18b74c9db19d30710ad35cb97fd426e515cfb1426c887d194a5ef62352fca09ac801c32501eb95005bf2c6cfa13ff5b166972d1b10dbb8a2dcdab2780073f56 SHA512 d63bc7e4f79ecb07958a71dfc8eedae3d1fb0b41070be9b8d1036a08861497cd858602d23158f92ccf7bfa2b1ecdc999397c62f99b8ebb2dc65a8f1f2e2911f3
+EBUILD php-openid-2.3.1_pre20180219.ebuild 806 BLAKE2B 7c53d60ed9cc9747f11c2e9ed6dbb9e75d71864f261207da78c382c6bf5ce123a8601591c35a707ebd8ee6a0ac7d9fcd93305cb0d9182f00b82c9b1fb45da3d6 SHA512 a2168cff8a37cc233dc0f3319d67e3f0254982551bf87f54890ddd87cfb6aa4c5b0a59ec86e8cde6715cefa691508e903b298de7f6a8263b885dc3c47f6b4a90
 MISC metadata.xml 331 BLAKE2B 49a262d2af79ab181642cf0631eb6b66ba316ad939d8b7b05cffef02d7f33a64d8625bdf079936ebadc6451b7065133bd44d6e7a23679ab2839b30231a758ec6 SHA512 4ec00f5e5faeb348fc161d5789a6a822fc64baff7586e5e7778c3afa16697a500cff705c0d543e8a327fc43e3c3ba23b1180a6b0016a7eabe8d72f317a55b702
diff --git a/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild b/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
index d8edbc19b047..f1991435566f 100644
--- a/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild
+++ b/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MY_PV="fff9217fb1acda132702730b66b10981ea9d4cac"
+EAPI=6
+MY_PV="26d5e12ea2a1eae180b11b061160d6f78fbedd17"
 MY_P="${PN}-${MY_PV}"
 
 PHP_LIB_NAME="Auth"
@@ -31,5 +31,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "This ebuild can optionally make use of:"
-	elog "    dev-php/PEAR-DB"
+	elog "    dev-php/PEAR-MDB2"
 }
diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
index 57aa6bdb01a6..fa28599243ac 100644
--- a/dev-php/phptal/Manifest
+++ b/dev-php/phptal/Manifest
@@ -1,3 +1,3 @@
-DIST PHPTAL-1.2.2.tar.gz 163248 BLAKE2B d0b48a5131a4567eb058e6c3395bdfff7d0e9535dae036616dbfcb11564ce9db07bec8a77ee3201dcaff7a0bcdbb451b4d7443307d6092ba81d35b849f05603f SHA512 7af41180bccbc81481a48f474b1d2c811ba678706f85045611ff1e69c3ee820e27e6cf17ea58ec562120dcdaae1cf3d91f606a13b5c262906ceba7570b092d9b
-EBUILD phptal-1.2.2.ebuild 576 BLAKE2B f850cee3de500bc9421afb9320b99ab2b3ddedfc869b9e5b03da9606a88ea4d38d7f89abb328b68621fdfe2234061006c09d4a87a11e62d7240398521ae892f3 SHA512 b1fb2393d250f37979ea2de97052321bea0648d10cc9e3e4628690daa21ca7bf76bca36e2f1abc9c53a73a83b9ade0a8045bd3104820782500a2d882faba8944
+DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290
+EBUILD phptal-1.3.1.ebuild 808 BLAKE2B 28f94a4cfbef459c5a6b4cd2362529e358f692c346c46481f37757fd5d9d6112a6528ce77bde166e87d02242c19e73ed997bcdeb80c6b082e07f0ed84e4658e3 SHA512 cbc0477ffd9e5288df3bfcd374fcc9f4187730cf284fbc4d930be38134d34a201302abec8fc1d9f2428ef6d0af36c21d96df2811b1d150c88a8c171513dc52ba
 MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/phptal/phptal-1.2.2.ebuild b/dev-php/phptal/phptal-1.2.2.ebuild
deleted file mode 100644
index d09c2bf8e06e..000000000000
--- a/dev-php/phptal/phptal-1.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_LIB_NAME="PHPTAL"
-
-DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
-HOMEPAGE="http://phptal.org/"
-SRC_URI="http://phptal.org/files/${PHP_LIB_NAME}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php"
-
-S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
-
-src_install() {
-	insinto /usr/share/php/${PN}
-	doins -r "${PHP_LIB_NAME}"
-	doins PHPTAL.php phptal_lint.php
-
-	dodoc README
-}
diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild
new file mode 100644
index 000000000000..f5ab86bdfd82
--- /dev/null
+++ b/dev-php/phptal/phptal-1.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_LIB_NAME="PHPTAL"
+
+DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
+HOMEPAGE="https://phptal.org/"
+SRC_URI="https://github.com/${PN}/${PHP_LIB_NAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/php/${PN}
+	doins -r "classes/${PHP_LIB_NAME}"
+	doins classes/PHPTAL.php tools/phptal_lint.php
+
+	dodoc README.md
+}
+
+src_test() {
+	[[ -z $(locale -a |grep en_GB) ]] && ewarn "Tests require en_GB locale to complete"
+	phpunit || die
+}