gentoo resync : 15.12.2019

3 files changed, 13 insertions, 38 deletions

diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index 663740d4eae3..1b0d296d10d5 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1,8 +1,6 @@
 DIST ps-1.3.7.tgz 634024 BLAKE2B 8007922cf4ed8c98fbf9524f66deda7136e2e5788f60e4647253545091cc30c4ee3a7de30adb06b470d18d96874afc58d5251c9342e9aa7db0491fa3daeac269 SHA512 cec6ecad27d35787a92453482f0e45fdcfe4bf79aab9cf1f7f6bc4468cf626343ed2b33d52d2ec48302a2ede9ecca3b397fb2d56fbc088997f39014f3dc47770
-DIST ps-1.4.0.tgz 634272 BLAKE2B 07928ac1ea77c3d634496e0a4e6e434b51b9d9938a40b9eb54622ade97c0cd8bb2197e5d544c9051d726a3cb51f67a43f4047974f588361734688fb6c1f12c92 SHA512 c268bc8d675d7082690d892448a458d69234b504b3be2408d2744224c356e7444fe1320af1256b974a2ee0fd6e0eca48fe0fa633b1df84da2e9532cd953bc306
 DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
 EBUILD pecl-ps-1.3.7-r1.ebuild 360 BLAKE2B eaec0c769677b48b4676606004b950f477b0c4b6d208111bffcceb9b785bad45c9a1a6e316e286bd8cf464f96925ef1f9fd8b1a9b9b3b3b53f05232249d8b232 SHA512 60096699ced3e3b021827c5e0c866b8466ad21a99daa72028e5191d06353081e6ee338869bfa3aabb05972155fa1f85592ee994ead0144c21b62c7ffeea84149
 EBUILD pecl-ps-1.3.7-r2.ebuild 878 BLAKE2B 2db2c23d2c933d2e48872dd1799e06ccf08bb1702c4149390a71c6b09e5c4284803df36cbf6f47768234f14c1b0ed2472f4352db4f5c0626849fe9f2d1baeacf SHA512 c5b73568c4aae62ea5a46d936ba40a93062cfc2ff8d9b02e937091256d2d2d28d65a9d829c0a1ce6ce64a26aa340792042dabcafe68c71ab310c27a69ee7488b
-EBUILD pecl-ps-1.4.0.ebuild 614 BLAKE2B 8279b0d1eb3c38107771e49b130600c2d3dad22060878b8d287677dbd8db56f43739673fdf88579e558103ea55bfb3bbbe70ed2cf14990698a73c185545efa01 SHA512 b0ceba0358fbf105ecaed96ff76e69cdba3014511af83f9dfd8791e714b6a775b9d01d98ae4087f8ed4042265b9b9f2cf2f75f7a2a0c2902e54f8b6531be00b8
-EBUILD pecl-ps-1.4.1.ebuild 936 BLAKE2B 9bd57a944f991c6bad2d41171b2f89e257db0bb199057cfccdd12071823123fec5afd9fd6ee24c4e058fbef4b8c2ac4444d89ac454e31dcf8512eff80229e9bb SHA512 8433c6ff7dd4b20c6d148680171d351184b7c0d839abeff3f706916a21ebe24e95f69111ca20e2c083be55c555b842e691b96327bb1ebf2a2d4ff169ba3c2738
+EBUILD pecl-ps-1.4.1.ebuild 1259 BLAKE2B 80274d9d01ecf1ea502bf512e7ada18887fddba3fcd5f33a6ab82ccd6e495d7583bf8bab37d3290002f0b33476952c67df21a988f6776140620899263efe81b3 SHA512 bcb5b6ad87e547a0afe005f1fa46683a37c117d157fe5b2d77942948a9ea1410daaa846c7c34be6221667cbac28d94939603d97459823254c26c46ef97edf827
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild
deleted file mode 100644
index eed300a35e25..000000000000
--- a/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-0"
-
-inherit php-ext-pecl-r3
-
-# Only really build for 7.0
-USE_PHP="php7-0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for creating PostScript files"
-LICENSE="PHP-2.02"
-SLOT="7"
-IUSE="examples"
-
-DEPEND="dev-libs/pslib"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php7-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
index ed4909097c9b..fd04378b47c9 100644
--- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
+++ b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
@@ -4,12 +4,12 @@
 EAPI="7"
 
 PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
 # Only really build for >=7.0
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
@@ -22,12 +22,13 @@ DEPEND="
 	php_targets_php7-1? ( dev-libs/pslib )
 	php_targets_php7-2? ( dev-libs/pslib )
 	php_targets_php7-3? ( dev-libs/pslib )
+	php_targets_php7-4? ( dev-libs/pslib )
 "
 RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
 PHP_EXT_ECONF_ARGS=""
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -35,7 +36,14 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }
+
+src_test() {
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
+		# tests/004.phpt depends on set numeric format
+		LC_ALL=C php-ext-pecl-r3_src_test
+	fi
+}