gentoo resync : 07.04.2018

3 files changed, 58 insertions, 43 deletions

diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 52060f2ab5d6..1df13739c55b 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,5 +1,5 @@
 DIST rrd-1.1.3.tgz 19229 BLAKE2B 14bbc97ec52be8f1b99471380cc1408c81056841d932818681868e31badc1a0abefc0d155e594a05492b86b826f21b8dadb0a0dcb43313f48863c64fd8e88a71 SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
 EBUILD pecl-rrd-1.1.3-r2.ebuild 792 BLAKE2B 6ea7717d68feaf96d919f4d7e29cf10185588a29a687e068ae768555f340deb8bd93fad6111720248d8fb389fab95f6a8235af50736b54928067cbfd8f8dcdf8 SHA512 b00f02cc0ed6678df78eed5fd0a2417daf2423cf04a524429b1da116babc0baa2d45c90458ec26e71bbb5b843c1a86eee6b34ae410706f5e3fe85e4dd2580dfd
-EBUILD pecl-rrd-2.0.1-r2.ebuild 891 BLAKE2B b38a40b844bdd4199b9117e50a1113de9a0cffd66d7d59d1dc35b2778693f6f5abad8ee9ed7e09bb08e4bbb48a3a50a43a892690c522120a03930d41837db554 SHA512 f05bcb413e2442c372a65df296fb4d56f3cd15f7c9c112348ac7e4e25edef717c5a8b7fe4e3092b7ff5880753d7cb0c1c1cb594640db7296005b70ff3950bff2
+EBUILD pecl-rrd-2.0.1-r3.ebuild 1367 BLAKE2B 2ac6444ff160545e5ce4635337729ba95dc98304a70b22c9347d7fb0042b863c5af6f572391450ea2cff1cf965d24be122a23a3627a93f42d54bdb4374ab50a5 SHA512 7f5a17ce552a015eeb4a4ca9cb1d1203dff03ad49ce6f592e674a8eaf82d10e407cba1e0a7566d3178c720232686e8a60be06b78d3b504e3f943e0b95c7311b0
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
deleted file mode 100644
index 08528ee02abb..000000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define 5.6 here to have the {,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# But we really only build 7.0
-USE_PHP="php7-0 php7-1"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
-
-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_configure() {
-	local PHP_EXT_ECONF_ARGS=()
-	php-ext-source-r3_src_configure
-}
-
-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-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..8a4100b18f95
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define 5.6 here to have the {I,REQUIRED_}USE generated
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# But we really only build 7.0
+USE_PHP="php7-0 php7-1 php7-2"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
+
+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
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		local PHP_EXT_ECONF_ARGS=()
+		php-ext-source-r3_src_configure
+	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
+}
+
+src_test() {
+	local slot
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			# Prepare test data
+			emake -C tests/data all
+			NO_INTERACTION="yes" emake test
+		done
+	fi
+}