gentoo resync : 07.04.2018

3 files changed, 15 insertions, 62 deletions

diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 0bc6a73b7cdd..82e52dddb9fa 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,7 +1,5 @@
 DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
-DIST stomp-2.0.0.tgz 23422 BLAKE2B bff7aec9c59c0d812f00a8e6ba7beedb2c484b5b4337949c5463a97f8743f303633448706907eb076a1c1c40a0bc3911515f5236383444f387ec385631f1938b SHA512 f999762f842f19e920bca35175e65e20173c9ef5162eba3b79a7a2a70a52991c5d39f6d9dd6d9dfa081f1c2fb23e0dae5fa42224dcad4626666e5785076f1a12
 DIST stomp-2.0.1.tgz 23494 BLAKE2B 3e9f042ffa4a8f54a0746db638ade4bf75febad0359e398894714c6c4d4b6bbaee65cfa384c379d14387026219f02013c6dbb7faba62ae11b4231215be7310ad SHA512 61cfacbd96f1061dc869ede6c1ca0f7bceb6120b28cc4a78fabcbace54a66ba540faf41ef72747b8bcc6a4ef98e405daac04e82bd4e079d90293f030684b04d3
 EBUILD pecl-stomp-1.0.9-r1.ebuild 899 BLAKE2B edeab12f987c00ac202b5bcdf848757ec686b56d602e6761741ca7d703a2733e8e81704c7ca47ec8825c0305767b12175911563515b69fad567c9e6c3d429a3e SHA512 1b645c6e9e90ea33397e7c963f1551c9b369100e65b085229f3882ca6d6f9a341b1f224ccb399bf147f330fde6ba218ca20b192973b598a5b170fce80fe73d67
-EBUILD pecl-stomp-2.0.0-r1.ebuild 895 BLAKE2B 76d75e39fc00bdc46f543b28b4dd57b12aee6f19cc4bc0de4b175cb06693cf343151c3e3bf6628b35d08139f14061c00da0f3f5cf852fe6a49d14c5fa497f5dd SHA512 5dfdf66f63742e99621627998dacea5b4b2402b07897554cf7247639a5bd1d18f6c6cb05084022c8d153e66e7f3cda40f137b773a6292a114fcff04caac83751
-EBUILD pecl-stomp-2.0.1.ebuild 1009 BLAKE2B 4b36a0e7d9dabcb38ea2693be0f4fde1ac74624bacc80d4c60d918ad7e3a9406d4ea82013027ab264c6e875cad1f8f8a9f192d30eddfa9a904eda67873dc3e0c SHA512 6ddb73ac506c635ddaf072302fb5e8eaadd059b540fae0621831626e68923862bf3538d981fbc6c421a8d02b9852ba6d923cbb7f412d47aee33c807016015bbe
+EBUILD pecl-stomp-2.0.1-r1.ebuild 1206 BLAKE2B 4bf5f2d2003a7cd3799218dbfd4025c88fcecfff01ef365a75250aea5a35a7fe21beb7b0e060b4b01897c0bb0c685718902d817c68d60678e241d37dec11b62d SHA512 45d183ed424595af9de5a600e1fdcc9faf4246a2779b6d25040684c2bd6db0ff296a1e6677099350936dda1fe427822deb7bcb16574e5804b19fb4672d452bc9
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
deleted file mode 100644
index 67d853f1c4e4..000000000000
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0"
-PHP_EXT_NAME="stomp"
-DOCS=( CREDITS doc/classes.php doc/functions.php )
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to communicate with Stomp message brokers"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="examples ssl test"
-
-DEPEND="${DEPEND}
-	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
-"
-
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
-
-src_prepare() {
-	if use php_targets_php7-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-stomp
-		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	if use php_targets_php7-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
index a5a0477007f3..dc494fe74045 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.1.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 PHP_EXT_NAME="stomp"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -21,29 +21,32 @@ IUSE="examples ssl test"
 DEPEND="${DEPEND}
 	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
 	php_targets_php7-1? ( dev-lang/php:7.1[ssl?] )
+	php_targets_php7-2? ( dev-lang/php:7.1[ssl?] )
 "
 
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	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
+		default
 	fi
 }
 
 src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-stomp
-		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
-	)
-	php-ext-source-r3_src_configure
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-stomp
+			--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+		)
+		php-ext-source-r3_src_configure
+	fi
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }