gentoo resync : 02.08.2019

9 files changed, 67 insertions, 89 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 32d5043e27a3..e4853aa9b685 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest
index cdc2d71a5522..6a7114699a6e 100644
--- a/dev-php/PEAR-HTML_Common2/Manifest
+++ b/dev-php/PEAR-HTML_Common2/Manifest
@@ -1,3 +1,5 @@
 DIST HTML_Common2-2.1.1.tgz 8664 BLAKE2B 2422d0d32f1ff55bf0e40cda5460d3e891cb9bc27001b8d72b7f52d43a2ed6ed2507593a780819550aa11b9aaff75b286995d013cf3e74051abb8700b9f96ac1 SHA512 3fc868c0c5d69a542d205cf853f8993fe6849eec58b35b080db44a7a788b19dfdc9cd669d269ddab70f37edcde763d1beff4c60f2befc2cf2548f63197634124
+DIST HTML_Common2-2.1.2.tgz 8579 BLAKE2B 43d71ca1010e3cb4d73f25417b601872485f9c8990cb3117d112a84f2eca67437687d423146c1f67f8053116d4aef04b4859982805c7009047a682385878dc8e SHA512 f6082e44578dfa063f4f1a896ea477c485122e3d2cc89764c16ee76c3153d60276cbc290b4f3b8c18536aaeffb6797b9c56b8b0f2ffe1ef953fe02a5fb32b864
 EBUILD PEAR-HTML_Common2-2.1.1.ebuild 425 BLAKE2B f7e96cde580f4fdfcaadd1f09b29d8e58b52cc2ba3b5ff2fa0c0883ac48ae90edfa1294aac32c283b369c192e50bf0bc6b119f612c131c4bc7b7e6fd2027cc7a SHA512 e8f6af67161d427842140359a5002ad059dad35857fdf905af35daa37ed37512c911656a519e6888b706ca468f8bfe3464efff19ab52c2e2b8ca7d250b3564cd
+EBUILD PEAR-HTML_Common2-2.1.2.ebuild 422 BLAKE2B 27a9003016c439990cf5d78a7ef4497d034e4303a710fd0ac9f89b24b331778a48c91d98c330b66df350d973061fa151f279cc9d8ae9a1390a7848878d4092e2 SHA512 b4c7598347fdb8103ff1f368b8bf1f90e302c3f270198714b59bae5f7be44038861e424519a6d468ec6d9e0c7f751d135ef5ad418b2a89b3e79851c65a90288e
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
new file mode 100644
index 000000000000..e03cc9eaca96
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+	phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 84fd25b4983e..b4f7de3f0586 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,7 +1,3 @@
-DIST adodb-5.20.12.tar.gz 464962 BLAKE2B 51b1bec4c9bda427988848cd0ff810058e159c75946ea4d14d1ab639545f0c95a8a1a2b8193c8c0403e37fc2e3b858f97b255b9b615b65786d1593269e9da731 SHA512 ac8f36dba459bac15f16ecfd1ece69edc922e67b6aec3641a0c8ffc50c6b1c437ecce2e5652c31f2e472f7abefb3ac5a8a2bef188959007442799784ab764c1e
-DIST adodb-5.20.13.tar.gz 465568 BLAKE2B 7acfe36586fcf0e0291ce9dd6446c6f0922b9c7144b86d8eb0d78db98247fc9ac6aa9b1623822628096c2be0e0e9c554e9c3acbc05d9ddcda1b5c598b8b3652b SHA512 0824de6abf73a8e3fbdde30ca1455264a49e3b711e81c8232bd82c082c0d3f255aea35a167685cd01e80216622db1167c17a518d57b1ed260eaa498cab0b9fca
-DIST adodb-5.20.9.tar.gz 464257 BLAKE2B 38a37e4a5b1ac86b37cbd164c79e2112c78fb22530a225d2cac4f916703d4c2bd300a47a214344d8ae9e5c94467ec34cab96ab36a10ad8dad581ec74c73ae111 SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f
-EBUILD adodb-5.20.12.ebuild 1455 BLAKE2B 9087e612637399203355a6213a9012c6b204818a67928abc2a6ef28bdae9f82c15d888690bbe8ebf6f65866029558c7740a38aac697531bc1f8709ad57e84511 SHA512 300defd6824492d2ca77da9528c07e3b0320220b6b7fb305dc586d56b4f60eabdf5614f25bb16f3cf9c2395d35008196f46e1f0fb4939149ff8359cad7e638d1
-EBUILD adodb-5.20.13.ebuild 1455 BLAKE2B 9087e612637399203355a6213a9012c6b204818a67928abc2a6ef28bdae9f82c15d888690bbe8ebf6f65866029558c7740a38aac697531bc1f8709ad57e84511 SHA512 300defd6824492d2ca77da9528c07e3b0320220b6b7fb305dc586d56b4f60eabdf5614f25bb16f3cf9c2395d35008196f46e1f0fb4939149ff8359cad7e638d1
-EBUILD adodb-5.20.9.ebuild 1443 BLAKE2B 6c0e8504d8e99042a95fdf9af07eeeea4bf9f3a3bd2e6ba156cd147eeda622fb9a71880f2e1ea19d01e82b7f44dd43adcdfdfb4ffe0b65ecde9aed02a21000c8 SHA512 258c809d092bc37c9e87e3501f3f95ce4ea85b8b1ac3e252b659a5834c831908ed1c61eebf7806486e3e3fd50c7799a596b9d495e896784fd8fd0c8906618540
+DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
+EBUILD adodb-5.20.14.ebuild 1443 BLAKE2B 08a0bc7762cc97a6d41cf4e0aece6398501b71aa3dcd447eb04a0208d8be710bb39a511e2bd51cbbc6dc4675dbda896bd52203bb4afec328ece9ce65fcdd1eb7 SHA512 14e9965d0cb36364c4065ffb04fade724ee301bf560a95ce5c8e2168901a43929399f2a27a5100588c9940f274c9881d6bfc2a2f2540698443f44107d36ccc00
 MISC metadata.xml 377 BLAKE2B 29889d626a5c0b8d16ae7cf02f45a0e6ebee2d633110a534bcc37c9539c4fc4b8ce15ecfd8ae3768b0f79ab34f088416b1bdb4403c7769f3c6e45477d0a2bf8d SHA512 f83ababfd8add084a2dcf96d74eadae96b35b5d71ea30a98a41b5ee3d222fcabcfb63607e4517be261bfa246d461684fd95b3bb01cb58464ff8f986d123aa23b
diff --git a/dev-php/adodb/adodb-5.20.13.ebuild b/dev-php/adodb/adodb-5.20.13.ebuild
deleted file mode 100644
index f6b55b30633b..000000000000
--- a/dev-php/adodb/adodb-5.20.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="https://github.com/ADOdb"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# If you want to be picky, we should require that PHP be built with at
-# least one database driver enabled; otherwise adodb isn't going to be
-# able to do anything. But, the database USE flags for dev-lang/php are
-# a mess. What we would *like* to do is have a set of USE flags for
-# adodb that then propagate to PHP itself... for example, adodb[mysql]
-# could require php[mysql]. To do that would require that we duplicate
-# the database USE flag mess for adodb -- not desirable. Instead we punt
-# and let the user install adodb unconditionally. If he doesn't have
-# database support in PHP, it just won't work.
-RDEPEND="dev-lang/php:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
-	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
-	DOCS+=" pear/readme.Auth.txt"
-
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
-
-	insinto "/usr/share/php/${PN}"
-	doins *.php
-	doins -r contrib datadict drivers lang pear perf replicate session xsl
-}
diff --git a/dev-php/adodb/adodb-5.20.12.ebuild b/dev-php/adodb/adodb-5.20.14.ebuild
index f6b55b30633b..32b3343fd7aa 100644
--- a/dev-php/adodb/adodb-5.20.12.ebuild
+++ b/dev-php/adodb/adodb-5.20.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="ADOdb"
 DESCRIPTION="Database abstraction layer for PHP"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # If you want to be picky, we should require that PHP be built with at
diff --git a/dev-php/adodb/adodb-5.20.9.ebuild b/dev-php/adodb/adodb-5.20.9.ebuild
deleted file mode 100644
index b37e311bd855..000000000000
--- a/dev-php/adodb/adodb-5.20.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="http://www.adodb.org/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# If you want to be picky, we should require that PHP be built with at
-# least one database driver enabled; otherwise adodb isn't going to be
-# able to do anything. But, the database USE flags for dev-lang/php are
-# a mess. What we would *like* to do is have a set of USE flags for
-# adodb that then propagate to PHP itself... for example, adodb[mysql]
-# could require php[mysql]. To do that would require that we duplicate
-# the database USE flag mess for adodb -- not desirable. Instead we punt
-# and let the user install adodb unconditionally. If he doesn't have
-# database support in PHP, it just won't work.
-RDEPEND="dev-lang/php:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
-	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
-	DOCS+=" pear/readme.Auth.txt"
-
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
-
-	insinto "/usr/share/php/${PN}"
-	doins *.php
-	doins -r contrib datadict drivers lang pear perf replicate session xsl
-}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index a87266a395d0..99680929680d 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,6 +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
 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
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
new file mode 100644
index 000000000000..62a5bf128339
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+COMMON_DEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+	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] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libbson-1.13.0
+	>=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${DEPEND}"
+BDEPEND="${COMMON_DEPEND}
+	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
+}