gentoo resync : 28.11.2020

6 files changed, 44 insertions, 44 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index a3a83475aac0..92c308412762 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
index 272e41da8397..3457937213f5 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1,5 +1,5 @@
 AUX pecl-zmq-1.1.3-php7-3-compatibility.patch 9970 BLAKE2B af8c1d546da1786bef6564b42afd731f0ceade8c2d425dfb5910748b4248cc910aa41f5f53fed7ab65394d7da201cc6d3a47b065e45f3f362c9968ab9b229f8f SHA512 d39ab0cce3397a851aa7662664e1f09fbd4096a4942e2172ed66d53292043f808c82d8f13ea8b5bf918ccdcdef9f254324b318e36150a6d76dfb7d051da3fed4
 DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
-EBUILD pecl-zmq-1.1.3-r2.ebuild 554 BLAKE2B 7f906248a6868171eb6dc9cc7a50d32a340e89196a144f3be64dd319b34e91c5a9347e6443efc46444b8a23e934a7285aa1acb27fe019cce91b5db1af24a2295 SHA512 24e98349bb38bac528aca8b0dfb001a3cd33e0b0367efa46bf7fe9a3adc94c0f41a3ac9ee8246ceef8e8554d3b9efaa3c865242106106369255960aeba52e580
-EBUILD pecl-zmq-9999.ebuild 568 BLAKE2B f39b8ea3e6860d110478e43b874de420c33540f56e7e27e8392dc7241b928a36d4e15793aae21f89cc393659d8b345a41ef206528a442c08ea61e0f9ac220572 SHA512 bbce32a61508df4c1800b4026969d02078a184aba50ae59e79c9bdb620f3cbc04590e6c8c63e72f355175a6dfd03474ae9589c2a9a360bfdf5ace9707bdef0e9
-MISC metadata.xml 314 BLAKE2B 91b4ef1c9615ad2dac01ed638378dc0de90a173047cab6f9ec0875bbd66b97c8c6442a305ef7ff9791a5ccc67ec789440a26b3e65b05b3b76052cb8ba06c39db SHA512 40085d291b0f504d6253df236db0e3d3a0886e9a49b39330130c9578e25290cb11aba524b383186ee72c60f2adb0cea18d27bf3523d7651ba5f711f5cc2b1853
+EBUILD pecl-zmq-1.1.3-r3.ebuild 583 BLAKE2B 73de5f99809b8e5420c17a3d06b14d8da6e6c10ed29c9060bd4d71914cbb4e13ea1b0cedaee6b7718d8e2550be5ea371ce2940301ae34713f484d6e9a5491a54 SHA512 f3fc9b751f1246f90e0fd5677ede257ed923025a5dac6dd6ec8a008fd4120353630c12ba914d752716ada37e895463a7e61fc308c5de6a5ff18e621c30ff5a82
+EBUILD pecl-zmq-9999.ebuild 517 BLAKE2B 4820c2473ed78d3063b1b55d4c17ad279c08da2d6124117808a274a849d5e94a84db96725190255a7fa671c1c9aea2b8dd24aa501b4d0ccfe1af5d37f9f32b52 SHA512 e7bf9dc42a8c4a44b41311ec156a1500a7e807e6c49d06d85a10f56a30e70aad8474f5a8b7794213c151d83d920c564d859efecedf701dd653afff95fc506779
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml
index 0a03180aed3b..b86acf66c756 100644
--- a/dev-php/pecl-zmq/metadata.xml
+++ b/dev-php/pecl-zmq/metadata.xml
@@ -5,7 +5,4 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
-	<use>
-		<flag name="czmq">Use the czmq high level bindings</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild
deleted file mode 100644
index 5e4b0582a2af..000000000000
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for ZeroMQ messaging"
-LICENSE="BSD"
-SLOT="0"
-IUSE="czmq"
-
-RDEPEND="net-libs/zeromq czmq? ( <net-libs/czmq-3:= )"
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-php7-3-compatibility.patch )
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..d183c65cd902
--- /dev/null
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-2 php7-3 php7-4"
+inherit php-ext-pecl-r3
+
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git"
+	EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP Bindings for ZeroMQ messaging"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/zeromq"
+RDEPEND="net-libs/zeromq:="
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.3-php7-3-compatibility.patch )
diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
index 945516fcd0c0..538ecc14c75d 100644
--- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@@ -4,23 +4,23 @@
 EAPI="7"
 
 USE_PHP="php7-2 php7-3 php7-4"
+inherit php-ext-pecl-r3
 
-inherit php-ext-pecl-r3 git-r3
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git"
+	EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
 
-KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="PHP Bindings for ZeroMQ messaging"
 LICENSE="BSD"
 SLOT="0"
-IUSE="czmq"
+IUSE=""
 
-RDEPEND="net-libs/zeromq czmq? ( net-libs/czmq:= )"
-DEPEND="${RDEPEND} virtual/pkgconfig"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git"
-EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
-	php-ext-source-r3_src_configure
-}
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/zeromq"
+RDEPEND="net-libs/zeromq:="