gentoo resync : 15.01.2020

7 files changed, 90 insertions, 97 deletions

diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index 5a86f262f064..cd7ef120da37 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -1,8 +1,7 @@
+AUX autoload-7.0.10.php 646 BLAKE2B 71515ed7d8eb3339e2756e8f1af7bba2e0f1cf1b0fc3e225518186dc676caa67cf03ab56188d21382765becae01f9ada57bde0b487f63bce9dcc6f6a4a7efd04 SHA512 c080167102a448c527fb5e185f87506ed225da1b36501cbfc0383af6233f63d7a031234eb21e28376def9004a339d392498ff2903c171dd80e4079d8dcb79c0b
 AUX autoload.php 3859 BLAKE2B 65cc25809352182d5c852743a25e2e297fe0819d2feac0fb47cd9f80e9ea36a16f7f2dbc2657bd73d1e484c1b851b5603eaec8c6d0f7fa5e6582876661587fbe SHA512 c33ce039a84f0f6d260bf46e8308df806968328c80dd89b778c76a0620d514c5e101ac3c741a3b68aba07cb59ccfae4a0dfb6157fb056e03ce65c1478300655a
-AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
-DIST PHP_CodeCoverage-1.2.13.tgz 158772 BLAKE2B 7f9703cf724dece9535fce4e5dbc7a354302227b38daabf9f8c4417a43980f369807dfbcd65fde79215a14531971d0bf6cf096a6b01c2c6b99a5bc326c5d5b66 SHA512 6a3426c945ad6abf35be3068cf0f7e17215179a382e93b7be3a5e436611b327c9b7bc715f7acc900231856678f578c1f614648d2679baca9b6960dfafd897dc6
 DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
-EBUILD PHP_CodeCoverage-1.2.13.ebuild 578 BLAKE2B 29c9c830a5dce3332b4e2e072a78930dd2a5e9ce41ad4e582644e6e435ae5ec6ac60ff41d710fd53d23797c66929509fe0c631beb35966883f0f9ff497ecd539 SHA512 9a23f02d10f100de9d110830b5c0ff8a5e36b0dc940422ebd25f857eacb8610f3e9e774840b4c228ab1b4353396f0543f0bafc1f0c359f088e059516c2aa358f
-EBUILD PHP_CodeCoverage-4.0.7-r1.ebuild 1302 BLAKE2B fe67ca3c3912093e52d58b0bd5416ec11153abd014f457445f6795cd57448c12fd73e41ed47d791a7d685e16e70a3c7afcbd50e8edd992638551a11034702949 SHA512 1cefafb639d6b2bfd4c2a17d49031ac8a7570923e711297a8e265771a892f125ade7138b6ba36a0fe1d8fc80357319077ad4c5325a34d2c61688bb00867e309b
-EBUILD PHP_CodeCoverage-4.0.7.ebuild 1309 BLAKE2B 6d4e4b889312e69ee8064767aec9e697f88a10c894b9704a7f8c2fa39e65d43d4b243ae30c31b86b43fcb13bb200ba813503e6551bf596a93298355da7329954 SHA512 427c11307566be37963711447161b143a80cd801353e985b50d7ffc15320e66a8e27487e434e0fcf12072572635a9f5aa2bfee3101a7f62897d997495150c78c
+DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1
+EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1233 BLAKE2B 7914fca282b0f34d24b556f979a4d3447d8565c13cea2f9c7eb98362571cd21c1617660be8b0371aa03a33f4f2a0e56e6ad3fce3083c7bb93d0210075aaf755f SHA512 fe88f5144c50c39c7ef9ee61100c721a7ff356cc9b53391bbf64ea0b306589d244b039a161a499f51b5902ba774186bdf72593d8a08a6564b45fd9d74d56728d
+EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1954 BLAKE2B 8231f32894f4bbbab91a5fe18487ef52b14d150a06cb616b4a50e5cb68268c94cded840df667dc400db95a813a0a66b841418975735c7d26a177e234175d270c SHA512 8026c5371053cb53345287149af7a9097b5e0bb0486cab71011b6fd4960b37931d2819b4ea43315392313c6f001a13ab22a09506f50b4b33a45c198a73eab970
 MISC metadata.xml 339 BLAKE2B a9f68f1bacb42eb4e4a6463dc03080c343501c0f6525ed08556f9d04606b42c2744f458ba35fff8cd4f5c8e68f81f226193dc79bf7808da8c4229588f34dc3dc SHA512 5057d1d80d43e4e8f8a6f2bbddabda7c7f639eb26a7be8f534ac2c470341834c7d99e78a20f18062ef1c7252b75428af122f2858dac78f88f8ab6d50a6f66f4a
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
deleted file mode 100644
index 501117d4dfdf..000000000000
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_PEAR_DOMAIN="pear.phpunit.de"
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-
-inherit php-pear-r2
-
-DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
-HOMEPAGE="http://pear.phpunit.de"
-SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND=">=dev-php/pear-1.9.4"
-RDEPEND="${DEPEND}
-	>=dev-php/File_Iterator-1.3.0
-	>=dev-php/PHP_TokenStream-1.1.3
-	>=dev-php/Text_Template-1.1.1"
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
index e4af4df00710..2f76b6139f1b 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r1.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -30,9 +30,7 @@ RDEPEND="dev-php/fedora-autoloader
 	dev-php/sebastian-code-unit-reverse-lookup
 	<dev-php/sebastian-code-unit-reverse-lookup-2.0
 	|| (
-		dev-lang/php:5.6[xml,xmlwriter]
-		dev-lang/php:7.0[xml,xmlwriter]
-		dev-lang/php:7.1[xml,xmlwriter]
+		dev-lang/php:7.2[xml(-),xmlwriter(-)]
 	)"
 
 src_install() {
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild
deleted file mode 100644
index 1c3cdb12a1b3..000000000000
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="php-code-coverage"
-
-DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
-HOMEPAGE="http://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-1.3
-	!>=dev-php/File_Iterator-2.0
-	>=dev-php/Text_Template-1.2
-	!>=dev-php/Text_Template-2.0
-	>=dev-php/PHP_TokenStream-1.4
-	!>=dev-php/PHP_TokenStream-3.0
-	>=dev-php/sebastian-environment-1.3.2
-	!>=dev-php/sebastian-environment-3.0
-	>=dev-php/sebastian-version-1.0
-	!>=dev-php/sebastian-version-3.0
-	dev-php/sebastian-code-unit-reverse-lookup
-	!>=dev-php/sebastian-code-unit-reverse-lookup-2.0
-	|| (
-		dev-lang/php:5.6[xml,xmlwriter]
-		dev-lang/php:7.0[xml,xmlwriter]
-		dev-lang/php:7.1[xml,xmlwriter]
-	)"
-
-src_install() {
-	insinto /usr/share/php/PHP/CodeCoverage
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
-
-pkg_postinst() {
-	ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
-	ewarn "Please update any scripts to require the autoloader"
-}
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
new file mode 100644
index 000000000000..ab03fa0af49e
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-2 php7-3 php7-4"
+MY_PN="php-code-coverage"
+
+DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-php/File_Iterator-2.0.2
+	<dev-php/File_Iterator-3.0
+	>=dev-php/Text_Template-1.2.1
+	<dev-php/Text_Template-2.0
+	>=dev-php/PHP_TokenStream-3.1.1
+	<dev-php/PHP_TokenStream-4.0
+	>=dev-php/sebastian-environment-4.2.2
+	<dev-php/sebastian-environment-5.0
+	>=dev-php/sebastian-version-2.0.1
+	<dev-php/sebastian-version-3.0
+	dev-php/sebastian-code-unit-reverse-lookup
+	<dev-php/sebastian-code-unit-reverse-lookup-2.0
+	>=dev-php/theseer-tokenizer-1.1.3
+	<dev-php/theseer-tokenizer-2.0
+	|| (
+		dev-lang/php:7.2[xml(-),xmlwriter(-)]
+		dev-lang/php:7.3[xml(-),xmlwriter(-)]
+		dev-lang/php:7.4[xml(-),xmlwriter(-)]
+	)"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+# Test currently do not work.  Cannot find TestCase.php
+RESTRICT="test"
+
+src_install() {
+	insinto /usr/share/php/PHP/CodeCoverage
+	doins -r src/*
+	newins "${FILESDIR}/autoload-7.0.10.php" autoload.php
+}
+
+src_test() {
+	mkdir vendor || die
+	cp "${FILESDIR}/autoload-7.0.10.php" vendor/autoload.php || die
+	sed -i 's~__DIR__~__DIR__."/../src"~' vendor/autoload.php || die
+	ln -s ../tests/TestCase.php src/TestCase.php || die
+	for target in ${USE_PHP//-/.} ; do
+		if [ -x /usr/bin/$target ] ; then
+			${target} /usr/bin/phpunit -c phpunit.xml || die
+		fi
+	done
+	rm src/TestCase.php || die
+}
+
+pkg_postinst() {
+	ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
+	ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php b/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php
new file mode 100644
index 000000000000..5d67fe9248a5
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php
@@ -0,0 +1,17 @@
+<?php
+/* Autoloader for dev-php/PHP_CodeCoverage */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('SebastianBergmann\\CodeCoverage\\', __DIR__);
+
+\Fedora\Autoloader\Dependencies::required(array(
+	'/usr/share/php/File/Iterator/autoload.php',
+	'/usr/share/php/PHP/Token/autoload.php',
+	'/usr/share/php/SebastianBergmann/Version/autoload.php',
+	'/usr/share/php/SebastianBergmann/Environment/autoload.php',
+	'/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
+	'/usr/share/php/Text/Template/autoload.php',
+));
diff --git a/dev-php/PHP_CodeCoverage/files/channel.xml b/dev-php/PHP_CodeCoverage/files/channel.xml
deleted file mode 100644
index 91bb6786f543..000000000000
--- a/dev-php/PHP_CodeCoverage/files/channel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.phpunit.de</name>
-    <summary>PHPUnit PEAR Channel</summary>
-    <suggestedalias>phpunit</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
\ No newline at end of file