gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /dev-php
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
67 files changed, 68 insertions, 1297 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e4853aa9b685..25dba54b405c 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 dd6e52554f2c..008ee1936b4f 100644
--- a/dev-php/PEAR-Cache_Lite/Manifest
+++ b/dev-php/PEAR-Cache_Lite/Manifest
@@ -1,3 +1,3 @@
 DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
-EBUILD PEAR-Cache_Lite-1.8.2.ebuild 446 BLAKE2B 3b40eeac7f0e14cecb9b0e1bcd72a85d9f3074eba2196661f985bde606f5816ce8e7a27aaf3338c329a7d25db3bb18e9ba349e22b289893d71b3e2edd079ce6f SHA512 dccdbdee24bd6d4502e30848e1f8a8fc8dac08c6ff5a617d578c4e99393b755861a98e7c4c29a476ecbf1b956fb1cafdc3e7895d5fe02053ac45559e6ea1a93d
+EBUILD PEAR-Cache_Lite-1.8.2.ebuild 470 BLAKE2B 399286f493d9459068d2307478fbad1e849d0566a22cfe9de663f098e0d51f707c7ca0529637d0428c8f086ac0f2977636f5cb16188b410455f132efbee1c5bf SHA512 e88495d9088a2ab632f4877365aab67e08c7c5a173b4144a32b55640bffc01decba74d7e345f14640efde33da733f43712c4ef857a18c5100f062c47edbb32be
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
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 460d3047f136..4c7a38772082 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,6 +10,7 @@ DESCRIPTION="Fast and safe little cache system"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
 DEPEND="test? ( ${RDEPEND} )"
diff --git a/dev-php/PEAR-Config/Manifest b/dev-php/PEAR-Config/Manifest
index 8cdd95a0e39a..e12e5c5c5dc1 100644
--- a/dev-php/PEAR-Config/Manifest
+++ b/dev-php/PEAR-Config/Manifest
@@ -1,3 +1,3 @@
 DIST Config-2.0.0_pre20140323.tar.gz 34309 BLAKE2B 4c9af6b488f874f58a54a6051a41dbbfd04d2ca042089ce1433b5a11ec2e3e7d35c0b4a08bae7cb5081a7da0d5d08c5f14e982178e1cc409194f80cc46cd4e32 SHA512 7056724cde7d39f5a2ac69c8e2dffd0ff57cb8caba6f014b5cb2a3b047946ca160fb4c30c01cf1986286d885893c9e0f504cee8920b46324987f707b5408be24
-EBUILD PEAR-Config-2.0.0_pre20140323-r1.ebuild 921 BLAKE2B f34e1a351860a1965aff01998724d3cf42f07b3502eeebb84c689cf740d84c6a00d17015138d59abc8db57f18fff826d5a5eb65fd2b29fe698204415a0eef3ae SHA512 6154d657b0ff663c4b3f33f517bb26199491cf7380ea1ae0931892b3188de622b833d17c0422d58f496453b695f93e3374873784ec068959b3ecc8c0e4504a45
+EBUILD PEAR-Config-2.0.0_pre20140323-r1.ebuild 945 BLAKE2B 9158dd27b74f24e884bcfad85cb6cd0ab5e71321fd186610c066c51ca8e6e002d430d6342bcaeda75bd3969d8c4ed7260858617f02989bdf8c4df9a21b7b7d38 SHA512 6816adf83bf89986f3c13d5f76009bc74d706237421ff488d2a81307ef9bafe7b024400fce1b3b8f46e971dcbabb1fa0c8b973c01c312582c85b0e07c91ed6d8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
index fd949ea89cfc..441cc05883f8 100644
--- a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
+++ b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ LICENSE="PHP-2.02"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test xml"
+RESTRICT="!test? ( test )"
 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"
diff --git a/dev-php/PEAR-Console_CommandLine/Manifest b/dev-php/PEAR-Console_CommandLine/Manifest
index 6252d293c866..8b5de120d472 100644
--- a/dev-php/PEAR-Console_CommandLine/Manifest
+++ b/dev-php/PEAR-Console_CommandLine/Manifest
@@ -1,3 +1,3 @@
 DIST Console_CommandLine-1.2.2.tgz 40705 BLAKE2B 1cf2fd7ffdafe1b6e683d40e24c07bc12c9e41469e42595f40778f0bfef30457b32f80b966835a690724e29216348be0fb3f98a83947459d48f728896a5a056a SHA512 05dbde123d0d4fdbba2a959f4bea3b115e3629060a268d25a3007c2ee5a3530b8ebbd8c7d124a6c9d012cafa19f41690a888943a6c1e2e5ec1b9d83fa821d603
-EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1375 BLAKE2B f22a308438d44509a8e610e0286e30e1e87e019d3ce860f77312ce53b5ade0f1fd1198cba5db9c98ea6510d61a206bbf6aa031563df66f8ce1a68e9f5729ef46 SHA512 e4e6393988e9e0aecd7261049baba9919d2e69593eff72738c0a4b5b7eed35b3e71be5cc39ce561a541bb06a969abc20bf26db84344764aad60368738c047737
+EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1402 BLAKE2B 965117d89da7ed78a504e6ff3389fa5d91d2f676aa22858257092e02de2dcfbeda72f05e1da025cfc3a8426d07433daed2d8c4bd7c40ef9c4a9fda8b3781b7e8 SHA512 7e161c7bff80e92a97bb9f53fef821d3fc108243e15a2586ddef5aa5c0e39e366cab0a543c6b890b3dcee949bc65fd8c66abc6d7845cf53523bf52dfdd38cf95
 MISC metadata.xml 397 BLAKE2B ed50944409b7944c1da567241dab1e2e287b15e7a03c662c0642540b4fa1c50b6d048f6c7033b7fd1c598e5e2edc07bed8a758ec8f71e56e0c4a459f7efd9175 SHA512 ffb1a260b10acfd50fd5b3ee01d80b082f56e31c18c99232a28947a7b29d1ef1e529052b109573aebac05138982322f3a46cf6652f0e519222fb87ef730f5e84
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
index 24dcb8873034..606b86b09a81 100644
--- a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 # Only needs PEAR_Exception (not yet packaged) -- not all of PEAR-PEAR.
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index 48b7bf2cc165..d94aa90d6153 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -1,5 +1,5 @@
 DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468ccb5addeac9cd49c6fb617304fa77f4a44a11e3adf09173f65315d8a0755e44e93d0a7ae1c60f1a954849bee2380053 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe
 DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353
-EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 700 BLAKE2B 474ade8b8a9aa4445e6e41370edf2955a568f7d2fd740c9e0525973b98bffb05b6f7c5a78411efdee8219f125fecead7ae533bb3851386cde6c9ac10382b9df4 SHA512 79ea1973eb60388651cf6d5befd9204e8f3c023df85f19741aa13dbdb2c5778c2a7f10c4e720f29ca370361a70cbeb5a708c38ed3e9c0998149592f4fcdd2a81
-EBUILD PEAR-Net_Sieve-1.5.4.ebuild 709 BLAKE2B 204f4ed13839895c0745b4a75059fddba387ecf4b5e893b6adfe9cc8df0a2d19f36f6641e221771e9a60b0597de00600ecfd41a000a4f8b7f68fc67c363dd7e6 SHA512 4d124b7a7a68173d62cbeb40347f579b93a2134a067c4851e7857c764af7d1cbef2b3d757de2bfb3e9516f253ca2485b993cab6dd6b113835cbabe06850c0919
+EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 723 BLAKE2B f1de4fc671468d5beafe47dc93adbdc023f035122da7604976901dc0904497b2264ae222194b05e1553537aa1dd422197b74c6a58e184698a270018fd21e30ef SHA512 eb6e66bfee209df62a96a2a0ec45c76f2821e7993e440b092824c0e77452c16d131b8e325020d976aeb1de76f28e7119b50d75dfe08e327331bf5db978444b49
+EBUILD PEAR-Net_Sieve-1.5.4.ebuild 732 BLAKE2B 7822cb1cf48cc664224999a6a23ea309f3c360c819a0e16a41902bed471b509ad32b058019ef503d5f356e87c2f733d4ab20cd92331c48738ba21b610b792bc8 SHA512 3853d1f1b0ed3d931af3c9e08cea48dcc9ca117be7c3a5644e4fe9fb1850a913043656d12ee3ce0022be948a16aa70f7f2505f795632cbe89e87bc4a10751d79
 MISC metadata.xml 333 BLAKE2B 5370e25ed57579f125ff29e312b12b52c76e121b83c6940bcc984e2084698ac5db9e6b9d07769f32464365171d7e06021b5674f71cbb2d465687409d4bab2679 SHA512 e8eead1b207a468cbde1939d92c40408ab9aecec4646e1fbba116fa2846340f7d9a14b4a10014021b85242f766b44ce2fc68c8111272943fbb3539885566e1a8
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index 2d6a716f5d8c..facc1829ab46 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 
 DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
 HOMEPAGE="https://github.com/roundcube/${MY_PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index 44df11c59f7c..f2967f670229 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 
 DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
 HOMEPAGE="https://github.com/roundcube/${MY_PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index efec2cd26951..08348bf5d546 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -4,6 +4,6 @@ DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a14599
 DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
 DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60
 EBUILD PEAR-PEAR-1.10.6.ebuild 5890 BLAKE2B a3745653b5713f785f14ec6e0c5c67f6ee0ac8b530735e20a9320f81fa5bd56bfa2ac7b530f3176183d05841b32500e547729e8c7741f44b510c4174d8eb3fe6 SHA512 d2bf5b78072feadb77c90539d74dd5b930a65c0f2ae15cc79cd329a06e57965ff08d133660d665c1542398ef84d1ec4c5380861e578302cb43ef7f93b4ac6e85
-EBUILD PEAR-PEAR-1.10.7.ebuild 5898 BLAKE2B 8eb7c693dbe9c72d436824df309442286cc7706950fa94982ca4972ff631a5b8ef20274b366e3c776db28ba6ba771823d8756c49b2d927448fed9451bc77345a SHA512 07620a2deb64e796e71b3b1b5a0378ecd8b8faa96049a233a862cb5df996ff448b261397ba86ad087398643b6557b9010b09a9b81ee3e81beef1f77adce0b6ab
+EBUILD PEAR-PEAR-1.10.7.ebuild 5902 BLAKE2B c45cc95e60e238792f35a7e2f386a8db263c2b7f0fd7308c6b797a43d35c9dec1eef0cba20910ec9b478af63f3d7c3a3a0d39af5f068caac1479120a345f1100 SHA512 ad0725538ffc010be17355a531b1880262e73f3236b91664fdc924338a011aa8a1382f5f82712921e89deb9365adaf4cac5a8b01f98119da092b938ebb5664af
 EBUILD PEAR-PEAR-1.10.9.ebuild 5902 BLAKE2B c45cc95e60e238792f35a7e2f386a8db263c2b7f0fd7308c6b797a43d35c9dec1eef0cba20910ec9b478af63f3d7c3a3a0d39af5f068caac1479120a345f1100 SHA512 ad0725538ffc010be17355a531b1880262e73f3236b91664fdc924338a011aa8a1382f5f82712921e89deb9365adaf4cac5a8b01f98119da092b938ebb5664af
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
index f7fb52913b5c..8472eb060991 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
@@ -164,14 +164,14 @@ pkg_postinst() {
 
 	# Register the package from the package.xml file
 	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}usr/bin/peardev" install -nrO --force \
-			"${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
 			|| ewarn "Failed to insert package into local PEAR database"
 	fi
 }
 
 pkg_prerm() {
 	# Uninstall known dependency
-	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
+	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
 }
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index 381e5ee2aa57..59eb2d5321fe 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1,8 +1,4 @@
 AUX autoload.php 268 BLAKE2B 0b6618f45d1a4e03a317ea55b4af12c60c43f9eb98fe9b3cacc45e5cf505530cc4e332d5289365956abfb3eb882b3447d19919b5116d249d727b0c934f272eb3 SHA512 186ccfc3ae6669722d01948c266a9c0518e1da228095a880695b7de6502c9798203019622cc0c63e30fbf7abe94aa988b7c694bcc98522e04298aa90217b8ed8
-DIST ca-bundle-1.0.3.tar.gz 151659 BLAKE2B a8755af7041a1e093d06f6bf3bfdcd7461bd50ab5347f48285fb6e69d6e621c82c458c73625ed36d6745e91b0c7fabae37318da3674c47bb2813b78aa9483379 SHA512 e33629345d63121b7a6a46b0812afefad5adbc24fd5516eeb7471dd93b7e4126f144b6fc933b526796607fdc3fc9a99f5703188e15d905654d629591c555ad86
-DIST ca-bundle-1.1.2.tar.gz 129296 BLAKE2B 54912144510c7d2c09647540542cdaba24ae9ce1638c74d1f796bee7e82a7161c11ad8561aae6290c13c8e818acae55cfcab3d75d0572906632c6ca456376068 SHA512 4ab7ee419fe0a45b526fe985ecf87f2c8834538c21d008736b8daceec987caf87f525d60208639ade66c39d2fd3c774f54f0bf784cadbd5c81954e8df48ab058
 DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f
-EBUILD ca-bundle-1.0.3.ebuild 526 BLAKE2B d1f23cf223d8fafb9849c0884b8c1536db6e70a2600f91d25dc236fc5a79467fcd439933e71d7562855894ec2a6f60fcb3297e45c44df80d0dd78f10c8eadaa4 SHA512 0f2858fc082c4253f4b50f309a1f5f86538802302c8d97067210391d735f4a5274342ea234fe0a97d1f58f9fedd6d18bc996e2e08a5e43eab818295734e14315
-EBUILD ca-bundle-1.1.2.ebuild 526 BLAKE2B 7de55f6c6e143a7e414b32980ab29fcffd4a7c3d3f589a7bc9af2818a94f276e160e848b5d544479a6ac652d808b005e0654dd91a600d3001289d83bfc5043e8 SHA512 ce0d8339d59b5ff273eb251520ff8651294a5ad54412de0b17fe024f33c18667fd11735ce96f478f7b9c482de7c9faabda6c2b474afa2d3ef2dcc9fe436b6d4e
-EBUILD ca-bundle-1.1.3.ebuild 523 BLAKE2B 2047130b6f105cdb9520c0106b45f1698b2f1e13969df79b2c3f5e678808ea9309295d92f9be1890869fa2f742513fd15d7ae2dadf755bf7a72a45fcaa2088b9 SHA512 958ac491c2a5711bfd49ccea3a695c639f5e526d7ac2b5b1f4152e93115f44dccafdfeedf15ec71fe1cfb04923188328732638d280690d10556b35e7f7b28220
+EBUILD ca-bundle-1.1.3.ebuild 549 BLAKE2B 19f79b2a3c41f87809872ebeb277cb52d83a2e78e57081d7e85b28c1b43c862015ab44fa9c2b4a1bc278759b549b455df3f74deed54b47caae7c14485935aa29 SHA512 d77f24ba5c2ff78d54363994e05b5866c4dbcfe572de78658ecfd65906dd48bcf48d5ed11f9f6327305c55662db0c479ef168ce66b2ca0360141f2406c82daea
 MISC metadata.xml 843 BLAKE2B d66b37ea7e1468303bbf544d3492a5f3108810a2a04bd5eec1562fa3b873e22cfc7922b46c96982900d8a0c7af7a22e4b33e9700057d32e238c35dd7fdaf5d06 SHA512 9cf3344f7122a81e5ce4b114a53af7c2cedc76e9607abffb906c70263b0c9dfab0209ee06be67ffc22d3da2e386fc376cc3aee007974e5338a259f853c5452fe
diff --git a/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild b/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild
deleted file mode 100644
index 95b1abf40256..000000000000
--- a/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
-HOMEPAGE="https://github.com/composer/ca-bundle"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto /usr/share/php/Composer/CaBundle
-	doins src/CaBundle.php "${FILESDIR}/autoload.php"
-	dodoc README.md
-}
diff --git a/dev-php/ca-bundle/ca-bundle-1.1.2.ebuild b/dev-php/ca-bundle/ca-bundle-1.1.2.ebuild
deleted file mode 100644
index 60dc4ddfdaef..000000000000
--- a/dev-php/ca-bundle/ca-bundle-1.1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
-HOMEPAGE="https://github.com/composer/ca-bundle"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-
-src_install() {
-	insinto /usr/share/php/Composer/CaBundle
-	doins src/CaBundle.php "${FILESDIR}/autoload.php"
-	dodoc README.md
-}
diff --git a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
index 164c183e94b7..19d43507a5f0 100644
--- a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
+++ b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
 HOMEPAGE="https://github.com/composer/ca-bundle"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index f6cf64a3f740..6fa56090124b 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,19 +1,6 @@
 AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206a1843b249fedcbf983f1826a3158e98ad7cfe675057b12fe52ff82b6b66e2d582ccf983b929c2f90 SHA512 06f9e2862521c54b765f55fe1c1e02728befd296916d0f41357d4e6004f2d00ddaa533ed5210e92e4642eb548a2d5fabf80604fc09ef7e871742716f4c02d112
-AUX autoload.php 965 BLAKE2B 5f9137a431f59e640b3d120ecafc1f7449890ff16c104899ae3d6d238756ac9c07dcfe49535cd59236cf92a9d242754a8a92a22ddc31609c3a72de8a8a258abd SHA512 c3ea41e0bc11b249b5b39e0fd3366e9f5a75e816ce7db0b11a223c4a4aeb6a3e031d2824e062ff26f5d1e75c01e023ebf9dfd3a1d5fc8b8e0f18168b79d3061c
-DIST composer-1.6.3.tar.gz 396955 BLAKE2B ee455c8ff7446fe2b51180c1c719a28a5efd30b24ba0f521ce07b02007bfaad15aea4d45b2a381d4a3abef123ce67077f8bf0bc3bee447752f3ab87bb6a5d46b SHA512 d373afe1bf8a5572f1d0bf3451d29ef1ea41f96a5fe54789e906601229d9366536ff0abdc7e0afa7cd14b22ccecf9ddf8b32fec14d4cd6fb308b878034af374c
-DIST composer-1.6.5.tar.gz 398169 BLAKE2B e89fb8805a58d031d4ba1e9694fb45eefa734d5ed79e1bd7c6aef02bf8a52ace19ed7fa109270d67af973f6892a45122017bc42bbd115245dc521e4720b5a549 SHA512 5f18a43af0b94006f4d553f03574347c7f279c409e3467ee65dfff12dad810d625a06452208e2024479faa0b1608ce122a293810e69b826667072171de7d905a
-DIST composer-1.7.2.tar.gz 401211 BLAKE2B b3470a45dcffe8758c3e498a6298f726928a03d297eefa182b823c5c263aca3492f2b3514528c3bb252100cd2f2b64d5a46a74c91cba76823d75433d1ae5c762 SHA512 c6cdb3c122c78383ea5f133bf54d44474c13e343e25e8ac4992e8d213f7645221009b20def194de8d91217f3f9105a7a3b601ab86206ce4c376b028dcb181151
-DIST composer-1.7.3.tar.gz 402233 BLAKE2B b9ae601e5710f12acd6da189a64217fee0198a0eb14227d905b3faab1dd5a4e6b573c4be89968f3b66b4e5612189fc7c284c2aa7d63c2247bce1cc56913acc5f SHA512 7dd6200abdae845e71bc9cb9d329547ee82a3186db93b535af92bdf01d5e0fecc1d7f7ddcbce54c05e60cf75dea9aba0f27ad86746b61b2301effe8d4c115949
-DIST composer-1.8.0.tar.gz 404169 BLAKE2B 977d04d3477e0660eb33e4cb746a5f7cf1cc15544b0afdc48ce7dc7774750b685c36db7796280dd825e2b5b5d310f65521a6c12ca92ca9d2b15c2213c64bec4f SHA512 d8589c75174fd36f5ce10c8f4e18045b8c86167ccc7d6cadb4eed8828d4d7b4b44b0b477b6bd0ebf6d0981a381b35f662205d6b4324c92c86ea3fbc8c3aeb6e4
-DIST composer-1.8.3.tar.gz 405927 BLAKE2B 00be1624fb96212edffd7059b718e74ed69643810de2ddfd6ffa1fb16ac689d2298d420452e7461bb427cc2e8186f4d2c9be072054fe7310bc74c32b80a1a497 SHA512 bb3ddcddcd30c211deae5a75fdfb178c39f0714efd59cb2a4abebdcdc9e18cf9437cae26ed21881fe06278472c150de2935f70b48c3f3c5d7e2a1ea92ee26605
-DIST composer-1.8.4.tar.gz 406561 BLAKE2B 2521da6a50371102c2a8bf61aeeba0c5846692dcbaaa13e83d09a42480c518f91889bd6d6461aef60958d1f68801f77a646c7940c5992a8da25adf050550050b SHA512 b1061fd190b05d2fc309ff76bf246f6d02547249fe52c347715c2dc2e4f5149b3c4e4f43f255874749caeb44ce05cfcbdb8da1d96a9f88a2213a9601e123ef9c
 DIST composer-1.8.6.tar.gz 409002 BLAKE2B 15d9621e062646b81518aff816a3e0b187bf1d9cd617c32e3a19167ba0c89b9ee8f55503e7d2e6d3515939f7d50131c5be0786fc04518409584960290eb32118 SHA512 97ab93acba24307897fe64b3762e77ebca9fa794c5eb476a9d774feb124dbd53b090c36b0fa9d1da38ea26d13af8bf13d7bc733c9c465fba6b908e590ea96dbc
-EBUILD composer-1.6.3.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
-EBUILD composer-1.6.5.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
-EBUILD composer-1.7.2.ebuild 1177 BLAKE2B dc6041ecb976eca609e0da23ddc706bc06c35aa9227db41b3601efde2afc879bb6506a316b8b555f6b23c3571835b3b3e03c4292c06b425cce01f5d52d639dbe SHA512 ae2da2f3b91755a9a685d54c951ade473f4105f448aa4cbd8b49c9643f8ae1648e7257e25548363f0570281f3780b50bc7ff0644afdf8081d53d256e3fdb9254
-EBUILD composer-1.7.3.ebuild 1174 BLAKE2B 1e6f4617e815a83a69ba7eed6d248a3079d5a9192d9c88870ea1df72e6477558783f7d988f670b275dbe13b2ee3181e4da3d9381be565822fd2b4f55f0a22cc5 SHA512 44bdde80de9eb5beeaf60f3afdfc2d0c1e09ec5dea428da2d979e199b384e714f6b959e60f4e27a0a1a258ce9076d196cfa66ad488885c244f2aa2d945d06a5d
-EBUILD composer-1.8.0.ebuild 1174 BLAKE2B 078e9c8cbf921512b98933c8e58197bbcb2027dfc6881bcc4b1f7b922c7476f68bad0d0614d871e8df9a0d444637ea975ef62972f55f01cd79c43bd972233e8c SHA512 0d6ced0951e40a33cb59cee465690444e1205f809ce7d1333001ff54f2f87dd2e8810230195ecc2e7cd02d041c8a38971aa9a719d9ab69db0838cfad6aaf6280
-EBUILD composer-1.8.3.ebuild 1186 BLAKE2B 95033b8bbb6de3402a1ef98d764eaa9d3a9679103f455aa556872c13cf5357edd08561166b5e28893d3415ba285cf2df0d3f234c83930c29059b9bd35112922b SHA512 7cd233abfaffe7e5e3016cd881c380f23576720d223079ad7cf91805c2fb87d2f06e54092da2266e5a005229ca87b9e7954e8ff72e0e4f1c45ce5043a9e5613b
-EBUILD composer-1.8.4.ebuild 1186 BLAKE2B 26986b0e257117a1a5ff3e99c63a4924a7220ccc48810609e5c75025f7010f42960d4ddd38afe1d95c53e311b6a196528402e05cd3cd943f080c4f5bf33565ff SHA512 23d0a046a45563ca06ac3a91f16c47e6970807a6ae06d3117d02fc868f397cc0ef982677483679510aca9ab4aebf844aaf962e070aa09a21f1f2d603d1cd249a
-EBUILD composer-1.8.6.ebuild 1186 BLAKE2B 26986b0e257117a1a5ff3e99c63a4924a7220ccc48810609e5c75025f7010f42960d4ddd38afe1d95c53e311b6a196528402e05cd3cd943f080c4f5bf33565ff SHA512 23d0a046a45563ca06ac3a91f16c47e6970807a6ae06d3117d02fc868f397cc0ef982677483679510aca9ab4aebf844aaf962e070aa09a21f1f2d603d1cd249a
+DIST composer-1.9.0.tar.gz 410267 BLAKE2B 5bbba9eefe703eb55a7d63647e8ecb3e4560b4ffeff321282f4f0c0db1aca143e210b517f98cf5fd9a9839d714b9badb1092b9d1430d65f29e5b134d9321370f SHA512 70e484404752a6b4aa94dc2c5999ab615c5518b60a580399096c7d2b0a026feadc7c10509a00920eab8f0298015fb1f5f82abc426927a35b8bc3c3e454d0b20e
+EBUILD composer-1.8.6.ebuild 1232 BLAKE2B 09ef27512b2029bc3201939bfea919540ec53e704479edf8fd7551bb7e6423f1ad3438603d620dd501dc5ab7c7aeaa725b5f5d6a8ec94216f9a1a3b73ab43c74 SHA512 863ccfd1e0be4e415028d7aa59f5635b0d743b16e19a9b5f2f70b952103a5d7ddd4655c0fd478ed029a272bd264825f1432c2cd6208000a3c30908e565b089e0
+EBUILD composer-1.9.0.ebuild 1232 BLAKE2B 09ef27512b2029bc3201939bfea919540ec53e704479edf8fd7551bb7e6423f1ad3438603d620dd501dc5ab7c7aeaa725b5f5d6a8ec94216f9a1a3b73ab43c74 SHA512 863ccfd1e0be4e415028d7aa59f5635b0d743b16e19a9b5f2f70b952103a5d7ddd4655c0fd478ed029a272bd264825f1432c2cd6208000a3c30908e565b089e0
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.6.3.ebuild b/dev-php/composer/composer-1.6.3.ebuild
deleted file mode 100644
index 4edcaf353687..000000000000
--- a/dev-php/composer/composer-1.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.0.0
-	>=dev-php/cli-prompt-1.0.0
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-3.0.0
-	>=dev-php/jsonlint-1.4.0
-	>=dev-php/phar-utils-1.0.0
-	>=dev-php/semver-1.0.0
-	>=dev-php/spdx-licenses-1.2.0
-	>=dev-php/symfony-console-2.7.9
-	>=dev-php/symfony-filesystem-2.7.20
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.12"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}"/autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.6.5.ebuild b/dev-php/composer/composer-1.6.5.ebuild
deleted file mode 100644
index 4edcaf353687..000000000000
--- a/dev-php/composer/composer-1.6.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.0.0
-	>=dev-php/cli-prompt-1.0.0
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-3.0.0
-	>=dev-php/jsonlint-1.4.0
-	>=dev-php/phar-utils-1.0.0
-	>=dev-php/semver-1.0.0
-	>=dev-php/spdx-licenses-1.2.0
-	>=dev-php/symfony-console-2.7.9
-	>=dev-php/symfony-filesystem-2.7.20
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.12"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}"/autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.7.2.ebuild b/dev-php/composer/composer-1.7.2.ebuild
deleted file mode 100644
index 7b2ac3739380..000000000000
--- a/dev-php/composer/composer-1.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.2
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.4.0
-	>=dev-php/symfony-console-2.8.43
-	>=dev-php/symfony-filesystem-2.8.43
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.43
-	>=dev-php/xdebug-handler-1.2.0"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.7.3.ebuild b/dev-php/composer/composer-1.7.3.ebuild
deleted file mode 100644
index 1e07fc80822f..000000000000
--- a/dev-php/composer/composer-1.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.2
-	>=dev-php/psr-log-1.0.2
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.4.0
-	>=dev-php/symfony-console-2.8.43
-	>=dev-php/symfony-filesystem-2.8.43
-	>=dev-php/symfony-finder-2.7.20
-	>=dev-php/symfony-process-2.8.43
-	>=dev-php/xdebug-handler-1.2.0"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.8.0.ebuild b/dev-php/composer/composer-1.8.0.ebuild
deleted file mode 100644
index 7e07fce8b85f..000000000000
--- a/dev-php/composer/composer-1.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.8.3.ebuild b/dev-php/composer/composer-1.8.3.ebuild
deleted file mode 100644
index d72e21b002f8..000000000000
--- a/dev-php/composer/composer-1.8.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.8.6.ebuild b/dev-php/composer/composer-1.8.6.ebuild
index 2c139b8b8825..d39d5769d38e 100644
--- a/dev-php/composer/composer-1.8.6.ebuild
+++ b/dev-php/composer/composer-1.8.6.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 DESCRIPTION="Dependency Manager for PHP"
 HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*[curl]
diff --git a/dev-php/composer/composer-1.8.4.ebuild b/dev-php/composer/composer-1.9.0.ebuild
index 2c139b8b8825..d39d5769d38e 100644
--- a/dev-php/composer/composer-1.8.4.ebuild
+++ b/dev-php/composer/composer-1.9.0.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 DESCRIPTION="Dependency Manager for PHP"
 HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*[curl]
diff --git a/dev-php/composer/files/autoload.php b/dev-php/composer/files/autoload.php
deleted file mode 100644
index 30d8495a4548..000000000000
--- a/dev-php/composer/files/autoload.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/* Autoloader for composer and its dependencies */
-
-$vendorDir = '/usr/share/php';
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addPsr4(
-  'Composer\\',
-  __DIR__ . '/../src/Composer'
-);
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required(array(
-	$vendorDir . '/JsonSchema/autoload.php',
-	$vendorDir . '/Composer/CaBundle/autoload.php',
-	$vendorDir . '/Composer/Semver/autoload.php',
-	$vendorDir . '/Composer/Spdx/autoload.php',
-	$vendorDir . '/Seld/JsonLint/autoload.php',
-	$vendorDir . '/Symfony/Component/Console/autoload.php',
-	$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	$vendorDir . '/Symfony/Component/Process/autoload.php',
-	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	$vendorDir . '/Seld/PharUtils/autoload.php',
-	$vendorDir . '/Seld/CliPrompt/autoload.php',
-	$vendorDir . '/Psr/Log/autoload.php',
-));
diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
index 6e1e0284bca1..8a8c7dd9985d 100644
--- a/dev-php/json-schema/Manifest
+++ b/dev-php/json-schema/Manifest
@@ -1,8 +1,4 @@
 AUX autoload.php 272 BLAKE2B 35cf5eb6efc11395c45a12a98d2882bc249b4496cba7b1ceba2abbdfa5dbec43a782e1034701f72e12d586aa80460fa87f0623f497f0da33cd8aaff7948d7370 SHA512 d5b970d485d198c855dcebe4c04adf37d7aaa118d7546c3b6d73944809c69ed18436568e33f847329a8027220f735cd5752ef5019bf8dfad40a740d94d02733c
-DIST json-schema-4.1.0.tar.gz 24772 BLAKE2B 181c584c11113c2e0bb7b2f19ef40ae588e470169a4498a47fbd3fcae60d7bb1bb21ac4ab82ce295e487098719fca9004090142d992a296a1b5599fb909b0171 SHA512 5c6bda8c34012bc20d9bf604a6183d50f451327bded70d94415450d2b3cc8e7f6f416ddd8b13db0aeb487fe031fe3185aebd9c97e4c1f79c866dcbc3463f64d0
-DIST json-schema-5.2.7.tar.gz 31388 BLAKE2B b0ce5a9f958effe7d8040c57501841225865eee0d67f56d0eec6aca0c93557b526d51ae35d04a5bd2c066066c1ccdfb00954e6aed866c6d225260ca4a5f73f56 SHA512 fe3b436ea3c29719244fb29e11c37b505fa46845704b9153b1e195147c0b3da39d5d69c61e1b2d89de1ef56bfd51be3552e91cc5dd41a08a8a036e62c29ba197
 DIST json-schema-5.2.8.tar.gz 31179 BLAKE2B fc422b4ea632299308fe44104ed66365441879441446d47bad1da89182da0c1aba04877c279577fe7e8fc9f82e4677bc755558a4f4fa1893362d2b93e8743a08 SHA512 04a96413a12979ee42cc72dc7d6cd73ab26472c46cffa1ce65d7e2338867ec6cce48da5a058d4c8bb849a8fae72376272b814f3a808ed3374af9c98eb8674fe5
-EBUILD json-schema-4.1.0.ebuild 830 BLAKE2B 971c1161efe1a08fdf902496d278d712f449d0a86e5999768a91460da21a2f0b150fa14aea2d560111963a049859db3f4eeeb9c4097435fcc5b9775f3b18c6aa SHA512 f8bb9a1e53d8048a0b500069fdfa389eb0b12a6cb416791e45b34e0de1d66e5d17c3d5ae5c059936e3e6412c1fdddd6dd27723e1d46feacf2e8b8a309ae11f74
-EBUILD json-schema-5.2.7.ebuild 830 BLAKE2B 694863aaa7495dce6ef836cabcf30194d81134e8a8aa2a90267f68b11e2b445ed469c3297a1d72ee1303aeb9b0d1dc95d11ff6f98212993a3c2241688fc60958 SHA512 51183896266aaac04c774fa811935514edf85be6cbc034c2b89cbb51e830f71638b6ed2ae61e6fa45cf9f05c47413128535b552aa8b822300e19b4c9eb1fba19
-EBUILD json-schema-5.2.8.ebuild 827 BLAKE2B 8a3b4bbb0ad948faabbc01661814667b69c3a00bb36dc6be9bf70f6c127138d81d206380cd9179f4a17fe7badbcd2758d36f2a493f0ac410c51f6de0b655ba03 SHA512 cf3485c892d58c72eea134ceb8c257a5a7de39daf4c4c1c7ed95494a01d693de4d8a03ac38a1c9a7beb65be9535f18e4e40ca29ba3a7e675983a64fe8ea253bd
+EBUILD json-schema-5.2.8.ebuild 860 BLAKE2B 008001378526262ff2ab40a288cf887a86c7b40efadf763933519ca2ed24df8986133c91235fababdc922b4ef7c06db5766f073e5e251f68aefd4e0312c13b05 SHA512 ebc9d17959a0903632ef71e28475d912f945ed02b3b28af81bbbc135c42ec590a328dd544d30d056a8650afdf7bb239763b32612cb10a9e4394bc8f68ab7c921
 MISC metadata.xml 681 BLAKE2B 7c94639852b0bb93de2ce1d05e53917d4fb893b503ac71f15b39233fc95a67ee469a53f175cd470b6f1f510e4f943839c848ae89ad74d3155c420740102c1185 SHA512 85ad81e521ac9eec7fcf4a8a162e412e97e29c30ed22048258a0a7a00b7f77c559544b033938570ebe64ce34ecd61d48dd20648751872d69b98740e791178845
diff --git a/dev-php/json-schema/json-schema-4.1.0.ebuild b/dev-php/json-schema/json-schema-4.1.0.ebuild
deleted file mode 100644
index 9412e627e0ea..000000000000
--- a/dev-php/json-schema/json-schema-4.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="PHP implementation of JSON schema"
-HOMEPAGE="https://github.com/justinrainbow/json-schema"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# Tests are not in the release tarball
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/JsonSchema"
-	doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}
diff --git a/dev-php/json-schema/json-schema-5.2.7.ebuild b/dev-php/json-schema/json-schema-5.2.7.ebuild
deleted file mode 100644
index abb217de97ee..000000000000
--- a/dev-php/json-schema/json-schema-5.2.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHP implementation of JSON schema"
-HOMEPAGE="https://github.com/justinrainbow/json-schema"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# Tests are not in the release tarball
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/JsonSchema"
-	doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}
diff --git a/dev-php/json-schema/json-schema-5.2.8.ebuild b/dev-php/json-schema/json-schema-5.2.8.ebuild
index c1115fb6ccc4..0c8201a0dd70 100644
--- a/dev-php/json-schema/json-schema-5.2.8.ebuild
+++ b/dev-php/json-schema/json-schema-5.2.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="PHP implementation of JSON schema"
 HOMEPAGE="https://github.com/justinrainbow/json-schema"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
index 8e052ac87633..421bb7a55385 100644
--- a/dev-php/jsonlint/Manifest
+++ b/dev-php/jsonlint/Manifest
@@ -1,6 +1,4 @@
 AUX autoload.php 262 BLAKE2B 0394eabe0e8bc08b09cc637e514aa49dee2b83b9c424f0d767a67f75024a86a20bbe63d30fce00cb17b69ee3bd6c74cf310e16a004720fb25aad1e1c65ba82b9 SHA512 476263a08ab0137aed1bb71446f1a66a618247f9095b138b958464f4f47faf775f4bb2ecbe87efa34ff56fb386351e3a3de0dafdf7367c461f0db0717ae5d46e
-DIST jsonlint-1.6.0.tar.gz 11327 BLAKE2B 481744188c6aa8a3135fc76c1026fce75df9ceaf939db9cb88f323afae27bf5041a56d3a63618ef497dc1e8f0606a8b8c24651fab566bb421d12d0ac5853ad15 SHA512 16538781807a4ca73de83e7be69d0fc2b530dd9b25f2b9a2ee3f1156dd5ebccb79e9489b873f307718ca2da658a1ae7cef5144adb32f2d1e5c34bd192d496c79
 DIST jsonlint-1.7.1.tar.gz 11813 BLAKE2B ed1a1404cf77d526a5dce15d0a3f36c5ff8c691e3d2560b6b5e309108d6f0072988b292fd1410b48bfad4ba528abd854204c38bf36f5196c7d8beb468716a5db SHA512 dd8380d02591997a129dc8f25f3b2f7c2f00c1d280bdce6551079b564b54b4828beb929bd9a7c608be6429754eb1c33d2d655a0f87b8f671ccf26ee2ae46095d
-EBUILD jsonlint-1.6.0.ebuild 857 BLAKE2B e04940bacd72c2534c1dc05a5d7b98176cde6c7ab4a4a099bd7017d92aa8c8c0054a3c9ffe1941878cc73458c4693e5ff92843612d236c324231310688035c3a SHA512 b83f0b8899284fca3ab096f1a8d8ef167c654156cc96e7dc12e927595c0eb0567d62c3cf9e3539e8fa42311b31a6870ecba2f9d4ec6f0c33b3c6d50c795f11a8
-EBUILD jsonlint-1.7.1.ebuild 854 BLAKE2B 110ec8499f995b38e43c4c6fd67eb952ba02d6b44dc872c150e719952cf03eeb4e95101f0aab62c435efd455375cc4baca57b7ac2318fe0337f089746970c37d SHA512 1d95d80dce1aa8a46dbe947c9bf1a4c0bb5b7d6bf8768d9e7f97e12ffdf0fd996f70aafa410f54531083be4e865424c7fc2fd7fb2dfea94261a65aa41b3184ec
+EBUILD jsonlint-1.7.1.ebuild 875 BLAKE2B 1b764c3a4e90e84131dda4b4a6a33a0c6ae64767102610725f21808000b369bdf0b54ce78126dfefed89abbd7cf8fefef5e120ddeb399a5cdcca36ae3480130b SHA512 aff41e22bc041b38e70e8e17a734d1b0a627aa74c553c073ed1f0f256711ddf449ab5938b9cdbb5f18561e402263f32a02d78056eb6a57129ea9d3b774659f8c
 MISC metadata.xml 653 BLAKE2B b01de68933db99cf59ed9e8ace9af6ba3c8a5948e2478c2361b2a52beb4f617d7fc23adb6eca4d76b162648aa4082a3881c61ad0dca6e02fc9c044ae7740046c SHA512 110ede45bbe6869e8a5831d5fbd2863e69bcd03e179e249efa2b2226c48e47a88569417196dc78f14d7a769d1611b8358839ba354da3dfae05b0a4f6b5c28664
diff --git a/dev-php/jsonlint/jsonlint-1.6.0.ebuild b/dev-php/jsonlint/jsonlint-1.6.0.ebuild
deleted file mode 100644
index ea1e8f975dc1..000000000000
--- a/dev-php/jsonlint/jsonlint-1.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="JSON Lint for PHP"
-HOMEPAGE="https://github.com/Seldaek/jsonlint"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-		sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Seld/JsonLint"
-	doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php
-	dodoc README.mdown
-}
-
-src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}
diff --git a/dev-php/jsonlint/jsonlint-1.7.1.ebuild b/dev-php/jsonlint/jsonlint-1.7.1.ebuild
index ae2c9d17871e..4085b18b49f7 100644
--- a/dev-php/jsonlint/jsonlint-1.7.1.ebuild
+++ b/dev-php/jsonlint/jsonlint-1.7.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="JSON Lint for PHP"
 HOMEPAGE="https://github.com/Seldaek/jsonlint"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index 8226eea05b0c..663b51e55444 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,8 +1,3 @@
-AUX autoload.php 199 BLAKE2B 617ed826e95ec3cd03a8686cb3f2ffecc2eee748ccde58f0caf0d89f71187235cad969694c1f7a5fc7e16e1fc53178bf26dc3e7515b13fa264a639cc9fa2e968 SHA512 bb53c3edbab856787432d085f35af4b0388a46489ad910bce4d2e070537b5b1652da6ed7260fa5b1c0fb7f808c5e8a66b9fce0282bc0d62f3e80d1eb2284a905
-DIST MaxMind-DB-Reader-php-1.2.0.tar.gz 17488 BLAKE2B 2a511f84091ade374eb5b9a975fa6dafe75d69c4c057113790492840acfb9b8e50137bf4927814d8d77b2e17f4e0a7fe1ffda511f7c599a604bc69d4f38af406 SHA512 2965c5348ec787e503c04322961b00fe7806cd95c5f711efd9833adc0acb21f0c40cab1983868f8ea0bb4e8576186d83e1e1913b203aab999f3870ea298a9b2a
-DIST MaxMind-DB-Reader-php-1.3.0.tar.gz 18573 BLAKE2B 6f093b4343438d37a44639dd47d4c149bcfdd351b9fe68eb19c1b739a28e7c7605728e47471cc7d5d257d56df5da37b5ffd32c275cb705befe9e6d60a137ac46 SHA512 480fb38122d1700b18bb0b85d8062397ddc7f003897829f3533901c12a409d76eea9d499ffc0fdd1bfaf4d35b954a30606a053b78e787eda27771995e2a1800b
 DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5
-EBUILD maxmind-db-reader-1.2.0.ebuild 2219 BLAKE2B 60b3a8de3e439e2ae603c49f88bb87f56fcbb052d7a41a0dda046f031e1e6151512f38f9eb86ef4e5274969d5d850a952aa103effba739125b1dfaa45356bc7c SHA512 657716fbf85bb2502230786d10488386d0b89ded10c2981cec1e211422dbcd5ace29182ff0b537786408c088e5c1a61ecbeb2c8d15bdd33e91823cac21111c46
-EBUILD maxmind-db-reader-1.3.0.ebuild 2160 BLAKE2B b73d6b15b781e04c5f23ff5c776e03b761695074dc19a7b74b97f6ae09d273ec53854a9c7ba6af0ecb2b07c9dd885f01aa95b1d389fc145a3d8b5e20b373cd5a SHA512 2232a93f07adf6dae4627c6332e7fd011aa776f1114fc10a987508787b4fc8bff6d3893f973281652754d7f305fb14da9ca66265c0706b5ed840417f4b60114a
-EBUILD maxmind-db-reader-1.4.1.ebuild 2166 BLAKE2B bf9499aaf5e2fcbfadd6d2bb0b4afc22dccf96191e2f6600a2f5e10ed1b31b61f7528e134365a34ceb9b880fbd0f116c2272f87c3766fb526c4a0c1b00fbc809 SHA512 669be8a904368f73942e6b4c8ceef994893ab5191f6f4e735e72a3d74a65341616d0497ff477d7f94abf4696498a3d3acb5b2ba8d65e9ae71b96d0e7e467f40c
+EBUILD maxmind-db-reader-1.4.1.ebuild 2210 BLAKE2B 6784fa6b01c81d2b5a7b2dd6d7104fc78d662982ac80518241790b958850c6b086763e8422ec5d0c0d83a4b8f8390844d09840b190b1cede3e2d691b9af38c41 SHA512 972ff928e787addbbdfdcd39fe140b2ef808502633a48ce9937eca091e05123b5139b3fb9a95f9c4d6c3d1f48f5eeb099dffb36e169f2c4ee36deacb886d2a2d
 MISC metadata.xml 472 BLAKE2B eafb00cbc65f3b5363ee77c111deaab80e04072ff4669de2ee80a669b1c81f72e8dfb567de682c4b2b5597d731f1bd4480a73e0b9f3b1ee32e02b1f72ced1180 SHA512 7522517bc559e5309dce0bfa525c80f0d00ca57f03d7a6c771fc1ac20281c09efb142bfdafd56633edfa3e2a878943d6bd3c16ea3f93f0b5ca8ba11a5f28cf8d
diff --git a/dev-php/maxmind-db-reader/files/autoload.php b/dev-php/maxmind-db-reader/files/autoload.php
deleted file mode 100644
index 45e8c2dfba31..000000000000
--- a/dev-php/maxmind-db-reader/files/autoload.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addPsr4('MaxMind\\Db\\', __DIR__);
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild
deleted file mode 100644
index 344af7938327..000000000000
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="MaxMind-DB-Reader-php"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-PHP_EXT_S="${S}/ext"
-PHP_EXT_NAME="maxminddb"
-PHP_EXT_OPTIONAL_USE="extension"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-source-r3
-
-DESCRIPTION="PHP reader for the MaxMind database format"
-HOMEPAGE="https://github.com/maxmind/${MY_PN}"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="extension test"
-
-COMMON_DEPEND="extension? ( dev-libs/libmaxminddb )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-		dev-php/fedora-autoloader"
-
-src_prepare(){
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty. In the latter case, the eclass
-	# src_prepare does nothing. We only call the eclass phase conditionally
-	# because the correct version of e.g. "phpize" may not be there
-	# unless USE=extension is set.
-	eapply_user
-	use extension && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install() {
-	dodoc CHANGELOG.md README.md
-	insinto /usr/share/php
-	doins -r src/MaxMind
-	insinto /usr/share/php/MaxMind/Db
-	doins "${FILESDIR}/autoload.php"
-
-	use extension && php-ext-source-r3_src_install
-}
-
-src_test() {
-	# The PHP API has its own set of tests that isn't shipped with the
-	# release tarballs at the moment (github issues 55).
-	use extension && php-ext-source-r3_src_test
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
-	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
-	elog "and then most of the examples in the documentation should"
-	elog "work without further modification."
-}
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
deleted file mode 100644
index 7d53d3fc64d6..000000000000
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="MaxMind-DB-Reader-php"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-PHP_EXT_S="${S}/ext"
-PHP_EXT_NAME="maxminddb"
-PHP_EXT_OPTIONAL_USE="extension"
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-source-r3
-
-DESCRIPTION="PHP reader for the MaxMind database format"
-HOMEPAGE="https://github.com/maxmind/${MY_PN}"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="extension test"
-
-DEPEND="extension? ( dev-libs/libmaxminddb )"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty. In the latter case, the eclass
-	# src_prepare does nothing. We only call the eclass phase conditionally
-	# because the correct version of e.g. "phpize" may not be there
-	# unless USE=extension is set.
-	if use extension ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install() {
-	dodoc CHANGELOG.md README.md
-	insinto /usr/share/php
-	doins -r src/MaxMind
-	insinto /usr/share/php/MaxMind/Db
-	doins autoload.php
-
-	use extension && php-ext-source-r3_src_install
-}
-
-src_test() {
-	# The PHP API has its own set of tests that isn't shipped with the
-	# release tarballs at the moment (github issues 55).
-	use extension && php-ext-source-r3_src_test
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
-	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
-	elog "and then most of the examples in the documentation should"
-	elog "work without further modification."
-}
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
index e5bac06988f7..5663a274a2d6 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
@@ -10,18 +10,19 @@ PHP_EXT_S="${S}/ext"
 PHP_EXT_NAME="maxminddb"
 PHP_EXT_OPTIONAL_USE="extension"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 
 inherit php-ext-source-r3
 
 DESCRIPTION="PHP reader for the MaxMind database format"
 HOMEPAGE="https://github.com/maxmind/${MY_PN}"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="extension test"
+RESTRICT="!test? ( test )"
 
 DEPEND="extension? ( dev-libs/libmaxminddb )"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index dc5249985130..314eb58a6846 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,17 +1,7 @@
 DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
-DIST apcu-5.1.10.tgz 111937 BLAKE2B 87bf86b43a775c38b232e4acd876f5c63628fc095747fecc26109fddc0473672180e3886dd613fa426772ea53aa8d7f46d08ec3e3383f6ce53be2f63a9ff066b SHA512 fdf82f2b46231849b373f50d1255bcedab8fbefa7ded7c157649cf6406fb593cc2f4e63ca7d3cecfbadb4533ecd8d0ad80e198626dc1489cea8a22ba87ca583a
-DIST apcu-5.1.11.tgz 105462 BLAKE2B 37ff632555e1bca51951db3021a4108a1de491b1bae2b12daed80e5d2d4651737cad744023c62956779395198accf33290c0c3b81b6abfc7bb54337a1a23e082 SHA512 2c284bbe84012030cc5c24ccf903c3abee995af549616c10211dbd5e463a5f37a3f27a5982127db81787a64345597a10be495380b844ce6204dc57c8b058bb88
 DIST apcu-5.1.12.tgz 105890 BLAKE2B 110a56ed1da8e33bd39c9d694007acdca2deb42219ae5d31b57296ff3729bab3fdbc508965b2cd0fccc425b2c2fea9249933cd7f45586beeee7cd3bd38ef2473 SHA512 f53b7840d5aecfc899e3e878f0bb9a5dc4a83628543963c20c25ce2b2a2adf14dd40d39a6a2014c139962453e0e9e5038fca7b1d0be205c0b9b2aa6e3fefb054
-DIST apcu-5.1.16.tgz 94032 BLAKE2B 3676cfaad796f565b63fa882fad79ed2fc8de383d364ff24369556761e21f7091ebd7064ac8e0815f283e839bc95ca88aced83d882b622d3a4297af46dc0da72 SHA512 cda2b61540b786cdecc09a2c1f77c5bf91cc118ac97fa929f1d4c3c63d29969397cf3ee37691a86e7bd7784411046df5d93efe37b4cc0c1ce903dfa7dc7dce89
 DIST apcu-5.1.17.tgz 94814 BLAKE2B 2e49f08b9445f04fd036bc949c9099ee045c3ecd460b323e371a4906fdef77f8d3e7d338af14fe3e116a94aa548c7fb79cc0003556ed739e258370095cbec075 SHA512 7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793
-DIST apcu-5.1.8.tgz 111260 BLAKE2B eb41b1af33500ed9ddbbcb5e1a92884af4b356e16cf76c70f75a8853522cc91af1c156cc0bbd464fce539a138bf4e2ead5101810223b0f1bb91cd062850ef08e SHA512 4f377389e713bcae5534c64ea28f72c20ab2176aa758188c4d956c1f2370be49bc33dd2a1db43941fff5344a164aaeebc4e73e6d579f62d17334bcc520171526
-DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215e82757c457cc8938af48fea842e006c79c83deee4060cdc94047764930592eef03c5f347abeb7730897 SHA512 3e9b29a293b5bfb29283dd650907bfb9f31a1cb99ef908021d3869c3e3ae4051a2c45aab27275e90b0a2fa94c35cc9e170637dc539184d955f3f13dc09cba060
-EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
-EBUILD pecl-apcu-5.1.10.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
-EBUILD pecl-apcu-5.1.11.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
+EBUILD pecl-apcu-4.0.11.ebuild 1537 BLAKE2B e2e859314479c8986b097a904c50d0e23e09b4189144043664143a9fc1f8a6a6830803743eae047750cfe468d7dcdf716b03d61fec2ce406b0f7828f08890bd6 SHA512 b561c23514274933b5d27eed7425a1e007c052431502f6f9a1946a51201b0ec551b4a6bb1da6ff411ab3262c94f3e6fad2e8492a731fd4fb77df02d4e1e23744
 EBUILD pecl-apcu-5.1.12.ebuild 2093 BLAKE2B 84a4783d1e5f9fb621369986b1b6f53952a3c85154ab9984051abb63a9d8b6ffee8870cd47991434f32cd81d322f74ad51098a3a1f77a19882cb86613d95e585 SHA512 d93c6e848b15a7365bc38ae5ff0fed0ed7c8be3025e18e178fb3c6ac9855e9a91c32da9c91a3849bbe8f8ce88c2931404fe0c1366ed14bd8e02674fb1f2801bc
-EBUILD pecl-apcu-5.1.16.ebuild 2090 BLAKE2B 233c80de86e73a3bed2a41701298a208e05c39c2f5d33f54932853338e59b549740196425ce2883cb8da93fececc93180753857c3d80e77e715ae1cd99efc937 SHA512 aa3d7fac044ec8e36b849f5e8545020f0374dd7a0492797268a4a27566301495d77bcad8a1e368cd7a15893771fcca5fac013f78c07ad2b4e011ba7b8195a993
-EBUILD pecl-apcu-5.1.17.ebuild 2090 BLAKE2B 0657ea009e3b561d31db2efc48214190853490caf3a2fd1149512a821a8ab33a62305c7223bae6d0c4b0e7b6a25117c9e0616d55cbb84f646c2bc11b38a3cf44 SHA512 7aa2e87a8e8176e5c5603828e5d894a1453a2a63fa4f5bfdbfca9484291ed919985af935423faee3c621777be21695bbc9b3d6c895c74dd397d6052f3be58011
-EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
-EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
+EBUILD pecl-apcu-5.1.17.ebuild 2097 BLAKE2B 73c0e00ca20648b49c61270d2c9055ea299b7ab64ca73f9280f314f73d5a7afbc34627087b934a50321f3154fdbba7908ab3726e6f5652deba14ead193edae27 SHA512 f09b90919f1063e47b66f978244af5caee80096b76ce16c8f7b19142292b667b7c1e18f091339a071d57c6d77f31631576892c3ad4f89e576cecf10b584aacd3
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
index 9f7340d3f2ae..f755261e9186 100644
--- a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,13 +8,13 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt TODO )
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
 USE_PHP="php5-6"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
@@ -23,8 +23,9 @@ IUSE="+mmap"
 
 DEPEND=""
 PDEPEND="
-php_targets_php7-0? ( dev-php/pecl-apcu:7[php_targets_php7-0] )
 php_targets_php7-1? ( dev-php/pecl-apcu:7[php_targets_php7-1] )
+php_targets_php7-2? ( dev-php/pecl-apcu:7[php_targets_php7-2] )
+php_targets_php7-3? ( dev-php/pecl-apcu:7[php_targets_php7-3] )
 "
 
 LOCKS="pthreadmutex pthreadrw spinlock semaphore"
@@ -63,7 +64,7 @@ src_install() {
 	if use php_targets_php5-6 ; then
 		php-ext-pecl-r3_src_install
 
-		insinto "${PHP_EXT_SHARED_DIR}"
+		insinto "${PHP_EXT_SHARED_DIR#$EPREFIX}"
 		doins apc.php
 	fi
 }
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild
deleted file mode 100644
index d78f6c0b3188..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt TODO )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-pkg_postinst() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
-		elog
-		elog "If you depend on the apc_* functions,"
-		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-		elog "provides backwards compatibility."
-	fi
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
deleted file mode 100644
index d78f6c0b3188..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt TODO )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-pkg_postinst() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
-		elog
-		elog "If you depend on the apc_* functions,"
-		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-		elog "provides backwards compatibility."
-	fi
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild
deleted file mode 100644
index 77f78a0680aa..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.16.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-pkg_postinst() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
-		elog
-		elog "If you depend on the apc_* functions,"
-		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-		elog "provides backwards compatibility."
-	fi
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
index 7a61f40da796..7da2fb1c7123 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
@@ -17,7 +17,7 @@ inherit php-ext-pecl-r3
 # However, we only really build for 7.x; so redefine it here
 USE_PHP="php7-0 php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild
deleted file mode 100644
index a0dd81ab461b..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt TODO )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-pkg_postinst() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
-		elog
-		elog "If you depend on the apc_* functions,"
-		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-		elog "provides backwards compatibility."
-	fi
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild
deleted file mode 100644
index d78f6c0b3188..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt TODO )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-pkg_postinst() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
-		elog
-		elog "If you depend on the apc_* functions,"
-		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-		elog "provides backwards compatibility."
-	fi
-}
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index b7ce85453d6d..9764ed80f141 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,3 @@
 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
-EBUILD pecl-imagick-3.4.4.ebuild 699 BLAKE2B 0936058fad63bdd607e69c38e5bc952441757483203d45451fef2437a653aff708fb267a3cb8c90a689be953b22b630657d6a2799af8c28a643af4593e2eb7dc SHA512 af4c7a30a2b530592a5a4b5791bd4bc6ca726a2d7741d40e0b5a9b6ad791b55970a15ebab330fc4acb4c9f92403701695878c53d1670bed5934863661623683d
+EBUILD pecl-imagick-3.4.4.ebuild 706 BLAKE2B 2925cb7327b6b303d4991e4488a2d029539153304c424b45da883aef12f2e831bb457309d4d7ac98cea6c25a2b8835ee4c27239a90db11b8690176109a2659cf SHA512 5c3ee260c33b03d5be18db36074ad8400241ce74b2e8ab9543301e1fac7c238568439b5f52d2030b193219e626bcec6542963e3c75c780dc1cffd5ffaba6a9ef
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
index 5a9c17a0c090..8af5e44f7c11 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
@@ -8,7 +8,7 @@ USE_PHP="php5-6 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DESCRIPTION="PHP wrapper for the ImageMagick library"
 HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index 18403e938617..af0ed398a040 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,6 +1,4 @@
 AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
-DIST phar-io-manifest-1.0.1.tar.gz 21403 BLAKE2B 0f18d94d127ec54914cb60756fd3e75c2d13ec593b7101735e385e4515abf4da0f03ef94d0bbbfaee02f348309525504f5e99e150a68b0d0fcd2129ccade4541 SHA512 3e4dd7ddd6de0a9f70595d0d8a6721782d2584526d3d4649cf0338ab36f106798daf4b7dcbf5bd972893a1569b622e4217212e5812b14e4bf3f698504f4d2228
 DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94
-EBUILD phar-io-manifest-1.0.1.ebuild 690 BLAKE2B b6bd099ec1e2f0a60c2f2290bcfa2a8bdb95e48d6caa396f027a715f2b7a3d527a8e49520e79baac0c3781160819ea864c336e3169877f99a1c01ba7aa7fc253 SHA512 1bd0b6cdb2d85a41191defdf180fac23d4004ad21080553165b4519479b7b810011cf10cd8c0c19881b6eaf5f5290eed9d6b66445933ccdb4b8b1423eb92b692
-EBUILD phar-io-manifest-1.0.3.ebuild 693 BLAKE2B 2c185c8cc0ed7e1796922a9488bf29d41070266d1e8c8d7ed06bf6f8711163b57869b862c1caaedda2238c7986f049e7aeca0c77c48b82e72616dc91b6db0b9f SHA512 981bea98fc622f8b87046202af5c5e509b80f6cc03c8d18f87fddde97afb2bbe0e04da5b660d052d84dd0f92f389d8e35beeabe819fe483feef107eda17b9233
+EBUILD phar-io-manifest-1.0.3.ebuild 717 BLAKE2B 9c31bf26ce2f7259c0c3fcec8cdfd157838c850ea40afd23149de416d20fa416393ac8a447fa3bd6182f8ced558ff4d682301b7a648418a93a5c5c0611efb843 SHA512 6df0759ff0e2203318e3fe92716182f56cac2d0a445839366094999f58d3c3b369cd1fab7a666d067ca8d3262c3278050f971e3ebff9bbeba9d59ddcd52112dd
 MISC metadata.xml 320 BLAKE2B 2a537b76317bec0310e9c6912562d75b512f00dae3ae411aff048a15e7b0986328699427135dedeb990f3f64f3b4b012e139349c5c082a7ba4c6447ce7b68143 SHA512 7ddc7f302bdafae9be276682a0c57125beeb45a9b96afd3fa1662cb699b95c96c36151ab91027e890c33054bd735ae250667292552ea20397587e6f547ad5aa6
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
deleted file mode 100644
index c70be9f4ebe4..000000000000
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
-HOMEPAGE="https://github.com/phar-io/manifest"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples"
-
-S="${WORKDIR}/manifest-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	dev-php/phar-io-version
-	dev-lang/php:*[phar]"
-
-src_install() {
-	insinto /usr/share/php/PharIo/Manifest
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-	dodoc README.md
-	use examples && dodoc -r examples
-}
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
index 7287044db582..ce651fab76f1 100644
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
 HOMEPAGE="https://github.com/phar-io/manifest"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
index 08f7d516624d..8dc68abf7dbe 100644
--- a/dev-php/phar-io-version/Manifest
+++ b/dev-php/phar-io-version/Manifest
@@ -1,6 +1,4 @@
 AUX autoload.php 168 BLAKE2B 8a0af6dc727f5f2fb7d43beda5e7d83bf5879117b4017ca3467d7f5da2e76dd50e58260ee0c3dd043a2da04693cca0fde4f1124aab317ef52cbc3855bd305683 SHA512 d02b31090ab4b2efe92ed0243c4a877a4a0731fc65fc7dd688087b08b3ced80c33570d9f081829354b35612e80b22f28df14cb35faad7466f925aa1c523f7404
-DIST phar-io-version-1.0.1.tar.gz 8686 BLAKE2B 2cb7208f24ebce981b1b487170d8f07fd43c6dc53782e2797c3172736255e29863aa832d8e63f59e9f941fc154a1e3ebc6452437641f92521f84ddfdf2d3e6ec SHA512 c3bd6e7426bbac99c2b7028d86429f954daafebb7aea3c969305035ce5fc98c3d718f34efbf36658442bb4f60518dbb8217c314f2a3afd429e037120cc7428d9
 DIST phar-io-version-2.0.1.tar.gz 10348 BLAKE2B 22a4f8426c14662781534e63ddb62e4e783fe563ae061c0c3ae87960e0c649d68adff9b19e4388e9aafc52184aa273e8ecc5df08f16e0918258a2a4862950181 SHA512 068d872ecafc3491c7cd27068fa2b35cf1d7e3abe21649677c935e897b6582d2efcdcbcef71a00f3b9b416320f6139c671411821ad41e3b7c906fac5288646ec
-EBUILD phar-io-version-1.0.1.ebuild 608 BLAKE2B 59c9d1d45bef023a078b225e84ad17a3a32d199899c81088b354d0a394055438b7530ec80585e35f59bd5ba98969d84c1767ec6299e7b2b0386c04220a296259 SHA512 c2f2592d011a7d051c5cd4a1734dbd421e64107451122f0e5d83b1211bb931ed15a54fdbed88b0e596de0458c9d1a065fcf573492e6e49affb5061ed7aa2b9b5
-EBUILD phar-io-version-2.0.1.ebuild 607 BLAKE2B 3729ba9e94b308c9d940a3e937526999e356d96d1df2382bcd9bffd7c29cb9adda6a4df23c46849d80b17952c1a8ab6916554615f2c8be901f490d188c7ce93c SHA512 ecc2b481c38c461ab58debfd4a8df4707df2b2e3eacc008e21d04f3c0c62b2dcad2be4f3d1147297ff72d7244f036f360148e62b9650f269a09287dfca034ab9
+EBUILD phar-io-version-2.0.1.ebuild 630 BLAKE2B 55fa6b9e180a6e111dae3fa9a9ba06d782d65b1105992b5cd477572a947226056cf84fdad5d1160239fde8c61d43dba1d4d9738f134257d9426d659e2c22d37d SHA512 4cc0a93141c83b4230ae37c52276e6115dd0101a34d7c9ab6d82add69a4022a733afd7a7b364bac444ab17c355e2d278e7d14f721c8209be1692014e56c7fb90
 MISC metadata.xml 319 BLAKE2B 7b19dcdee79f5b221681a56499a5b1a088bb6b8bb1b98d4c38a0d9c65212f26cc9fc8e830ed60eb077b9804b9d9d8cf3033ef809ebbb4de14b23507d8ca9e1c3 SHA512 c229ce6bba2b1abd6e744e26e8d9f4653ee53567d6eee13fb2b2b485db84963a121349fd9a26c5c89c63e52545605903a3d066bce5aed1ab17ed75d57bf96b11
diff --git a/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
deleted file mode 100644
index 6a4c90ec3d51..000000000000
--- a/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for handling version information and constraints"
-HOMEPAGE="https://github.com/phar-io/version"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/version-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	dev-lang/php:*"
-
-src_install() {
-	insinto /usr/share/php/PharIo/Version
-	doins src/*.php
-	doins "${FILESDIR}/autoload.php"
-	dodoc README.md
-}
diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
index 2a2ba341e417..c0576cc49ef8 100644
--- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+++ b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Library for handling version information and constraints"
 HOMEPAGE="https://github.com/phar-io/version"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
index e0dfda114890..283adf16631b 100644
--- a/dev-php/semver/Manifest
+++ b/dev-php/semver/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 251 BLAKE2B 6d0768402735be6031c510b158bf29c0bc38a7c59317319e7b3240275903ece9a24c6eecacdac60b7dcb41c8b06513972cc649f7a36064adf7be33e1fa25ab67 SHA512 acae828e0308a02338aa850f4ba68a8becf171e9ddc6d9d6d1f48dfe24b100b53cd7b5d42d723f69e4e19aded8fe36c86ea3172b5681b0d96ec9e1a9661460f1
 DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a61be7835af6da669d22ef15a2143551e96bd01926fd2b408736fd8e70df22e1364b80712dc7d65608889b27 SHA512 2e41e2e70e9e62b280bff40b1a05b3803d95fb088eb4ce395e1f1fed79a40efc3a0ad16f8506d83a81b0e1d08e069640b2b084cc91aeb1ed41d934fd18249fe2
-EBUILD semver-1.4.2.ebuild 630 BLAKE2B 7741098c8702cf362044f6b6726df614cc85521f82e3a392ab79e47061691205c22bd4c74bb58cf2330f000b45b47143949f312a351e082af75ce10e1a3d3a43 SHA512 83b91af48b58ba6ffa34b26c30c0291c76146fb3088ce76fa5ab93a5b13888037527961934e460d6433716c74a09b02f9393d70280627a713686b9341a0c0374
+EBUILD semver-1.4.2.ebuild 650 BLAKE2B 51835a3f2e3f7885b685b7d6e39a8974133d02952b774d5747c19ff5b2e02ccca0cfeb778ee5ff346829904bf26d09cd30f1d6c735c5e7fbf79c50cb78156907 SHA512 ffa8c080827f77ba52151a95612a979f882b99a61990fcad378b5a0783b50172f70f35b4def84ae1262e1292d2a0dba6ca407a88e3d49053247bfecae2e1fd68
 MISC metadata.xml 691 BLAKE2B d635ca9e1849cddd3377081ddd927fcb15d092728a624c408d17aa0a307751150212f1a4abacec0dc03618402f05cdd226f0cbbaea4b47d66141637f7d5c6aad SHA512 58d106fb2642c5445fcc487b818a7d0ddb21bf56d17455fd21cab83d9941437a4f339cdd192ca212645891bce3da01bf936e503b63665cf014d55ebe12b635d4
diff --git a/dev-php/semver/semver-1.4.2.ebuild b/dev-php/semver/semver-1.4.2.ebuild
index 21aed1b27903..98683b0d6256 100644
--- a/dev-php/semver/semver-1.4.2.ebuild
+++ b/dev-php/semver/semver-1.4.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
 HOMEPAGE="https://github.com/composer/semver"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index b5b0aa4889d7..6028abb2f020 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -7,7 +7,7 @@ DIST swoole-4.2.9.tgz 1220045 BLAKE2B 752d00ae6a61c0592f308fceff205be68f55eb9918
 EBUILD swoole-4.0.1.ebuild 1695 BLAKE2B 7720c6946b04a5c35c012187873a351919f02a4c9b8cf041b20f4777b57db65e8f2376a1cd121af0203d802227bedae046fd1aa3b3ea3c0fecc6c677f9f029ce SHA512 fa2a870086d261175ff9ed262bd3051a62bd12ba979a384d8fbfca121ba9cba74ffe55cf8f84c687eec4b449d57904d73232c637d87fb6cd5d42e7d1bff19ee5
 EBUILD swoole-4.0.4.ebuild 1818 BLAKE2B 94bfc9d9802443718edef78fdfa3b86375e822b6ee5983b97c3a001e04fd15ae42b94c7dfd12b8439f976a6c035ccf0f7055a21a44107c0cf1e50b7dede89aef SHA512 cd256d3486b92e544db3ecf8a55c994b0305c1be747c7cb1497977a6b9ae6c1a242ceb6978c5f7a57cdef2fe57c0f04af596df5a74049a56eb788a996b6c6bf9
 EBUILD swoole-4.1.1.ebuild 1947 BLAKE2B 1b1d9303354b30520a39e48713548324bfac21fb0393452a056ab69fd02e886d487cec5bd7fff7029426e7783aa4e23310b2f5ec526b0fa5898d0485fa4e98db SHA512 db7f7032d2ef33a1610c5fea8ba314616715f0ba8d2e0ba8cf7fbdc2a8139a96b89e1352dcc66abbbe1211ac9c6f154a9c108715c4fa3b5c839ff86407e08972
-EBUILD swoole-4.2.13.ebuild 1790 BLAKE2B b62f674244337d71acff0a1b92445032b7d9e8aa2e5223eb86299c85d1f84e53886b623ba79d06bad9037958d7b78d724647a707767fa9d07cbb4ff9bca0ca04 SHA512 aa3bfbfb0b318bec80b825ad88784cf459e36d4b7aba047940a17f99baabbb42f29665c471ae862e0c8e769ab08852b633ae3575e6fc6f48597ad46bd90c68fa
+EBUILD swoole-4.2.13.ebuild 1789 BLAKE2B 043b1bf3d91ef7f60c7a659c7c9ba0795bd3d8cbfdb8abab88e5ea78234368ce2c793684f18b537831c34ca02148c58e27b253794398470bb9ba8de4a8a4889c SHA512 ccba3090b0f05821e5c8784672c787545774e138b5ad94098be81d535158f551648c81dc790846106caa690417a3d7480c2f709e740dd3e5c8b2760f235e822a
 EBUILD swoole-4.2.3.ebuild 2025 BLAKE2B 0d9d150ca64a572d4e6a401dfa5196125bfb5a3026a7f5468fd0919d642b808612d7d96d3e21e928825b24f3e06861b0138a5a963defcac234473a6d82dfdae0 SHA512 e29ab7df2116ad30abcccdb45a7b225d35a97f6107b2aec6aa2a28837dbd0c4326842666ad5fa806ce8f63bb26cef22f1621cfe1b357659da3928e5fca2b8a9d
 EBUILD swoole-4.2.9.ebuild 1914 BLAKE2B a342c2377dfcaace8ad212c92b62a4cf69b4b7c126120a85ea9f511382debd3dbb567502421323012ee50e91f7f6eb9ff31c61605728a6d0295121a017be6408 SHA512 d6b82a342a95e29148e32fe8443507072ef4d55f3793e0c7ca0932d4d16e8a407582cc61f3a2ae1f25a18e924c3d8198d4642c8d258c236f0a1bae5df427d4f0
 MISC metadata.xml 424 BLAKE2B abaaecb73dd8caf77e25775dc2b3307efa430399d197b24f3ade567b93989108c70216949327677f5c9540e6aaafaf2f77d9af17b01f99de2ac6f04a95abb03b SHA512 52dc7ac48b61458b810ba467bbe5cfaeaef808ae7db72f58ba4ad4dd8723c7149995e43e94c8b4552e7dfc38cd1c3e627dd5c9854652ee656f421f345dd72471
diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild
index 3d197c664272..04aa2e40c373 100644
--- a/dev-php/swoole/swoole-4.2.13.ebuild
+++ b/dev-php/swoole/swoole-4.2.13.ebuild
@@ -44,7 +44,7 @@ IUSE="debug http2 libressl mysql sockets ssl"
 
 src_configure() {
 	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${EROOT}usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		--disable-coroutine-postgresql
@@ -52,7 +52,7 @@ src_configure() {
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT%/}/usr")
+		$(use_with ssl openssl-dir "${EROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
index d3a2ab8b3d44..5f4271aa9789 100644
--- a/dev-php/symfony-filesystem/Manifest
+++ b/dev-php/symfony-filesystem/Manifest
@@ -1,7 +1,4 @@
-AUX annotate-network-tests.patch 865 BLAKE2B ffe8e19500e00493496ab845ec8222356030f2f61167fff3158017d94887e5652a220deefb019b00a4b79d02b1bc027646da4ad775d6e319129d8038fb6d6758 SHA512 feebf037ca0040f828cbbb15c290045dc1f0c533fa418bbe81cc4f1cb2c8080af264982129203a4b2172a05920b8e807b32040f79d60fbc4144ef3fe8c09c436
 AUX autoload.php 280 BLAKE2B f482a272729d9e859d789f38b8ae9179c4e79132019e62c5ab2c215697a99f29f89b80d10cdeb2d3a8cbc130fc5ad15c32ee217c80c1e93390d730254c5e3815 SHA512 27642698b0f10e96c8fb3ba5619c8b230bc830140d87593c61351c43b1eddb10f82770b37899f305587c9187c673f4b8f889ead8d34926c02e99957620693a0a
-DIST symfony-filesystem-3.2.8.tar.gz 17361 BLAKE2B 8ce4fd987ee7e0609433de8428b849645a9c8372029e0a075d3070786441577c5413e1a2f13e1581afc90cb69fe04c2b64e75de3e23ea532dd7ffd63e2bd8ee2 SHA512 b9464dec0c5100877bb7178a118ab34e9893307df371e9a9f8df8d69e59b6e14c9f7143e4eaf5b47662f69dce1b5fa975b6bb78e93a5c7455eb44dacfaab82e8
 DIST symfony-filesystem-3.4.28.tar.gz 19238 BLAKE2B dcb9752a5691834aa87b3866b6c2f53b54d5953cf721547cf3ae8aa03e826bcacb2393f324bf9a767013a2daebcf9654c7ce18822ac40758d96b35b174b8ab6d SHA512 4a2e19bf6df69396e503e11112d9b37e9deaaba5eb4fa95857b7b19e1ce073462d2ca18442b6cc1c30021f925d0878f635aa9bc1c5de55318f0c521a291efcc8
-EBUILD symfony-filesystem-3.2.8.ebuild 981 BLAKE2B 5790c3d693827dcea588a70d4c0cf27b28b050101717170ce1ed8137f8c1bb4ad47c5f4b46d56cff31383cb399f0abd926dfe042ea8ca9a8e0e68c8bdcc721ec SHA512 87e695ed50eed4b9ce39db0a7357edefe935032134adb8f306b7ce02a14131da9e13484d5b0a9c0fb27cc33bab02fc6edf5317d85927424ab9005047cf93699f
-EBUILD symfony-filesystem-3.4.28.ebuild 860 BLAKE2B a93c4f6a5e6e8e0df1f644ad535b38802b528ae1af134749bd7257cb8ddcde6c1ec6858429009dd5b10a6e46eef64f38843ad99bf6799d65e77c6e44d687af6d SHA512 d8e180b18f9ddb36b77c5392b83ddb0e3fec3c125c0f09f5b9d642cb6de7872296d4acc306effe47efd5d77b8c9317bd6a8dac299cb056c814f7f864dfb195a5
+EBUILD symfony-filesystem-3.4.28.ebuild 913 BLAKE2B 391eac0cf1dd4052206b1c23adb2d4ba9135a208ed1aa3eff465df5e6b10afcfe904c13f5e00fb0c460c893bde234eb7de86a23966ca8bf0919e47dbd8ee4807 SHA512 5b83ca824b09e73e5c4e46b4aa5ea27fbad9266a36c95f92f775e2ae93bfbc62b4c71b8a383339bcd2a871aa924d732c91e7f557e2de7c94a13a43f5159eebac
 MISC metadata.xml 671 BLAKE2B 6bac5eae2bf1dcf6ee982be6ee6bddf3c3e0b767b6fc1920f2bc7d7bd3798f6b1567a4ee9fe79c7ebe704572b633d129ea7eef0828a481bfc19fe2d4ae3fc87d SHA512 bbc967795d3f2cac6bca2c94805e8e412cacf7a32699222b27f8f658c54363c1ab49cb0e68b2323ad7d8dd71a5983aeae5e2ad52e23759b3cf9f0ff8662d4e6c
diff --git a/dev-php/symfony-filesystem/files/annotate-network-tests.patch b/dev-php/symfony-filesystem/files/annotate-network-tests.patch
deleted file mode 100644
index 38c83753195f..000000000000
--- a/dev-php/symfony-filesystem/files/annotate-network-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cda6fa8801d04b149592c5789c0d060c4ca4e9db Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 3 May 2017 18:33:56 -0400
-Subject: [PATCH 1/1] Annotate the one network test as being a part of the
- "network" group.
-
----
- Tests/FilesystemTest.php | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
-index 1341392..a862fa8 100644
---- a/Tests/FilesystemTest.php
-+++ b/Tests/FilesystemTest.php
-@@ -156,6 +156,9 @@ class FilesystemTest extends FilesystemTestCase
-         $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
-     }
- 
-+    /**
-+     * @group network
-+     */
-     public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
-     {
-         $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
--- 
-2.10.2
-
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
deleted file mode 100644
index 942c49c4b135..000000000000
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Symfony Filesystem Component"
-HOMEPAGE="https://github.com/symfony/filesystem"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
-
-S="${WORKDIR}/filesystem-${PV}"
-
-# This patch is https://github.com/symfony/symfony/pull/22630
-PATCHES=( "${FILESDIR}/annotate-network-tests.patch" )
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Filesystem"
-	doins -r Exception
-	doins *.php "${FILESDIR}/autoload.php"
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}/autoload-test.php" \
-		--exclude-group network || die 'test suite failed'
-}
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
index 24314726ed60..f9398c26fd35 100644
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.28.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 DESCRIPTION="Symfony Filesystem Component"
 HOMEPAGE="https://github.com/symfony/filesystem"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"
diff --git a/dev-php/symfony-process/Manifest b/dev-php/symfony-process/Manifest
index 4e165a6764b9..2fc51974c640 100644
--- a/dev-php/symfony-process/Manifest
+++ b/dev-php/symfony-process/Manifest
@@ -1,6 +1,4 @@
 AUX autoload.php 305 BLAKE2B 2f3deeaeeea219b68e90d366779152d17ce734001f208d169c7e4b70cd1050a09225cd8a49b3028995862f6578a9cde3b9a4d4497598c2574f6ecc81db4ed5cf SHA512 339e20b7d5ea454a8d5dc25ebdd4690067f39966a985071fc584652b8df15c0513b2673107e6beee58c412e203f0fcef9915a93ffce6e62c78b3b5b6f3eb26bc
-DIST symfony-process-3.2.6.tar.gz 31684 BLAKE2B 5129b6a7a01c137b9468950b8da58674343131863283cd96f8afac6d0d86969a61a1effc7d59c3735e6370059fb4f53e084011c07b629bddbd153fb6394d3d15 SHA512 8fd7712b2f63a46b6dea0b6cb76825c1e4c7b6a33123fe0949fedec820e599ffe5175bac567e8b453be7964f8b070bc2a2b9554b102a33834dfdbe959a23a3d4
 DIST symfony-process-3.4.29.tar.gz 34684 BLAKE2B 87f79a17ac321b395a634f0b83a0d218c39a06f0b5b553904c1c00431ffaf94f7bd26aa015cd426f5ba7726f09328b4b1d4475f4f8c229eedc1d52fc3f0142c1 SHA512 9e19406cad79f51d4ec811460a762c3a5004679e53777ca37049f5d8eb73bc3b569e266bd11ecddfc42481d7f05a4850bd6901c3ec2dd1d398d5077cdbe2e0bd
-EBUILD symfony-process-3.2.6.ebuild 958 BLAKE2B b8acfee6ca46e709f856369d101fe222e20413fd9b7bb91df6bdfa4daa42db8bd4a4406d2111a9b0402ee968ad2d60608d0b5f9051531e98a24a6826d503ccaf SHA512 9cb72f33897c1a0b8da7a09da96c1ac5865b512ecabdee15ef44020254a2ed2172f04c414769329c40cccfaa762f8fcf2e07793296eb86d6513000aa63027cf7
-EBUILD symfony-process-3.4.29.ebuild 957 BLAKE2B 3da92e098db1ef067f6d0a1ba7d0d271b3d9bad96f3c73384d4d083a83fac382246733e7271e0828b3f873a6762c0ef1865a3ca3648730112d847170179d5e8d SHA512 71bd63405e4215339753faa6870c2d6c360a2ff221150b22bd00036dbe699ca24a24b225e17ff0b3cc1206591f9ef18b89f60f88dbde01ce8b0387991b520903
+EBUILD symfony-process-3.4.29.ebuild 980 BLAKE2B 8c1858094e929565c68f17752abb7afce91f041848ac83df321fb0971f2af3c64afe4816b8ba1bbf38c49b2cd984e8ad2a8dc0a0afb114cbadc80e1db646cbf1 SHA512 d8ffa811b7f68ce0acce37fd7f1c4af08d8ff1ac9d9c1b4f1f19d7754b198e13f9b42e39bf236ea2d6c5c7dff3719fc5a4f023e5483d541cbcdba0a75cc03e8f
 MISC metadata.xml 656 BLAKE2B b24f6c06a9b8eafa0e4855d25d863bdb10e06a701937661cde7bcbf5d0bacec793c6e6aa4be7d2cab34f711e07e5432f987ff401dfa6e517ef14664c7fbe07fb SHA512 6018e74e6aa1b03d8723f33f38fc8855f1ba1d4316472d960f4a296748a7aa9a6282c51c243b0cac98148ec9a921545c8a1947d5f32f4f5853ead46c9bcf19a0
diff --git a/dev-php/symfony-process/symfony-process-3.2.6.ebuild b/dev-php/symfony-process/symfony-process-3.2.6.ebuild
deleted file mode 100644
index 03d09390cc59..000000000000
--- a/dev-php/symfony-process/symfony-process-3.2.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Symfony Process Component"
-HOMEPAGE="https://github.com/symfony/process"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/php:*
-	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
-
-S="${WORKDIR}/process-${PV}"
-
-src_prepare() {
-	default
-	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/php/Symfony/Component/Process"
-	doins -r Exception/ Pipes/ ExecutableFinder.php InputStream.php \
-	LICENSE PhpExecutableFinder.php PhpProcess.php ProcessBuilder.php \
-	Process.php ProcessUtils.php "${FILESDIR}"/autoload.php
-	dodoc README.md
-}
-
-src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
-}
diff --git a/dev-php/symfony-process/symfony-process-3.4.29.ebuild b/dev-php/symfony-process/symfony-process-3.4.29.ebuild
index 75fe9dd83fcc..27f884f7d553 100644
--- a/dev-php/symfony-process/symfony-process-3.4.29.ebuild
+++ b/dev-php/symfony-process/symfony-process-3.4.29.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Symfony Process Component"
 HOMEPAGE="https://github.com/symfony/process"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/symfony/process/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index d3cdbd2f72e6..e0b9630034b0 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 740 BLAKE2B 1776060d0cbd86a165e293cf24ba31c7c6eef748f7d34681d110f1f99f62909f6619f4917743a995c2c9f2edc5de99b5762d3997d09f14c66a6bfe3569f5e17a SHA512 23ec36f9afc24a4df46a866376db86727127351a1c6d9c16f864804ff31fe64c0c0c8a8306fb1a91fce0dd165cbf5fb02cbe545b4f00dc96bcff2dcce7a82b7c
 DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
-EBUILD theseer-tokenizer-1.1.0.ebuild 789 BLAKE2B 4ad456d6883e1b3341c203e042b98745c18ca2df690d32a3b04eba43b9912dadff15019937e2e0dad2d3a13166799487d6f5475fcb6f4cb98d81aa02a185534f SHA512 384095d3444136a3bda2ef0c91b159e626d92b177a4663ee8d8ddb1449cb2dad2689fbf54ffbead1b5bb608c77431e4337e51cc44774fb18d6cf3090fa02e932
+EBUILD theseer-tokenizer-1.1.0.ebuild 838 BLAKE2B 7330514a58ed439162ba8e4673ecf1bb9c2a754cd9279ee457b5667ba91222ca4bb79c756501e5cfcaf378e816931fffb80eb9242c36a3106d9498cb720a4f29 SHA512 45cf1d3481aeb6950dcac62c378c10af0ffcdbd6e0a412310008b0fa2095704adeca25e90c0e62f312f5b055ef368ef52c5f8ffbfeb6edf34511ff33f877ff45
 MISC metadata.xml 321 BLAKE2B c4c16164af66494e41a3bfe90f4943c905560440eaea9de1a4f82148e1cdc353f9b6871efb618af4ab7ddb8c9fa1dfd931e0610b79c41750744aa6e5dd70580d SHA512 75a4155fe11d88a9d1bde7d46f68954c175c2b8d89872bd53496f11ffd22aa4cbf9f487e36217522e7201aae85c089422a3c7bea3fdec21fc3048b20aad6e5a9
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
index 2f736a8e8645..dfed89b2df76 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
 HOMEPAGE="https://github.com/theseer/tokenizer"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/tokenizer-${PV}"
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /dev-php
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)