gentoo resync : 22.10.2018

18 files changed, 115 insertions, 16 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 64232ab9eede..3e3facc19753 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
index 9dc05fcac2f5..f11a71482488 100644
--- a/dev-php/ming-php/Manifest
+++ b/dev-php/ming-php/Manifest
@@ -3,5 +3,5 @@ AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f38
 DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
 EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28
-EBUILD ming-php-0.4.8.ebuild 1390 BLAKE2B 902397fe190fe48d63687bc64e8951dbeb408da155f7a7da27aa57edbb232358323d1c36fe24c4aa10bc8307105a3ae9d7121de5aa8048e2f1c7b8d3a4bf0155 SHA512 2055cf88d133dfa890cbe9ece0d579c5a5259149270a91522620472c02b2d1905328fbbfd5be547afc9ef7c82621f34a281228d5dd7e270d9ed73f0d7a22ad59
+EBUILD ming-php-0.4.8.ebuild 1389 BLAKE2B 15f1769d2325610d9e6f4a9240d2d4026d38b150b5130550da120f79e80d5615c6ea6b1083bab8619af6295a37a6d73560a90f15851d5d6407d1a75d0ab55b98 SHA512 7930915098bc709c114488ea58b381eb3a638cb23bca18a9416bbf7792d32e9a1430f794b95400eaa07832ba6e87585e372de85390adcd007b7bd42ad7cf5055
 MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
index c9c148106640..2a52fa37106e 100644
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/ming"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 1c7954ea6fa1..6c532dd2def7 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -7,7 +7,7 @@ DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215
 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-5.1.12.ebuild 2098 BLAKE2B 97d552bdc1761e87d52e67d39fdff255bbdb6b568ce7d675af3cdc5fa4f4121585b62b94c512f9cf483969fc34b763193198b1236c3e8e290d538dc6d903c3c7 SHA512 bc1c9b72740a48fadfdb3299ed0277007fb2f1026c76bfae8a6e9006e84628a436e2de6d55e1d499d47ef7c641903a7fae8aab8244f9711cdb9651292d76d37b
+EBUILD pecl-apcu-5.1.12.ebuild 2094 BLAKE2B 4ffddcfef85ed487edb45462633875576a28ee2e1e1a437bd4019aba67e003a56d7de6e3214f102808e6b3a04d90717a5f79961caabba6d5627da6574d6358dc SHA512 534cc3793e3d6be2f15be3c0faf0e14d6791ad5a0d544641f16e0b72c05780aebab60f8217de8d5d594abaf0b1f275f15ac79a9cc2b8053f687f379863c8b484
 EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
 EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index 531e6e6b911d..fcbe122680b2 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index 53020437a2ed..d29c9ffd352a 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,5 +1,5 @@
 DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
 DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
 EBUILD pecl-apcu_bc-1.0.3-r1.ebuild 738 BLAKE2B 3a84093f3a30dc29947a13c78a2e8a0f05817789ae4f4ce57aaf86ad0f56d149613276168918d7c1ea2d85b5ce1283e7964243c3afa7b0cc6a1847a751c44030 SHA512 c82072c2bf7f501479cc92d379bcb53ed83e99b1da929feb1ca8a15455a01c3b48dd48f778641f091c76f13f12fe92c85a14175332f5e9a0a263a7ceb499f9fc
-EBUILD pecl-apcu_bc-1.0.4.ebuild 537 BLAKE2B a43ad349a6771bd5a295ef00fea28eeb4aea43627697b6e965f8a5cd9f5513efd298342ba98b90e515a5c0666d4a647e01316a8d2aa1c47edd1d141ee32ab6b7 SHA512 caf27a7b5a273f2058672aebce00a5b7214f8cd1914615a9cda0c905970738869ac20d4ead57619cbe19dbfda40ebf8bfe8595a34b92b57d34782e4f47433251
+EBUILD pecl-apcu_bc-1.0.4.ebuild 1155 BLAKE2B cb0c6cbc416d7e8276eaa96459ab41faf374f4f3fa1a5211f0ccb6128fb8534c265f3c4ffc7e0217dae3b5ee115e00857bf2c7994053e21b90fe62251d8d9db6 SHA512 e1eb65ae54350768149d4d6610e07b0a9237d78409d0d976a8319814204b1b8fdc05bdc78b5994f954322037d67f8bdcd9a88449bff9a914e6ffd3eb2e8925ad
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
index 6cb699b96c74..0725748dbc35 100644
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,9 +12,9 @@ DOCS=( README.md )
 
 USE_PHP="php7-0 php7-1 php7-2"
 
-inherit php-ext-pecl-r3
+inherit php-ext-pecl-r3 multilib
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DESCRIPTION="Provides APC backwards compatibility functions via APCu"
 LICENSE="PHP-3.01"
@@ -23,3 +23,22 @@ IUSE=""
 
 DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]"
 RDEPEND="${DEPEND}"
+
+src_test() {
+	# This fixed version is necessary to have apcu load
+	# from the install before the tested apc.
+	# It is intentional to specify phpoptions twice.
+	# This mimics the Makefile.
+	local slot phpoptions
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		ln -s "${EXT_DIR}/apcu$(get_libname)" \
+			"modules/" || die
+		phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules"
+			-d extension=apcu$(get_libname)
+			-d extension=apc$(get_libname)  )
+		NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \
+			"${PHPCLI}" "${phpoptions[@]}" \
+			run-tests.php "${phpoptions[@]}" || die
+	done
+}
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index 15b0b6bc309c..cb264dcb27f2 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -3,5 +3,5 @@ AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1
 AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44
 DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
 EBUILD pecl-crack-0.4-r6.ebuild 581 BLAKE2B 04f52129dce7e4ec373a17fd4a68b256981743d568723f428dbae41883e511ca8adad3dfd155ebd3f56feb04162b8cecde4b9619814a990ab50870be7fc9764e SHA512 7d305dc22b4972335d32906f25582b35bedaef94b0b9b53d69683f41f5f9c4011b6c5aa75f23f4f7b1eba5c8f277c77a8fc78b013669a7a96d0922e2bbdc0a27
-EBUILD pecl-crack-0.4-r7.ebuild 587 BLAKE2B b15100c8d1273f37af327015ea6af4560a107a9a1fe8b69e7396401b478bcc9274ee0da38ee72629291aae4285cc8dba7a39c84a5f1e551b9ead7c2ea1382448 SHA512 e2afea0e7690ac98679b2f19ebe0a636f34e0b0dff4ed44985acbc6d2807bde66ca34384da8c9d4f60dd0c81c2363abb9d7fc8156e638b8db725fb06e1b039a3
+EBUILD pecl-crack-0.4-r7.ebuild 585 BLAKE2B 29c477f8edd07f00f7f442ab27d674d877ed79630d47182b5b886580d3a9527025d011e6a236a63058e796f392a26692ae511c635aad0ff4f41877b9754de4ab SHA512 79a512e5d11dfc96587278bec8b2a3eddeb3298e8bbc0d97fd8e140cff54353be6f9ce77de635224f727f3e750368502ddda32d65c98f8151b1fc7b2eb05fc13
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
index 258b1f66c5f9..08d5e3ea1c16 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
@@ -13,7 +13,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries"
 LICENSE="PHP-3 CRACKLIB"
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 4aae39a0386e..93276c0fbbc6 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,6 +1,6 @@
 DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
 DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
 EBUILD pecl-mailparse-2.1.6-r4.ebuild 839 BLAKE2B 518ecef31d10faf97091c9c7e8cd13789d47b42ecafd7c75822c5e91a10fa2a952e48440503b5697a3581d3723ebb279e134e42b66284b017b2d11ab7341bdc8 SHA512 0ca4e958f293f3dbef2cbbbd08248a11f9eeadc971c5e5f940b56fc721aaa841ae143e4a60989e344307c5641e3e1266c771397f422e8f30074b0d0041e716c9
-EBUILD pecl-mailparse-3.0.2-r1.ebuild 1217 BLAKE2B f68fb5fcc84fa36088a404c2cd8b0134e81e7fd9ef502e82a1b6c8dc70d1a392385dce9dd696c72fd41da604632d51b371b49399aeb815e4abe38c0ea140ed76 SHA512 a7dfe604eda9b46a238f01f6de06ed59b75a0a3d3c323b2ae8268b2927ee0363d0f910dc0975be3d1600f52a5f1dc2ab62f6288e1024f04028960e4be694c4be
+EBUILD pecl-mailparse-3.0.2-r1.ebuild 1215 BLAKE2B e11ab31a74778d1228285c6b472e461650f0b81fc524e6e7977bf8b9c863cf98b7e04d86a94a52182511cafbcf06263b02fa16f44ca21b94b0eb81fabfbbdccd SHA512 fb3956912162485dfd720d83200d5789ef11f0bb9bba527da658e8fb555083c32c83b7879897f2471e98c784089671be7cafc625ea2f5d979821aa445ed15429
 EBUILD pecl-mailparse-3.0.2.ebuild 1070 BLAKE2B ed243cc104739cca574ff091ac1ff0722e7971a05cf9fb42cc5f6592d0f6363b1f73382cf61b3181e91c7bf7f441c702e946b787749b784648c4c8c548dd2f8a SHA512 69b0b8ded36c21069f5aa10244288526af79a3afb7b24044e1ac50fc7888158c7ca6e1d6cd247c207a3c0a43892d65ea6826f579acb74fe36f4a05ed05e13d11
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
index d9d400423ad0..7d86d5ec5871 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
@@ -16,7 +16,7 @@ inherit php-ext-pecl-r3
 # Only build for 7.x
 USE_PHP="php7-0 php7-1 php7-2"
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
new file mode 100644
index 000000000000..31b3bdaf80c8
--- /dev/null
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST mcrypt-1.0.1.tgz 33782 BLAKE2B db5f89fdbc64c81bd50c92301155527f40b28cd274312565c79327133baa20e14c488f8ad1f87e6ddfd3ced9706ca30f10dc69a08279c82c9ec83fb5f713e826 SHA512 1677202715499a41ac6999089257a059106e58cbac06ca8a7dd2e9edd28be5a4118234dd7468110e9e3d7f9de5d099367848fe84bcd06716ea56645c9015c578
+EBUILD pecl-mcrypt-1.0.1.ebuild 647 BLAKE2B 0003f92a3422b4727eff96664caae6e85fbb6b575cae2b4d3144aef86e3d4e7531c5a4dae828074fa7f988287b7a729c739c0ca8aab6aa744a5f6f657bfcc662 SHA512 e3f99a96ca617d71654571b2fea7454477cce1ea02f429298295e33819fa92429e006e863a7e64a9303357a78333457b42d30b9669f6e812a57bec3595a5cf3d
+MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/dev-php/pecl-mcrypt/metadata.xml b/dev-php/pecl-mcrypt/metadata.xml
new file mode 100644
index 000000000000..1b662aaef98c
--- /dev/null
+++ b/dev-php/pecl-mcrypt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
new file mode 100644
index 000000000000..133d25ed4e63
--- /dev/null
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mcrypt"
+USE_PHP="php7-2"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Bindings for the libmcrypt library"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libmcrypt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC'
+	sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die
+
+	php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 7f1f03a4bf16..654f7efeb0df 100644
--- a/dev-php/recaptcha/Manifest
+++ b/dev-php/recaptcha/Manifest
@@ -1,3 +1,5 @@
 DIST recaptcha-1.1.3.tar.gz 12909 BLAKE2B cbffb64148f3359f4d351089fde65d2b9c8136e0814b5f6aedb3cd9b7f7d3f8f77d9673059f3909b381cf9151ca34a31bb961fe8686bdda4612c718828e46036 SHA512 54e22654d3b24400e448260f1d075ba2586d33cf44e0a5187b5c1288705b29bf9de394f8ca48f7717a2480cb1ae21348cc63e724f1eb93f268407a942b13f9dd
+DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4
 EBUILD recaptcha-1.1.3.ebuild 919 BLAKE2B 8e8949018ab7f21addc45fe32ffff4cba9031d2045f0133e41024f39049b9a59d43f9c848b1dec9c3ab779b8aaa52727d15f5f355d6628dc8d6b95d6b69f4eb5 SHA512 87b6ea66c192985a3e9a6502cefd9e7710a7ba6545201bd2f26245db4577ddaa9511ba26f3e56a62309bf46cb7745c568022cbea967a40c6e2e2594a363a23ac
+EBUILD recaptcha-1.2.1.ebuild 933 BLAKE2B 0c82cb9aed9bb2129d49d3af983a3ba08e8df20421c94b436a33cc2d1e398e81305dd9ac25a42bbccded96efcb95776d95fa6a97c80dcb0622117133798c345b SHA512 2101b3495bc2a7b36b62ff9b932699c4dd74f71cf39d5de61e6068cc459c3b4db6ff5ef9c4f9c367b61aa809a012e51e5a3f655d171ccf6769c8552337da383f
 MISC metadata.xml 337 BLAKE2B f5bf73fb4a4f700d08f240f2f5fbf629322ab2f8db346085d09331b69958545dbbf53973a6f04d105edc070901b2cc82ee7800f6be134f159bd7b6587631119b SHA512 abbe5982149863ee6b21edcc5299238a1449ec2ff4088b86453ef4196a2903c1d6fe38cec785562904369944fc6231b463cc1c4914e3eba8e6744bbe2a8ed520
diff --git a/dev-php/recaptcha/recaptcha-1.2.1.ebuild b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
new file mode 100644
index 000000000000..867c4344a21b
--- /dev/null
+++ b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHP client library for Google's reCAPTCHA service"
+HOMEPAGE="https://github.com/google/recaptcha"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-lang/php"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_install(){
+	insinto "/usr/share/php/${PN}"
+	doins -r src/autoload.php src/ReCaptcha
+	dodoc CONTRIBUTING.md README.md
+	use examples && dodoc -r examples
+}
+
+src_test(){
+	phpunit || die "test suite failed"
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "To use it in a script, require('${PN}/autoload.php'),"
+	elog "and then use the ${PN} class normally. Most of the examples in"
+	elog "the documentation should work without further modification."
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index d770761367b1..d5892e43ddbf 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -11,5 +11,5 @@ EBUILD xdebug-2.5.0.ebuild 1039 BLAKE2B 297525d73effe294aee72c9505876c5b2d59c54e
 EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
 EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
 EBUILD xdebug-2.6.0.ebuild 1039 BLAKE2B 4f5ec55ab03c1dd13a259f1bac5038594793cf8e62b620b3db8d153c445bfd678190321220565ba012d1a6c03ff93fc86216405cacf6ecd42bef790ad4196cf7 SHA512 afeda7e2133f7ada6c06743ae4839219c5afbc980c08f90ec718846c9e3a41fe026aeb176aa94ffd7d5c978f5255fcb1942fee9cec746eacf0ac7eaf80f6156b
-EBUILD xdebug-2.6.1.ebuild 1046 BLAKE2B 2d278c4123f65cb08c8d0935be9952ca7b26cdc61b5bc39568354a27eb27922b416ccd61abfa3ef7c03388579a34d1a21b5a245a043c6d091473e2be48fb4d65 SHA512 2268b379acd23ed378df6a124f63b1a0dd7c8a820fdf9c54016fe881e0b207c30a3644de5f3986300deead6e429dc5b03f6b7146a4273864b2ba7ae5aa5f4f59
+EBUILD xdebug-2.6.1.ebuild 1036 BLAKE2B b6a2c5e3cd1d53a8b86c87429c2d3e75fdbe87ee110f970401b215e904aa42f21099a1ed797387c6c8631ddff6af789d200623bd6ea80a0a7a4a784c2585c5ad SHA512 05a747c280de622ae6141c130c04c5f478096a9adb57b6aeb7bc75c0c217e80acb07c9e7c6eb50a9de70adf909a8605595f1c23923ca6dbbab820e9edc72c9e7
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.6.1.ebuild b/dev-php/xdebug/xdebug-2.6.1.ebuild
index d25ad627eea4..6450d9968aa9 100644
--- a/dev-php/xdebug/xdebug-2.6.1.ebuild
+++ b/dev-php/xdebug/xdebug-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="2.6.0-xdebug.ini"
 
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-0 php7-1 php7-2"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"