gentoo resync : 15.12.2019

3 files changed, 4 insertions, 45 deletions

diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 19502fcd1051..cd583088b270 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,10 +1,8 @@
-DIST mongodb-1.3.3.tgz 925476 BLAKE2B 845abd4c7cf5dbb1fb3b04c5fc4070f0a360874ac566f1988025701258141a89afaa0e60c3d7166484fa37eda4ef08d94deeabdcc2ebe2a4f221dcf83aff20df SHA512 16c82ada278eac6996065d3c594237fbb8c1a7fe4e21828aa8af9ef98033cf6dfaf0fee90095e8116e946e620b551a6122238f85865a6c47d4d087f784cd54ea
 DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0
 DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
 DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641
-EBUILD pecl-mongodb-1.3.3.ebuild 956 BLAKE2B 7de929ccdb22c32bd99bf35d31a3e4d491092957472b7771b866ac3c17cce14ba3c3bb593d0fc395bef0ab7c079a32ff2ee89a049f33984d4b3628d2b3f87abe SHA512 571b4af8ec1da33375b4cf609d37982fa920cf9afa97bc8db79219e1a200f3f4035bafb0aaab2419b958c9831af2a88e32a06a613c8f10afec484f6a55d327e8
 EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
 EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
-EBUILD pecl-mongodb-1.6.0.ebuild 1408 BLAKE2B 99edc9e95c5c887a01d47a01339d5fd872aba201ed99a17be041b56a230344bc06d56e662087f56daaf3840465039861bd5acd5ebb6f29f53e925eabc13b3652 SHA512 128269890ed84b8bd68675384b3c918b7bb6c7ebfd9f845e768027093c5fb549470b7379d1577f69162a8064ea9ab20d59409ebe17fc308a8358240413875bfc
+EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623e17560a6964d27700dbccd13caee470e29005fc97b2b1c3c1e5b59b40c5a84bb8d399b8d4b6f4c43db6bc972314675 SHA512 b185eb19982a9acd6a49b9be5f33da6106ba452d9402bd4b514f56eabcfc63637e111bfe4d0042483f826a4d5a8fb71714c900b9f398ab4c1d0611643bfdfc5a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
deleted file mode 100644
index ad063c40f913..000000000000
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl sasl"
-
-RDEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
-	php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
-	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
-	>=dev-libs/libbson-1.8.2
-	>=dev-libs/mongo-c-driver-1.8.2[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# pkgconfig needed if system libraries are used for bson and libmongoc
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-mongodb
-		--with-libbson
-		--with-libmongoc
-		--with-mongodb-sasl=$(usex sasl)
-	)
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
index 18b9f1a79d6d..6dc6dd1ed288 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PHP_EXT_NAME="mongodb"
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -18,7 +18,8 @@ IUSE="libressl sasl test"
 PHP_DEPEND="
 	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
 	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
-	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )"
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
 COMMON_DEPEND="${PHP_DEPEND}
 	>=dev-libs/libbson-1.15.1
 	>=dev-libs/mongo-c-driver-1.15.1[sasl?,ssl]
@@ -46,7 +47,6 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-# FEATURES="test" emerge dev-php/pecl-mongodb
 src_test() {
 	local PORT=27017
 	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \