gentoo resync : 19.05.2018

4 files changed, 32 insertions, 2 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index ded29fe79bcd..e0127c33eb37 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 6832dc2f1684..4bff6325af6a 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -2,9 +2,9 @@ AUX pecl-http-gnutls.patch 1061 BLAKE2B f57588e2c8a7a285a68aab931e0df55cb69cb06c
 DIST pecl_http-2.6.0.tgz 217673 BLAKE2B a7147924cfc018c3e273d85666d9792ea614955d0aa20ac43171266d91d139dccdbf2472dec4d145b798ce99a541dba48f7bed6009fbdf2a7ad81ab322963788 SHA512 12d18049411a4133008449a1e7458a3055322dc337f421e0e2be126ec965f15b0189af6fccd9ca4537c48819c763b9e020906ac6d09d87ead92f4436fac595ad
 DIST pecl_http-3.1.0.tgz 214166 BLAKE2B 2f84fc9f5f7d465142e3482a9ee46b9dd80dd2b5ec58ad1d8d4fb18a665ebe70e4f872b8915c3a84484a3b1cd0709b39bf6170c6f1c6175aef7d43bac44aa3df SHA512 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea
 EBUILD pecl-http-2.6.0-r1.ebuild 1920 BLAKE2B 82a6059834c91e0128a8f37d22e69619bf8f40fe61251f4b7d577e68cd698eca0854f1e43e463420be008d63e35d0aa4dc2c30d391ddd47cfab60a758686af6c SHA512 027af36906cc4f2763a5b8328b5ce2b2705a2c62a86b30cf8f160965ef8a5635971cf7135adde5afe8a72a48abfc29f338b3cd442797a347e15cc9bb9faa64a1
-EBUILD pecl-http-2.6.0-r2.ebuild 1481 BLAKE2B 4670a5ca379f70a0a3a7705ff85507138c3f712fbaf15b7d863fb11777047ecacefc8619d129a54d4cbbf591be17611bd5f7198cdaddb6a0b551ac6fb0cfc4e9 SHA512 29820d84baee5ca972eed399d13323162533c3cc53434c4352a816841520122f628a76331e298ab709d09e9331b16175931dd7c1b4055383e4945139a7d0b66c
+EBUILD pecl-http-2.6.0-r2.ebuild 1903 BLAKE2B 6063b2a23da518f5806250798949951e3a8668cfd4bd0c517987e8d9f20ff6606f8f4e72c05d982233a095c1c43bd422057c028e35b75860ab4d5a74253f35b5 SHA512 913fe6b153f964e52389424158cbcb945227eae652597cb5e178256ea48410aaaf72fd15509a39fb074d7313a24ca324dde1808e831a3f677a4c3e471ec5b934
 EBUILD pecl-http-2.6.0.ebuild 1384 BLAKE2B 8731362ad89d7289d2c623cc49112727fc65737fed80c92e172b5618eecca4ff38ff49a798210b4b89925d333184135aabfdbb5a71fed76c2702d3267cda418f SHA512 56afa6c46fa8a95d5fa74dcc56527f82b51aaa01d187bb2cd21f8d8a135eb139635eb8a3f298beabd95e89e9c112dffe19a9f2e8ef34acf3dd4908c6d10ee6f1
 EBUILD pecl-http-3.1.0-r1.ebuild 2123 BLAKE2B a7b5367adac7f83908f8f4bd3efc828b64e570e87cf187e32a852d566c0bb34250cb08a7e91c729ba4f4210feb2d1a1da573faff04d56a8238f18d13ea3767be SHA512 e9d1bc26b6cb8eb453f8faf1520ee7fef6ec66780d3d9d81a5f787e244b04abdd9734a73f0c47ccd717ffea20a3511cc57651c4960299ced1636129ddd17d92e
-EBUILD pecl-http-3.1.0-r2.ebuild 1780 BLAKE2B 9a0605dc4e15f5f192665ce11ef94b3d49e490abe253dfdf97355bf7afe22a0ebc97e7fa91ad8e80bfb96a7e3dbef23469f0214c1caf9eb0cbc70f89ee7f0668 SHA512 aba97914178135909c6a31db5d49fd56b52c9140621e91bab1d28967f34c39e0e008a949a52d522c94e3dc8d9daf2a292c0fac2849cfad0d7a74b092c6469cd4
+EBUILD pecl-http-3.1.0-r2.ebuild 2352 BLAKE2B e1dd9f8daff81a591ae52ecbb2e1bd6a6374d17fdc6c68ff114b0c6b75ab39708b559e39d728bae485ece11e5f73e10049d300f558d5750c3f7c13c70ad93c7a SHA512 6eafd1b553d3d343835acbbd8096fb5ad61fe1a0eae606f1000e57cf3ff5b51d130d49ad53ee3fc9734e2871129c3578398abd000221436d0e3668c8acbac6bc
 EBUILD pecl-http-3.1.0.ebuild 1587 BLAKE2B 1347611d4ad7f0ce44ef23370797cb37faad0d6261527fe8c28d935d9920c94ee06905396be0122f68a2ae4541169d10e8600bea3691a7d82090b8131f2275ac SHA512 f5d7f29153359c1a4a6991165e42a674c086e544c37fbdc23e580e2a6714734acbccb15081eedf92be3df79a21298ad5ee81032b75278c5ffc2bbfc59b0c6215
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild b/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild
index 3a3e49cd8b34..63cfe3ff8054 100644
--- a/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild
+++ b/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild
@@ -53,6 +53,19 @@ src_install() {
 	fi
 }
 
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+			Makefile || die
+		NO_INTERACTION="yes" emake test
+		rm modules/propro.so modules/raphf.so || die
+	done
+}
+
 pkg_postinst() {
 	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
 	ewarn "Please review the documentation and update your code."
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
index 68af2db5ec80..9351232041c4 100644
--- a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
@@ -53,6 +53,23 @@ src_install() {
 	fi
 }
 
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+			Makefile || die
+		NO_INTERACTION="yes" emake test
+		# Clean up testing links
+		rm modules/propro.so modules/raphf.so || die
+	done
+}
+
 pkg_postinst() {
 	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
 	ewarn "Please review the documentation and update your code."