gentoo resync : 03.11.2019

4 files changed, 10 insertions, 47 deletions

diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
index db2db346b9f6..1aad80263894 100644
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@@ -1,9 +1,4 @@
-DIST amqp-1.8.0.tgz 91850 BLAKE2B 35a0f44ce770f3d20adcbacf7a6bfd014014f1a09c2bb006e9e50c6f8f97f6d564f5db5adf0d3bceb08611d1cf3f7a95f5e6256977ed1ed134791c92a01addf6 SHA512 a70873e2f9ad47c2e6b028727e98888746e1eee8bb1007c7272e422f14527ee3e980c6ffc9a94671c548082c380cee4d9a27ac5c4adce382fdcf9251ac6eb7c7
-DIST amqp-1.9.0.tgz 98248 BLAKE2B 2bf13a72eedb0d46bfba3c5d2ec01d1a85cfd60b2dadfaa8e0475eda52ee6650f8757d7521f808043464f3a32a33e4143153136f08f9c4484316ca06785b5888 SHA512 ce77266d9c95d87c7ddf177c531540e05f9120417e645f4595f204fad2d2ecd9f388f0e1e55d69bee845333b5b5976960cc2a603ea6860708df1eafe0aef9a10
-DIST amqp-1.9.3.tgz 101342 BLAKE2B 1e9702cfd44035fe8c923cd2766ce49309310da11655e96246133bb7d8f686a661703f5c35053c19dc607a1c6d1afe515c87ceeecc1cdf93acfa6b211c6802bd SHA512 d4731ed5dc760a01621889e8518b5d1258a8335f701d241c453fd553924d83507a0a918b9733e249955fa11b43a1bdacf65c1f1cb55b8ed3c5b661277f5798b9
 DIST amqp-1.9.4.tgz 102604 BLAKE2B 34bed57e2aa3044ac02949ef0d700af71114fc4dd0007ac7a90fadfe267063d8defd6f0e1fe076aa3680187035b1596c283f3cdab8b27f8d3e59f6abf7246147 SHA512 53f8893c2fdb6f41467c9af4a5e48810d39201150a94dd9d32f542d53387ef5e6d8c614ebe2d82b3ab9febd39aa8759a86975d0dc45092a2772f08cd86d7f739
-EBUILD pecl-amqp-1.8.0.ebuild 390 BLAKE2B 4a6296482369976da836abd21eeb3d355388d730da3e7a6f7bd8f55746056b39333e8d8c3e9ac0288e238cd4c9fc6d35bb197368c50939f7486e5bbee2148ce5 SHA512 59e3cf6333ea7dfde25c751b75712f32d9de236775b0200811d2f8abca5578d8b14efc6ce1d0fba38cdfc2a051adc00a67bba841b3c0cdde610d6b5c6f23c062
-EBUILD pecl-amqp-1.9.0.ebuild 422 BLAKE2B 4d713959aa6afdac77d96b81d618649979d6e72bc7f1cfec257eec6761f5fecbda54ce627780e7a6268955fbdf0d176f72accd1ad34df8c373215b7fa3f33fac SHA512 c5f2e59adf902b641ae36903cd176a1edd2ea8b9f8fb56088bfe3601f54bd8c13798beef54e59982e21c1501f4bf2c13cf2ab14571f574298251dbf092f318c9
-EBUILD pecl-amqp-1.9.3.ebuild 429 BLAKE2B 899db33ffe92861102573f58f52ecceb511c47e1a130aeb8c7f3f8f2b5694094c7b4bfa073be218b82032c1856a6d1b10ae4bf860e73b3271df23881764968e1 SHA512 3c61d7bc9e664b5de1b4a298e6c14d86b82b483462646371197f84d580c408cb1f0f626af3e9512eaec2a8a7384a398c53aaefd7744894a8f276e2c40f22afd6
+EBUILD pecl-amqp-1.9.4-r1.ebuild 557 BLAKE2B 69ca6ddcc1b11c1be8c308234d893a008e47d275c9a4257590b7652f4a92e470a712182dc6d2ad46600940eef99bf09de14fb1424f5fcdde5a414ecfc8008d92 SHA512 33ac64b9fa5c7226301c325951cbd81ae7b0104116ad12dd0637b62f74ffc59b5d8109570b3d979016106c32896077cffe369e8538e2f190091473a33b0698b2
 EBUILD pecl-amqp-1.9.4.ebuild 564 BLAKE2B 7092a15b6704faa24486692fe7417d6ffc86f6db4a24433751a4a2b8a69036889f099163f8bc28d3e1e8b937790ad04c3dbccd13cfef1ad38492b4922dba9b12 SHA512 013c096a1b851b3d4bf8f8f5c0eacc041698ebb4b4081f1035dff6ac801053fc2c4d2c95eb51fd21ee2d6ab5428685bb2e57ef5dd73556bbc5f0c32369a18744
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild
deleted file mode 100644
index 5960e89908b9..000000000000
--- a/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild
+++ /dev/null
@@ -1,18 +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 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-libs/rabbitmq-c-0.5.2 virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:="
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild
deleted file mode 100644
index 060b5164a62b..000000000000
--- a/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 php7-2"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild
index 20df124580cc..f60903763b86 100644
--- a/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild
+++ b/dev-php/pecl-amqp/pecl-amqp-1.9.4-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
+EAPI="7"
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -14,6 +14,11 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig"
+# Tests require running rabbitmq-server on localhost which requires epmd
+# which only accepts /var/run/epmd.pid as pidfile.
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
+DEPEND="${RDEPEND}"
 PHP_EXT_ECONF_ARGS=()