gentoo resync : 20.06.2021

8 files changed, 116 insertions, 6 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8c11ca51ebc2..409243ebb8cb 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index ed780f1e8033..2bd0d14b0f42 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,3 +1,5 @@
 DIST PHPMailer-6.4.1.tar.gz 98058 BLAKE2B 88b11e096be6a81591b2c68efb1fdc9a5ff0c384508939545c333f940a60949acb34db000ccd3ae9dbc4c5609f6d20006b7d08ad61bb96edf1d7f11b8091c236 SHA512 c702e53afec4a4c9cdb8757928883fcfd6ed5f2babc03466ca2a698e4e4535014407be5618e6dbcd69135f36f6f723fdee266f70fa6546563949d785f5db4f51
+DIST PHPMailer-6.5.0.tar.gz 99073 BLAKE2B dcb917233da29ab45305f7cf0405f9bb384bd4f98f062a74d94a168868d0cd92017e555bf8e7139130dd669e0a04917e3789c548b5165112d591aa403bfd56b8 SHA512 0632ec8b80c30393b00aebbadde7dd032eb2553232a100a74d69b6ed6465adf1eb3a4acca0aaf040665a978e7507aee9350b092336056ccb5306fbaea4640376
 EBUILD PHPMailer-6.4.1.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
+EBUILD PHPMailer-6.5.0.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-6.5.0.ebuild b/dev-php/PHPMailer/PHPMailer-6.5.0.ebuild
new file mode 100644
index 000000000000..48dc349297f3
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.5.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To help out the Composer children, the tests and examples are missing
+# from the release tarballs.
+IUSE="doc idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+	ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
+	)
+	!ssl? (
+		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
+		!idn? ( dev-lang/php:*[ctype,filter] )
+	)"
+BDEPEND="doc? ( dev-php/phpDocumentor )"
+
+src_prepare() {
+	default
+
+	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
+	# it early so that we don't generate documentation for it later on.
+	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
+}
+
+src_compile() {
+	if use doc; then
+		phpdoc --filename="src/*.php" \
+			--target="./html" \
+			--cache-folder="${T}" \
+			--title="${PN}" \
+			--sourcecode \
+			--force \
+			--progressbar \
+			|| die "failed to generate API documentation"
+	fi
+}
+
+src_install() {
+	# The PHPMailer class loads its language files
+	# using a relative path, so we need to keep the "src" here.
+	insinto "/usr/share/php/${PN}"
+	doins -r language src
+
+	dodoc README.md SECURITY.md
+	use doc && dodoc -r html/*
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "Upstream no longer provides an autoloader, so you will need"
+	elog "to include each source file (for example: PHPMailer.php,"
+	elog "Exception.php,...) that you need."
+}
diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
index 51f06ce8e786..d7f53447bc18 100644
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@@ -1,5 +1,5 @@
 DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2
-DIST dbase-7.1.0RC2.tgz 37029 BLAKE2B 93c011c428c4bc989481505fade25a6bd6f2841c32146b8efbaf67cbea4193b7362bf6dbb7dca382c607dd04f217f04dbdd529443e1b931f2149e7e32e30a6dd SHA512 dd3d0f67ffb1f8e8b7bd87f83f134d06cece225bcca52609e395771430d337632bbf1daff2a7db25dd163e3707db9ca2aaebace359c5f95a52debb1ceaefb379
+DIST dbase-7.1.0.tgz 36986 BLAKE2B d5baa2165f41afcfe4faee60565ee1003abe069e2fff0b84421926c3436e1af20fa1e6d7a8641d2984399328e76a1e0555572b766c9c1d938d82ed546b25a750 SHA512 3adf45dbaa183933761065d8320c556585878514684bb3e848b8fc4d9bbaa9808f74994b4c49f0e107c10baee4ab54eb5b85b721002873dc6c978332400fae4c
 EBUILD pecl-dbase-7.0.1.ebuild 337 BLAKE2B 7b6d332b6236fa1dac0cfe5fda5df822e3884d52a4126ff4e32a522a25f3160acc3202faa5045cc36364f1e061002a208dda611b0c3cc981a68533bbecc9f249 SHA512 6a7a4d56e2c6837f063e7d89ecc7e33221c5d9733f42d8040d377a02826795a22a8232a9efcf16de71c41c1742b606875c0811eefc024997739b2ffd8f035046
-EBUILD pecl-dbase-7.1.0_rc2.ebuild 449 BLAKE2B 08675baa273e22acaf3c9312c26fab6124b43bf9ee80c15912ce4a9fcb2f0838b3b191d7f6dca7da96ba150b07aea6c69d306e9206ab5d7f29b1f76d0d198f08 SHA512 bb7fa6ca50b40b4405f089d48370032a89de6ff0ad16896ae5a4ba53bc6e355d0418019d56714791ebff9bf3f5685dca4c402bc0e2481561f1f622c056a25df6
+EBUILD pecl-dbase-7.1.0.ebuild 449 BLAKE2B 6251218134646c01d0ac30ab5a864f4a433ab9a7d83d57d70685b72ed6616d6535280170f8985cc2da7c5750a08f3e6a0962f1445c6287dc7f6667ea7fc87783 SHA512 cfc3dc17edc7ffca87afa8e0115d035db28c5715718ad42adc4944af4566936af419ee2bf4ac6d4f8dead0b34f6668d78c566f31e1337a41d85f7a1eae5ff46a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild
index 86cf3a4e3909..b288ecca45e0 100644
--- a/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index cd9a933ca399..d204407cef92 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,5 @@
 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
-EBUILD pecl-imagick-3.4.4.ebuild 751 BLAKE2B 3c1ca71995a093d2bc7bc460193022f19145aea57ac264776c8b63daf0cd2bbe142a21dd3308c7d788a109e814549c4f5b517c16b174d2cb682c58942942aacb SHA512 4ba789a3e3a5428f93e2bd4b53eb32a1b7c8b23bd9ed6a50e4374d969c1243f73520cfcb054e0303b53f45a7f337a6dcbc0a63cb7c6fc47e305db448db20da57
+DIST imagick-3.5.0.tgz 300657 BLAKE2B 7cf2c34b84a10f451851493b27a33f7188da0ad53673589db494a6b1a9ae089c5b3e646de4f7b76c29ffb8cbe1c8154ebc8b69d61bc597b082d33778e8f3a18f SHA512 4176494797c78fee28fbf076ee67afe4a634703dd19fa2f727aeb6accc2d65a3fc6224c3131f25d3ac60b2e8d531da2cf76d35800d1f10071cf362067cf531ec
+EBUILD pecl-imagick-3.4.4.ebuild 756 BLAKE2B 454d515c41354657474a6cef529c09144a5d4c6485b2796691ddfbd6bb4cc1af3ca7cadae84e00c568f7c0e9139c24ff8e5f65db0afce6aaf53293cec8912015 SHA512 f39ceb78e5510351762a2f3c15808976d4ecb044476860b559a78b2bd0cb959cc0e9b213800f701f1e0f1ef1c0ba1da919787dc930696445212b25971b4426db
+EBUILD pecl-imagick-3.5.0.ebuild 863 BLAKE2B f32530e9e27ae8a11db644dbf2c232d28ebad9bc7c60237879c9980f4d2cc5256920dedd2a01fab822d96cf742bdf3a537d010d83729e73a191bcaa92a91cbdc SHA512 f909dd4b728049b76ec3c835dc2de58b4ddfb3c19276ccb3fd43f666cec17f1def25b15645798e0f7b6a0fa108ad552280957c5effb4298a245b79c5eb190425
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
index d89a60267eae..c2972c5a4363 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,6 +21,6 @@ RESTRICT="!test? ( test )"
 # https://github.com/mkoppanen/imagick#openmp
 RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
 DEPEND="${RDEPEND}
-	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,svg,truetype,xml] )"
+	test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] )"
 
 PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild
new file mode 100644
index 000000000000..b9df58ef938a
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="imagick"
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/Imagick/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+	test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] )"
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1"
+}