gentoo resync : 15.12.2019

3 files changed, 6 insertions, 47 deletions

diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
index 2480fee7f843..0f6239892a48 100644
--- a/dev-php/pecl-propro/Manifest
+++ b/dev-php/pecl-propro/Manifest
@@ -1,8 +1,6 @@
 DIST propro-1.0.2.tgz 13393 BLAKE2B c451ad6e1e0f93308497514de22a949dfbbea54e326c18688d6883aeb4d6adb920c42adfa458faf4c350755da72c1db06f77efc408fbc182fbb950e2f8b33302 SHA512 a4a3216d13c412051c063e0370c5f0badb65aa7054a43b0f6eb387a7a5fbbba1800b7f5f5113ba68ca8c7fe19932184a069864d1362239c71e0f55466c9cc8eb
-DIST propro-2.0.1.tgz 13399 BLAKE2B 88b099602ed19da96570c6b65981158d1f8f335470e6cd7afa517844a71258b04d9cb294bf91c15a23bbc016b303b2e42a2dea263808e0ed92905ba9ba47247f SHA512 c5a5f7c1fdf042d49597df789dc2b2e4e1512e7320a3a39cad344a9dfa3b9253b4a98d2f33e10e04ee608e5b8d1e1b50238787510db0a0f99d8f8b45b91c5c22
 DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145
 EBUILD pecl-propro-1.0.2-r1.ebuild 735 BLAKE2B 7dff63db99c42ef41175493c6b2a754ec2b5ced16ca5594161a0ddaa20317be54e00c08ae04fc16337582c79403986e84c395b1740a95930dc3e7344b0c96aa5 SHA512 1333f462b538f9cd7f2b3ed27a7c01741bff390fb63dcd94238c5af75d0ffc247fb1485fe2aaedb3e984f7fb01aba5cb68d59100e0e5d734f02ae1d090c40a43
 EBUILD pecl-propro-1.0.2-r2.ebuild 836 BLAKE2B c8be1849bebd99025649f1758ab1d12484b53b6f19b2b51a379fa11030bc208b8d1a2f78533eeafac1c9c0c3dc058f94ef339ba852146b52494600691a7bb093 SHA512 7df406dd15a07b47b449c70559f2645eecb65fe62f46b4528805b2e02eaff51444d37373ae30689ebd852583c0e04fd1e4acca36fdb5fc097f961271af01f0ed
-EBUILD pecl-propro-2.0.1-r1.ebuild 750 BLAKE2B 36855ce79ce527a94d0e7177e5c1ca98723078713be9351a8cb38364f0091988b11bfe96afe6d35bd7870fe268e1998c5c794b3206bf25ea38fc5033f674622c SHA512 842c94056e314877518f017231827f74bbaee853e1c69fbdd7e74a1092a196a07c174cfa1e36f7934b8f881573e5c7de859c3ef212fd1eb165ca74969d982f25
-EBUILD pecl-propro-2.1.0.ebuild 849 BLAKE2B 9b23c1403f62b889dabf371b576d7f9750b218aabaac63eb2fe4de86062b1584e76857dd92430b45f524fa572339576e609152c65c295e5eac82c673a334ec97 SHA512 02dfabc0f134382d9e91eaabc784b00476a95f5f4c5cea7b5d2e04271294602562510942710b559e7812b146bc83fcf723ef4081a2097a033aaf2463b79487eb
+EBUILD pecl-propro-2.1.0.ebuild 913 BLAKE2B 548b68c4786747befd8bfb143d7406851870afdee8df88217a7a37c849f20a139f258d5c5d01079c19bc759429c4aef441296edebabb2ed03322fae2569b35ac SHA512 f1b96c94504ef9a11951039ede5df4d4228b9a919e29da3192162aa1f99626c989f9228c6433e8073944dc1c514ad3d90c8c981f674d98b4a263d56195d4cf20
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild b/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild
deleted file mode 100644
index 4f22d4dce0c1..000000000000
--- a/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="propro"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# Only really build for 7.x
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable property proxy API for PHP"
-LICENSE="BSD-2"
-SLOT="7"
-IUSE=""
-
-RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
index ba645a7a2b18..cf9bab8e4729 100644
--- a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
+++ b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
@@ -9,14 +9,14 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-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.x
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="A reusable property proxy API for PHP"
 LICENSE="BSD-2"
@@ -26,7 +26,7 @@ IUSE=""
 RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
 
 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
@@ -34,7 +34,7 @@ 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
 }