gentoo resync : 20.03.2022

6 files changed, 11 insertions, 210 deletions

diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 084f2600442b..80baef4a16b4 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,13 +1,6 @@
-AUX 1.6.4-fix-tests.patch 1357 BLAKE2B 604ed62dc9823491ccca6870586537cdc102f2c3b866f1913b78895603f9b4e60a18a3e7da13500c58131d0a4b6677fe6932e0ce469875cc01b8948657df603c SHA512 7fa341bb55c98ac2364834c90269ce7a44279f0d0612ae2b09994b94f2a6066f8ea55447f228fbf3d107d97fa3093002a2dd9abd87e16afcd2c7fc5e897f1a20
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
-DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
-DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e92bf832370223879e90e8018cfd3b736e099807fdcc897b7569a40af66e72f011eaeb7400477053b7838409d SHA512 3eee39702abe97fc322e5976ebe8a7f7ba07bc950d22aa6636cadf38b0bd9c6c6316d7be35f21a8d0e8dfdb66a76db33121edb34736869d31ae89b03468cf470
-DIST Crypt_GPG-1.6.5.tgz 346966 BLAKE2B 5ca074b57c44d99159409b1c7ce0adcf672b59882f6f2dddf864df692243457ccd69c8018b5031dc6ab0ea0e88dba0586b8842992184be65c72100d3f34904c1 SHA512 86feeff3e698c8ce133b0481ca96a000f00801f52c128dc8cb4cfec37040494c1e7176138e9988ebf0e85206c5fe3b51f939b4d7ca6decc16a787be4f4e8f261
-DIST Crypt_GPG-1.6.6.tgz 343929 BLAKE2B 1cc5b01d5c44e614cc67e5f21298120aa44ff4b4efb933a8fdb64c02eb7f19c7299a7d53e7d032f9ab013b8d319798dec5732c382590bdb1da52998f30eab9b9 SHA512 38f721cf818972f835162b9e405efb55160276d759361e1f351645d585695f903445accf83f190f7f14f202e2bebe3c78b7ff2b8af2151c3d66bd6636f98859a
+DIST Crypt_GPG-1.6.7.tgz 343957 BLAKE2B c95346005fdd36bd97e2a0e6cd42c5a2898fb59f0a4a3d3b09bd99a409bd9c998b267ffd84ab28148e17c3f7e78e094393c3b077998b05dc2d7ddcb0ab81394b SHA512 dd629271ebbcb98df5d31313c1a6911b62964046c758e00b55377170653e9880d2edc7d0b953fd6ae441d74238c4a8e1008bf6a9195a19ff463bcc82665f14e8
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1174 BLAKE2B 763b350b56b5dbd7b114e36f28ea69f3f4290cf8a8278dc12d6276460ceb2ca63a19260e6a4db351928ba03352f80f43915e8aed6a84deca1d7677f37e21856c SHA512 60caa2cd7c97087a7ad80d995d1ab113913968652e1990d7df0113b97d7e0085b2a721c58c5bff581ae0291d4e7f3a5734bc7365b69edaa3a3f12b1edf0f6f85
-EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1120 BLAKE2B e91c8b18e150d98435b792ea12c84dfd171d63e7963b9b073156d1b4b49c86ce68734606211cc1340aa66ddba675456d153f3da4465f3c1c4d3b4df7949adf36 SHA512 7b8246c9ef8257bb14a3b4378b69d7dda5a022247c9f94162954be9b9f06a3173d67365387927f7a0a875b4882deaadcb5111e98b097f984739a9319dcc233a9
-EBUILD PEAR-Crypt_GPG-1.6.4.ebuild 1169 BLAKE2B 73f2ff2985933c651a3f039c421657c5639bdacf08ccb352b590a80c49b3070bfba44ab8cda1127aa330a9d6c410ba0ba4c949c7dace6ea38bd13c2f5a731f74 SHA512 909814a3e395b0b5a078d41c837da720304e24ad2340146eaefc704ea4698da5692542cad335129d791267a600ad21c4ed13302449d1d1bd18368b0e8ebe6c2d
-EBUILD PEAR-Crypt_GPG-1.6.5.ebuild 1210 BLAKE2B 188c89cfe4d6180083beb583402abb208b81337a5b70f9202d7f612667064b0306f8bea6f5ef38c9d85c86be6b6edc4fcd0f89351ee7d2af7fa74475ce01f765 SHA512 8b7c8fde04be38756222a8ad714181369af17829827777e17935cce12ac6e6c5bfa506357ccc5f155c56355edc051d9ec1dfefbbe3684eec0236225285eec96c
-EBUILD PEAR-Crypt_GPG-1.6.6.ebuild 1161 BLAKE2B ce8e94b493cdc971082007be2f317b888d9bb5d214212a85d260d412034553e0662b57b54b015d22e3f7bb8c513655671b3855e89446b1159d2010bdbae239ee SHA512 590ff32370ce986f96d0e48642960b4b3ec6130d55a677a3ede9751e22259f614692bb75609ca1183116767f30c8f81ed058384d3a5b1f2510cf9a767479fe5d
+EBUILD PEAR-Crypt_GPG-1.6.7.ebuild 1186 BLAKE2B ef5d606683e17f2b3de4f65475b3ee4a335a8b611d8e0832488e0274319e959f0dc52bf4c8923d753ef4f9d22a4c30653809f4114efe38e40324857db12b2e99 SHA512 0cfd23a459602da5e5d5a7b7615358e6425d6b3582dcd32b03718005163a4025af9701ec456704dcdeeafe0156769386a6a0505f270ff9917a0f123a54bb20db
 MISC metadata.xml 516 BLAKE2B 81fe21dff1eabdcc17fd25f7dc6445b1047fd92f150a075e193fc8f399e5af35c813752a6c5165805d0443e0e3862dceced142ad34e4dd0b5ba0f72a3617beef SHA512 10d8240e396c947c147ae289faedf0281e721f3ddc9603b4e7fdcc3e930302b539cb04ab532ad230ca7f573ed1bfcfe6e12d14fe6a737aa554aecc0a85e8ebaa
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
deleted file mode 100644
index e0cea4ce1b04..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild
deleted file mode 100644
index 2574cb9fb2d9..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
-
-PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_test() {
-	local -x GNUPGHOME="${HOME}"
-	phpunit --verbose tests/ || die "test suite failed"
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild
deleted file mode 100644
index 0315abb14ede..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
-	dev-php/PEAR-Console_CommandLine
-	dev-php/PEAR-Exception"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
-	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
-	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
-}
-
-src_test() {
-	local -x GNUPGHOME="${HOME}"
-	phpunit --verbose tests/ || die "test suite failed"
-}
-
-src_install() {
-	dodoc README.md
-	dobin scripts/crypt-gpg-pinentry
-
-	insinto "/usr/share/${MY_PN}"
-	doins -r data
-
-	insinto /usr/share/php
-	doins -r Crypt
-}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.7.ebuild
index 720a949b0606..a3a112cc6615 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="${PN/PEAR-/}"
 MY_PV="${PV/_/}"
@@ -17,22 +17,26 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="app-crypt/gnupg
-	dev-lang/php:*[posix,unicode]
+	dev-lang/php:*[posix(-),unicode(-)]
 	dev-php/PEAR-Console_CommandLine
 	dev-php/PEAR-Exception"
 BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
 
-PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" )
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
+
 	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
 	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
 	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
 }
 
+src_test() {
+	local -x GNUPGHOME="${T}"
+	phpunit --verbose --do-not-cache-result tests/ || die "test suite failed"
+}
+
 src_install() {
 	dodoc README.md
 	dobin scripts/crypt-gpg-pinentry
@@ -43,7 +47,3 @@ src_install() {
 	insinto /usr/share/php
 	doins -r Crypt
 }
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
diff --git a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch b/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch
deleted file mode 100644
index e4fb835cc34f..000000000000
--- a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -uarN a/tests/ImportKeyTest.php b/tests/ImportKeyTest.php
---- a/tests/ImportKeyTest.php	2020-03-22 08:00:23.000000000 -0400
-+++ b/tests/ImportKeyTest.php	2021-02-02 14:45:16.561963089 -0500
-@@ -60,7 +60,7 @@
-     // set up
-     // {{{ setUp()
- 
--    public function setUp()
-+    public function setUp() :void
-     {
-         parent::setUp();
- 
-diff -uarN a/tests/KeyGeneratorTest.php b/tests/KeyGeneratorTest.php
---- a/tests/KeyGeneratorTest.php	2020-03-22 08:00:23.000000000 -0400
-+++ b/tests/KeyGeneratorTest.php	2021-02-02 14:42:07.117718685 -0500
-@@ -174,7 +174,7 @@
-     // }}}
-     // {{{ setUp()
- 
--    public function setUp()
-+    public function setUp() :void
-     {
-         parent::setUp();
-         $this->generator = new Crypt_GPG_KeyGenerator($this->getOptions());
-diff -uarN a/tests/TestCase.php b/tests/TestCase.php
---- a/tests/TestCase.php	2020-03-22 08:00:23.000000000 -0400
-+++ b/tests/TestCase.php	2021-02-02 14:42:36.978387716 -0500
-@@ -119,7 +119,7 @@
-     // set up
-     // {{{ setUp()
- 
--    public function setUp()
-+    public function setUp() :void
-     {
-         // load test configuration file if it exists
-         $configFilename = __DIR__ . '/config.php';
-@@ -567,7 +567,7 @@
-     // }}}
-     // {{{ tearDown()
- 
--    public function tearDown()
-+    public function tearDown() :void
-     {
-         unset($this->gpg);
-