gentoo resync : 16.06.2019

12 files changed, 40 insertions, 122 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8eaecdc8f9cc..f6f7cfe468b2 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
index d33cdaf9c654..bc4ef935d354 100644
--- a/dev-php/PEAR-Crypt_CHAP/Manifest
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -1,4 +1,5 @@
 AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369
 DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95
 EBUILD PEAR-Crypt_CHAP-1.5.0-r2.ebuild 622 BLAKE2B ed1ea88d7b0c5ef28e69e91a324d4530b85ccf0c4027b8288671bbebc01b88b1e1199ad46f8a3a57f9fd85f55964dcdac27a31685022121e3a56ed7f6ccc42ce SHA512 d838be7e6f52bdfd184e5db76716b1cbf805fdd050eeaa35fedb6d0111eeeca6af71b3e08725ba328210483fb308d06f48d04a3f5a79ebf84ef20e7b289a9394
+EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 697 BLAKE2B 51a9e0e7b0a715f24c5c36638954e55c3e46eefec1cb1efe24d265ca01e1785cae3b52a4079b8cb54b555fb1ef526fe8d20ff38e4fd646ae3b92037d291de33b SHA512 a3edad84c783b669c9dad45e1a3ffa86719c435db60ea963d24cbfda60a94f67c750190582a1cbef930a17e93d3859f22410054ffd120c0150b0c317cc8f249d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
new file mode 100644
index 000000000000..2de834bff92b
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Generating CHAP packets"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+# Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
+RDEPEND="|| (  ( dev-php/pecl-mcrypt >=dev-lang/php-7.2:*[hash(+)] )
+		<dev-lang/php-7.2:*[crypt,hash]
+)"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+PATCHES=( "${FILESDIR}/CHAP-1.5.0-constructor.patch" )
+
+src_install() {
+	php-pear-r2_src_install
+	insinto /usr/share/php/Crypt
+	doins CHAP.php
+}
+
+src_test() {
+	pear run-tests tests/Crypt_CHAP.phpt || die
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index ae3d58b2fc9b..1fe3a2e08340 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,13 +1,5 @@
-DIST igbinary-2.0.5.tar.gz 183869 BLAKE2B 8bb56ff0213c77dbc17cf65962e23579935b2330ca2107b8e6e00461a486e60df4209c375e9f74d17bb0a745136fa776233b41cfc51ffb5e1dc1c8fdb4a8bbf2 SHA512 e0abae97b5a0c9ab30ea00a490294f18f91b66b728a05186167e15c0a631d4de82b8a24d370a0d58cf5552adde68dd1b3fe56e877d382fbbdac02cfc18e49063
-DIST igbinary-2.0.6.tar.gz 184889 BLAKE2B 7c07dc7b766ea395137c2cfffab6329f6fe5fc7e8ffb712474ef9c945319364b20ba4f8735aa776bc15b94c2cd815bba5c1a8b7c25c9715d706a6773f80082d8 SHA512 c9f76aedcfb5aace6b8a3c064410b099bf4563d99115ebfeb9c53a3dd18a48e5c44b99a04a2a75f5d114aa5a6d9030b6f2242502c6b3c9d273a6936f9fa410e6
-DIST igbinary-2.0.7.tar.gz 185004 BLAKE2B e95326a90f8226a3b01e8a7db960a950b47ac72af42b1a2c069fdab0bc8b524c52d36c283490e8123a28b21ebaff09c23ca6b1c0696d5d57548bbcaaae43d500 SHA512 1e17b53c39118e5f1e1808a0cf9ce9dce053ba84706670c6d4b2323e2aafd612df6a95b95b43344e4ecdc792c304c43aa8eab959fba0fee77b0a21d9ce3b2ffa
 DIST igbinary-2.0.8.tar.gz 189726 BLAKE2B c4691cda07095c3907fc1caf86b1ba5a066a4d3cc4ca7274b9c825e1dd299ec6240bd703152510428cff8b7ca59571bc478a8679033c6fb852e54bae697d3180 SHA512 0161e05b246a3b749213fffafd74265e337fc657ea5e1390507a48865e9434aa3ac7e73bd9d04bfef0d8ceeae222a95cb9490d4705ad2b4607b3eaf2d05962c6
-DIST igbinary-3.0.0.tar.gz 170793 BLAKE2B 525ec522988b60f212bf5753ac884bf758ed13f8aefe1439e3f7b8433eff2a909b8c87c71854fd906f89a95f3e2c8f28771bea50f4c1ad40177600b7288b292d SHA512 dadc0db995615928e0ddb908ee4da9bd6bfdd09b6509f3b1a4b8ce519a6ec68c852b8781f05481d23152dea3e15cff9c527c2e4a8beb69d680f89ae7054a1282
 DIST igbinary-3.0.1.tar.gz 170957 BLAKE2B 2250ef228b059d5d87615412ffae3242cd757df25dc9a1bfe2a4d1dc33a417a4389abb2ab613359537a6ee3947526caded0ec584049e3d42669532b4a930afc9 SHA512 4930670ecdc1796fa73184e8f12bf570f7b1a43cb422cede056ccd1ca28fc950b00a9418519c59a9c07e346a89153b6b105e873fcfccb1365d43d4abf98804da
-EBUILD igbinary-2.0.5.ebuild 584 BLAKE2B 6c928e2f63bc4af2255092a71c39e916db15b1ece4f1aa171719ad31a744231aedc099e938a66eaca37c9b936d607e060fb1ac19e0519c186c6988ae11a8ed23 SHA512 ae02b0f4099d8f65f796d60ccb11c8aa05b7d7218b6b7eae137229f5269d6168a0caea1e5215795cb12a1379442b7e7ac3ffff3dcb391154951a5da643aa285a
-EBUILD igbinary-2.0.6.ebuild 586 BLAKE2B 06ab30e3024877c2be0acb740bdedb378b8ffe84f3c03888a1bf4363b27faa9ce2fb30143dd9c1d33ad6dd90d2bb7ed9a13257a6179dd5cddd0a0aa9a4ab2a93 SHA512 b79d6efcca26e1d0d9f55af8bbc1e7eed3309dfcb081878a70f54fcf610065ae41ccecf0da72e2ecb61b36bbfd25d97848c1b51df9eeb977a003d71bb9e78f25
-EBUILD igbinary-2.0.7.ebuild 599 BLAKE2B 96eb591d71584c6b8c2cc56b258db4f59c4ca9a2df834b4af4db1b25a11a4e28ef3991c338ac3cf3f033b85d4ee6c60126d8f4d993b936846963b49617e8c23e SHA512 128bc5df0c7e708d9715aa036ee223b1bb4ce9a2330eac25340ebef3583dc4326df8c757c4a08cf54daa607171163fd344378061d5c87443e883a78cf690f8a3
-EBUILD igbinary-2.0.8.ebuild 595 BLAKE2B b0f67337c61a227c463bcf981825acbb05cd96351094659515b68caacce60182e88deabf82025a1d0713ad916a683ea3b4cba27ab2bc917bc2ebfffcb37caff8 SHA512 a1682369c1b776ca9c7f25292cce1706c8455801b0181d3438e06d5708aa890e6fdacd449aec4187ae591eb53218c67a7ce6b64f5edcdf01f9847a9bb798398c
-EBUILD igbinary-3.0.0.ebuild 582 BLAKE2B a796005fffd6db66a81e250168e1be8026eb739b3e9dfb85c19aee68c079a7331982df376dbe629236fa81655da0feea999fcca99d21f29fbd08a914d592a074 SHA512 4a1529d1c50c311fa7aa34aa14ad34fb36e54703e0588a13e0ff90b226561bdf04badd9eda4b1b366612ad2c9db70824bffbb3162c92aa1ea8e87c8235f47947
-EBUILD igbinary-3.0.1.ebuild 581 BLAKE2B 0d1c430b3df6d0ea2d8e1a1c9d3c139a741e75ad6ae370589bed02e5249588f19ecd54a5d0cf40f536101324a258e52132356f39296fd326810446ab13d0163e SHA512 58eddb834c16853a9060b85445ceb5a9219ede652a5ff5a3dc986d8e6d4bba9ec67ce18b3ea9be562605af0d57b650003bea9ce7025e577354c24397b041d09b
+EBUILD igbinary-2.0.8.ebuild 594 BLAKE2B f02be79165c82a0d047be04c6dbd3444e09cf6c936b8cbcbfe27a3e4ea47c4cb924c713148a0d1472ebf533823d33f2ab66874a1c962129233e2effbe6702de2 SHA512 9438e82b05b08b1b998fdefa084f1fbf30da0330fb8a4c61ff98a601b454d9a8daeac9597d8d6015ebeb57f6883b22c12feb89d9c43381f5997471eb16c49e6f
+EBUILD igbinary-3.0.1.ebuild 580 BLAKE2B 83b2a011041ed6519b749d12003056b91a99c7a16c918e9f39ff96b1dc3c22231f8ec36d5dc6babe8d83ec7640d97c80b35be3f595235c6e6537d2e047e11d19 SHA512 ca1c80f61cb14c4e07578a3bccbcd8dca0fec70879a56086ce2fcbb10c5564184bf13feb34b687303bacd44cc98362011876fc3a18f03f03b708f5b6c96080ab
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-2.0.5.ebuild b/dev-php/igbinary/igbinary-2.0.5.ebuild
deleted file mode 100644
index 7bb040ccb2de..000000000000
--- a/dev-php/igbinary/igbinary-2.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 ~arm x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/${PN}/${PN}"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-2.0.6.ebuild b/dev-php/igbinary/igbinary-2.0.6.ebuild
deleted file mode 100644
index 7421e044d58d..000000000000
--- a/dev-php/igbinary/igbinary-2.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/${PN}/${PN}"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-2.0.7.ebuild b/dev-php/igbinary/igbinary-2.0.7.ebuild
deleted file mode 100644
index 9ccd6f49840d..000000000000
--- a/dev-php/igbinary/igbinary-2.0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-2.0.8.ebuild b/dev-php/igbinary/igbinary-2.0.8.ebuild
index 863d70591ea0..526e9960947e 100644
--- a/dev-php/igbinary/igbinary-2.0.8.ebuild
+++ b/dev-php/igbinary/igbinary-2.0.8.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
diff --git a/dev-php/igbinary/igbinary-3.0.0.ebuild b/dev-php/igbinary/igbinary-3.0.0.ebuild
deleted file mode 100644
index d4b0a06b0119..000000000000
--- a/dev-php/igbinary/igbinary-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.0.1.ebuild b/dev-php/igbinary/igbinary-3.0.1.ebuild
index 5dd3c7a28384..c00d3b4866db 100644
--- a/dev-php/igbinary/igbinary-3.0.1.ebuild
+++ b/dev-php/igbinary/igbinary-3.0.1.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
diff --git a/dev-php/pecl-haru/Manifest b/dev-php/pecl-haru/Manifest
index 7beaea865cc9..f166f5a3bcc4 100644
--- a/dev-php/pecl-haru/Manifest
+++ b/dev-php/pecl-haru/Manifest
@@ -1,3 +1,3 @@
 DIST haru-1.0.4.tgz 27538 BLAKE2B 9a070e76c98dc59895d3dea97bdd703fd1bf103ff0f285dc28d5568f74fbf74dc0de76b7ab32ff981505f639037ff67aaad4b0f4732e08f5d3c8264fd7a5bce9 SHA512 75cb8ae200cd41372ac738f5a4ed57607e13d538e2c9a46236dc05b7d0283ed4d152478e12fdff81735a4acd914055ebd58ff937ea0ca0a80056f255217b04c0
-EBUILD pecl-haru-1.0.4-r2.ebuild 574 BLAKE2B 1d8046e2bd66739a89c74e1622b7703983f6603d603f17607015a3ebc8c7d0cfff6047c721d1caed80bb0498c17a2d9ae255f8588a7a8c3096f5dfcba8c3e95a SHA512 1e379a868e2bb4f537e596208a9e47479fe59749a64f4720d4a616f8b441099386ac53e279da90ada9600df3913995e950441cca1bae46f119161e200b3bcaef
+EBUILD pecl-haru-1.0.4-r3.ebuild 532 BLAKE2B a20dec56321614b7bcf417141e0504e002b598045b3e3dce33e5afa590a21a5fa220a10aa40ad943b25ca8f7990cd78d94b9666cb6fe80ecd6ac55e85db94ab8 SHA512 23471e487ea3312eb204d9193591c8c0404fd997d76452b9d8baf078c1f605c41e10f64996f13d011b0eaed0aca955614402a52f30d9d16a7face37edec27016
 MISC metadata.xml 372 BLAKE2B 3c879fc263286d0ed2e08861b809fde72d9be20dd92199c72ace37d963f588c9336232aecd8b937737850416f7053a2a8420b6f3b4ee9fe72e6b246e3e1e447c SHA512 0451f4f1a39d2b353470f3141ed3d1026d000eee29ea6f74655069993c9d2a0761865df148d1e0dc2239c6be3a0d580702dab49ac24d107df85c8aa0c7b2951c
diff --git a/dev-php/pecl-haru/pecl-haru-1.0.4-r2.ebuild b/dev-php/pecl-haru/pecl-haru-1.0.4-r3.ebuild
index 5b9771f7f0fb..44313c4831bb 100644
--- a/dev-php/pecl-haru/pecl-haru-1.0.4-r2.ebuild
+++ b/dev-php/pecl-haru/pecl-haru-1.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,16 +12,16 @@ DESCRIPTION="An interface to libharu, a PDF generator"
 LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="png zlib"
+IUSE=""
 
-DEPEND="media-libs/libharu[png?,zlib?]"
+DEPEND="media-libs/libharu[png(+),zlib(+)]"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	# config.m4 is broken checking paths, so we need to override it
 	local PHP_EXT_ECONF_ARGS=(
-		$(usex png '--with-png-dir=/usr' '')
-		$(usex zlib '--with-zlib-dir=/usr' '')
+		--with-png-dir=/usr
+		--with-zlib-dir=/usr
 	)
 
 	php-ext-source-r3_src_configure