gentoo resync : 31.01.2018

4 files changed, 84 insertions, 20 deletions

diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
index 48886b58aa42..f62be118b878 100644
--- a/dev-php/pecl-propro/Manifest
+++ b/dev-php/pecl-propro/Manifest
@@ -1,6 +1,7 @@
 DIST propro-1.0.2.tgz 13393 BLAKE2B c451ad6e1e0f93308497514de22a949dfbbea54e326c18688d6883aeb4d6adb920c42adfa458faf4c350755da72c1db06f77efc408fbc182fbb950e2f8b33302 SHA512 a4a3216d13c412051c063e0370c5f0badb65aa7054a43b0f6eb387a7a5fbbba1800b7f5f5113ba68ca8c7fe19932184a069864d1362239c71e0f55466c9cc8eb
 DIST propro-2.0.1.tgz 13399 BLAKE2B 88b099602ed19da96570c6b65981158d1f8f335470e6cd7afa517844a71258b04d9cb294bf91c15a23bbc016b303b2e42a2dea263808e0ed92905ba9ba47247f SHA512 c5a5f7c1fdf042d49597df789dc2b2e4e1512e7320a3a39cad344a9dfa3b9253b4a98d2f33e10e04ee608e5b8d1e1b50238787510db0a0f99d8f8b45b91c5c22
 EBUILD pecl-propro-1.0.2-r1.ebuild 735 BLAKE2B 7dff63db99c42ef41175493c6b2a754ec2b5ced16ca5594161a0ddaa20317be54e00c08ae04fc16337582c79403986e84c395b1740a95930dc3e7344b0c96aa5 SHA512 1333f462b538f9cd7f2b3ed27a7c01741bff390fb63dcd94238c5af75d0ffc247fb1485fe2aaedb3e984f7fb01aba5cb68d59100e0e5d734f02ae1d090c40a43
-EBUILD pecl-propro-1.0.2.ebuild 331 BLAKE2B 58ce1e92c283d6e847c07fedc4ed8c41bd82064914a64112c63e271e94be159a1cd5161037437de1e5b0b07afbe8df59aaff81a079e63d67d836c35ef86f9da7 SHA512 ac21373a8dc6fc7ef04c7f8ba3c385694465a9c5a9238aa1ffc62a2cf4bd85030dfc45ddcfa1a968f00271985539a7fc6dd190669de03f1acf0a71166d6938d9
+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.0.1-r2.ebuild 852 BLAKE2B 072d8c80981db40997b5d4e40ca603e3ff186320bb6258ae0d292796888319fa1fcfa8d6579f79fc889fbc56a51c8744e8007c5f2997e0568f923548b00d01c6 SHA512 8fd7d2ce6e863450466cbb99cde4f25e1f5b74428b3513056d31caa29b1063e19d921ed99909fc08fd2fe382cda444aadab81550b8c2ec046fb3eb7910a72674
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild b/dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..1f4ad87e5332
--- /dev/null
+++ b/dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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=""
+PHP_INI_NAME="30-propro"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, property proxy API for PHP"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+PDEPEND="
+	php_targets_php7-0? ( dev-php/pecl-propro:7[php_targets_php7-0] )
+	php_targets_php7-1? ( dev-php/pecl-propro:7[php_targets_php7-1] )
+	php_targets_php7-2? ( dev-php/pecl-propro:7[php_targets_php7-2] )"
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-propro/pecl-propro-1.0.2.ebuild b/dev-php/pecl-propro/pecl-propro-1.0.2.ebuild
deleted file mode 100644
index f4b800157a30..000000000000
--- a/dev-php/pecl-propro/pecl-propro-1.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 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"
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable, property proxy API for PHP"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
diff --git a/dev-php/pecl-propro/pecl-propro-2.0.1-r2.ebuild b/dev-php/pecl-propro/pecl-propro-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..1c8c99bad920
--- /dev/null
+++ b/dev-php/pecl-propro/pecl-propro-2.0.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 7.x
+USE_PHP="php7-0 php7-1 php7-2"
+
+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 || use php_targets_php7-2 ; 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 || use php_targets_php7-2 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}