gentoo resync : 07.01.2022

6 files changed, 27 insertions, 59 deletions

diff --git a/dev-php/PHP_Timer/Manifest b/dev-php/PHP_Timer/Manifest
index d33aa36cf349..d3561de6a443 100644
--- a/dev-php/PHP_Timer/Manifest
+++ b/dev-php/PHP_Timer/Manifest
@@ -1,10 +1,7 @@
 AUX autoload-2.1.2.php 428 BLAKE2B a625484b6d65808c070b992430e182ae17dae2908e3724261fc55c68726c86c061e718ee70a493ffff5ccfdb402705e2771d317d7a2f399d0e963fa9dccbf9c0 SHA512 97aa82732d3f2efedf6695b586965e217d49db94e6123958139ffe546e0378d40f4c665b377fb7dfbf03fd31f3b32aa71939d3f95f8425e70526faa9e5d0d885
-AUX autoload.php 281 BLAKE2B e1265714ef958a2490b2c039a0def4cd3e2a26ff035d4c689e10f0eb9c9f26878fb537fcf42ede6d26fed2ee36dd73e258fa116d7cc6cd57c80eb990e54cdc33 SHA512 e9e0e6d3bd52d7a524472d4d65aa21e0f1a767fbfc284e9d628eea1414e87ba5e692d3968005d3afcbd86a598538c2edf241a09d5d66cf9cfbb57efdc758db21
-AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
-DIST PHP_Timer-1.0.5.tgz 3597 BLAKE2B cf82c3ff61a1f96a94a5d3743270be3262bc2ea28d7d71cd1c93a07c7bec950597c4da5d6dd23e4b58b8aad7c2e3bdb7aea07d761ef096e898088ca2296b43cf SHA512 da030dec608d1f8d447da6ce40e995ca818064e3a4b2f2eca1819a77a12875843a25bba1ffd253043ef3ac62a6dc1a16c5e7ba9b792b99b54d0713090478be84
-DIST PHP_Timer-1.0.9.tar.gz 3740 BLAKE2B d551fd676046e6bb653fb9a9bde7a976b9b2081d26caee23177b899fa01e11ae1fb2183234ab43745798c058222574b1523064cc07d25485315eef9090f892a5 SHA512 96db90cf2af18fabcf44bdd4dbb5d298402ed2c8e49f3033fd1b89b3aa8c880d9f8677897d4d542a0db6348bdd9c697042deb0b6e26242adebfde1bcdb4bc559
+AUX autoload-5.0.3.php 744 BLAKE2B 943785c0b33403e8dde7974e94d06f56e5d2b570f1867004277ec221a66d1cf587e85596996036d3f2c0575c82ae96aff1cfbc5dc3686041ec48a7d2466a2ddd SHA512 22105ea65fc1f90bc520d2380ec01e4a5c822925ccb82c8e22b5984d8ef544326c3b560f236636b72d539f033c2176e02f50b888c69514fd38f8033c2701efff
 DIST PHP_Timer-2.1.2.tar.gz 7090 BLAKE2B c99dd69433b3579e9ed81f06188cac280b6ac383bce12acd9c6a00b5a6d6017a94c427692b639ad1516c1faebec8e160b7cd5c7e5e96043dd3dcb6d283d2095b SHA512 199175e048560756867180cd99a3ca1766431d14091f1448cd8011df5f7824504a6c586ef15d9e53374bdb9dbd1731c05b44509e59d92d725908ec2c46d7d576
-EBUILD PHP_Timer-1.0.5.ebuild 428 BLAKE2B 088b5bc82c21cf4d4643ad12d65f9212fdfae73070c1115a02359a42976504c989ce3e80e3418d8b5cd14dec927f5a045d68d38cec7fc5cc2dae0d89c72f3cd5 SHA512 cbcb03add37089682373e881678392138f9ec5672d52227f0aba8a23e6e5d99a0d54c17ed73a11a4b77125529553c89c7e2e2780b6138f0e5bbaef9c07307248
-EBUILD PHP_Timer-1.0.9.ebuild 747 BLAKE2B f58d3a148ece769ba9aa3e6198a6ee184717548426772920eee9b574433df6534fb623e937e310e757c1a3375c372c1887d98d5a38d670438a4e62c521be06cd SHA512 ba5b9c74a3dd64cc3321205cfe59682a006dc9ef06c0f4c663863ca49ead09f54da740f27d0df8b09311a8d8c87864110ade76200eff7c8edd11bf54af2e32a3
+DIST PHP_Timer-5.0.3.tar.gz 5363 BLAKE2B b63d438eab1dd5d872a1a632f1861d216dbdd7ab073a8fa36bad7f93134fd0c98ef7eb049189aeb6373b60eba592cc5add0044ac577d0b9728f3f78156dae914 SHA512 e1642cd0d247a49981f142b6975339c4abaf26cf4847783f309a0a15ba7a55520c7d1e11a87ea9b923337a9972f4dc95ee11121484a75c9c7a20882f664e8ba5
 EBUILD PHP_Timer-2.1.2-r1.ebuild 795 BLAKE2B 1a68946c77401ac9ebcb8bf5879d2d63c9e4265bad5eecaecc355a1493793ae82f96bad5695bea48ead2f8e911bf399f5e77fe4ea1a990d32d1135cd83b9255d SHA512 69a6a5888ee79b9530e98d71b3d0415ef4be67f67c512bfe6a1376e40a7eda1bb7e338b21d7a529fa62e2cae16d88eb78c4c519e020b85b03914b00424cccc24
+EBUILD PHP_Timer-5.0.3.ebuild 765 BLAKE2B e98ed8fff0bea9ba68dc26162ca5365037ad62ca21916621b58d704aedb6b2237076974ce653c4de4564dd3c9c43f863aa4e176563679e06c8518711b1827aae SHA512 72b8987c2a4336213c57dd21e2d1ca3a2825040bd7abc314951be9eeaa05f3a3eb038b499a06c0b5b422af0a8b4b52a815d5a339c8d59ae1afe9c75cbbc06c3c
 MISC metadata.xml 356 BLAKE2B f63f97ce9783be3163da57993df74547b673b4e88e7e1851ef0b06de36bcfbc80fac92a75e20aa08973b4a6dcf33480999771166f65106c59ee0f5243edb3103 SHA512 f1ba51a2d40682991dc0fa5e83096cd32d91b2a7ce8b423ec992576dfd285a16446163f38fc5bbcc477c143057fc65d235e74a654874d3d517eeb1b0573cfe6b
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
deleted file mode 100644
index 6e31e37ca148..000000000000
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_DOMAIN="pear.phpunit.de"
-PHP_PEAR_PKG_NAME="PHP_Timer"
-
-inherit php-pear-r2
-
-DESCRIPTION="Utility class for timing"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-HOMEPAGE="http://pear.phpunit.de/"
-SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild b/dev-php/PHP_Timer/PHP_Timer-5.0.3.ebuild
index 584ae19d7a7f..411c705df558 100644
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-5.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_PN="php-timer"
 
@@ -11,18 +11,18 @@ 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 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="dev-php/fedora-autoloader
-	>=dev-lang/php-5.6:*"
+	>=dev-lang/php-7.3:*"
 
 src_install() {
 	insinto /usr/share/php/PHP/Timer
-	doins -r src/Timer.php
-	doins "${FILESDIR}/autoload.php"
+	doins -r src/*
+	newins "${FILESDIR}/autoload-5.0.3.php" autoload.php
 }
 
 pkg_postinst() {
diff --git a/dev-php/PHP_Timer/files/autoload-5.0.3.php b/dev-php/PHP_Timer/files/autoload-5.0.3.php
new file mode 100644
index 000000000000..45b65b6045e8
--- /dev/null
+++ b/dev-php/PHP_Timer/files/autoload-5.0.3.php
@@ -0,0 +1,18 @@
+<?php
+/* Autoloader for dev-php/PHP_Timer */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    [
+		'sebastianbergmann\timer\duration' => '/Duration.php',
+		'sebastianbergmann\timer\exception' => '/exceptions/Exception.php',
+		'sebastianbergmann\timer\noactivetimerexception' => '/exceptions/NoActiveTimerException.php',
+		'sebastianbergmann\timer\resourceusageformatter' => '/ResourceUsageFormatter.php',
+		'sebastianbergmann\timer\timer' => '/Timer.php',
+		'sebastianbergmann\timer\timesincestartofrequestnotavailableexception' => '/exceptions/TimeSinceStartOfRequestNotAvailableException.php',
+    ],
+    __DIR__
+);
diff --git a/dev-php/PHP_Timer/files/autoload.php b/dev-php/PHP_Timer/files/autoload.php
deleted file mode 100644
index bb0974e087d6..000000000000
--- a/dev-php/PHP_Timer/files/autoload.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/* Autoloader for dev-php/PHP_Timer */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-    array(
-		'php_timer' => '/Timer.php',
-    ),
-    __DIR__
-);
diff --git a/dev-php/PHP_Timer/files/channel.xml b/dev-php/PHP_Timer/files/channel.xml
deleted file mode 100644
index 91bb6786f543..000000000000
--- a/dev-php/PHP_Timer/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