gentoo resync : 22.06.2019

4 files changed, 18 insertions, 13 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f6f7cfe468b2..14fded623014 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 7d16117ec8ee..28067424e938 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,5 +1,5 @@
 DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
 DIST stomp-2.0.2.tgz 23609 BLAKE2B b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6 SHA512 577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4
-EBUILD pecl-stomp-1.0.9-r1.ebuild 899 BLAKE2B edeab12f987c00ac202b5bcdf848757ec686b56d602e6761741ca7d703a2733e8e81704c7ca47ec8825c0305767b12175911563515b69fad567c9e6c3d429a3e SHA512 1b645c6e9e90ea33397e7c963f1551c9b369100e65b085229f3882ca6d6f9a341b1f224ccb399bf147f330fde6ba218ca20b192973b598a5b170fce80fe73d67
-EBUILD pecl-stomp-2.0.2.ebuild 1346 BLAKE2B 6c2d3b5dd80460232f0e09953547d8d4eeef4b521a7ee6bf811620b0a94f2964589c22ae347df1bc79c2da0e19343364b592a31febd1a9ebaa353224fd36f0ba SHA512 bdf9c479e6cca49fe78689624bc57cc2a18f73c73ca9fb842524df07ba1fce2511d3d3ecd3071e0b0ae1d690cdc56166025651f07138429ca814060d1616e5ee
+EBUILD pecl-stomp-1.0.9-r1.ebuild 1005 BLAKE2B 98473ef5890ecf1951761b121bdc00f8358715c6de68775d46aa06216b34a49cef4803557d8a9e809fb04ccc94a30c27479d4e63743e17632a6a5a06a0a1ab1c SHA512 d25c2a4227b7e5276f0f57d3083e534dd39eba1fe32bf6e977ec4fd8ba9daa2240c4340135023a911d72d2077d0b6f17614719edb81ac86bd7687294ec2bd386
+EBUILD pecl-stomp-2.0.2.ebuild 1231 BLAKE2B 6a2e3ba8f0754c42516595abe56a7999f8335c1bc0a6b7b8cbb74056b630568963c08368489e996a5d27a8d7b834feed7570e6f9ed437e5246b3746cb26c68df SHA512 1eb0349aaf228a9ac60a5613f6b5fdc50da45338f0cd125b91f8a27f5f0625ebb826908bb5cd84d36f9331cda2a7a443814f1569054bbda971bf46376e5fde8c
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
index 8349a99f9a6c..d8aef480451f 100644
--- a/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_PHP="php5-6 php7-0"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 PHP_EXT_NAME="stomp"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
@@ -23,7 +23,11 @@ DEPEND="${DEPEND}
 "
 
 RDEPEND="${DEPEND}"
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-stomp:7 )"
+PDEPEND="
+	php_targets_php7-1? ( dev-php/pecl-stomp:7 )
+	php_targets_php7-2? ( dev-php/pecl-stomp:7 )
+	php_targets_php7-3? ( dev-php/pecl-stomp:7 )
+"
 
 src_prepare() {
 	if use php_targets_php5-6 ; then
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
index a4649795c926..99522e6709c5 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 PHP_EXT_NAME="stomp"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -19,7 +19,6 @@ SLOT="7"
 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.2[ssl?] )
 	php_targets_php7-3? ( dev-lang/php:7.3[ssl?] )
@@ -28,8 +27,10 @@ DEPEND="${DEPEND}
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
 
+DEPEND="virtual/pkgconfig ${DEPEND}"
+
 src_prepare() {
-	if use php_targets_php7-0 || 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 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default
@@ -37,17 +38,17 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || 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 ; then
 		local PHP_EXT_ECONF_ARGS=(
 			--enable-stomp
-			--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+			--with-openssl-dir=$(usex ssl yes no)
 		)
 		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 || use php_targets_php7-3 ; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }