commit: 786475e77ec09887be16e2fbfc09336003dd6e71 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Wed Jul 5 20:45:02 2023 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Wed Jul 5 20:49:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786475e7
dev-php/PEAR-Crypt_GPG: drop 1.6.2 Bug: https://bugs.gentoo.org/833570 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> dev-php/PEAR-Crypt_GPG/Manifest | 1 - dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild | 49 ------------------- .../files/fix-unit-tests-with-new-gpg.patch | 55 ---------------------- 3 files changed, 105 deletions(-) diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest index 94e41118baf7..7209c7c0e908 100644 --- a/dev-php/PEAR-Crypt_GPG/Manifest +++ b/dev-php/PEAR-Crypt_GPG/Manifest @@ -1,2 +1 @@ -DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd DIST Crypt_GPG-1.6.7.tgz 343957 BLAKE2B c95346005fdd36bd97e2a0e6cd42c5a2898fb59f0a4a3d3b09bd99a409bd9c998b267ffd84ab28148e17c3f7e78e094393c3b077998b05dc2d7ddcb0ab81394b SHA512 dd629271ebbcb98df5d31313c1a6911b62964046c758e00b55377170653e9880d2edc7d0b953fd6ae441d74238c4a8e1008bf6a9195a19ff463bcc82665f14e8 diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild deleted file mode 100644 index e0f4c627a409..000000000000 --- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" -DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/fix-unit-tests-with-new-gpg.patch" ) - -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/files/fix-unit-tests-with-new-gpg.patch b/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch deleted file mode 100644 index 8e49a2f263fb..000000000000 --- a/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 14a884dd5127141929ef7a58185c298e92602c40 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak <[email protected]> -Date: Sat, 16 Sep 2017 13:05:37 +0200 -Subject: [PATCH] Fix Bug #21242: PHPUnit tests fail sometimes while deleting - S.gpg-agent.extra - ---- - tests/TestCase.php | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/tests/TestCase.php b/tests/TestCase.php -index b91ea7d..1ad8028 100644 ---- a/tests/TestCase.php -+++ b/tests/TestCase.php -@@ -583,7 +583,10 @@ private function _tearDownKeyring() - $iterator = new DirectoryIterator($dirname); - foreach ($iterator as $file) { - if (!$file->isDot()) { -- unlink($dirname . '/' . $file->getFilename()); -+ $filename = $dirname . '/' . $file->getFilename(); -+ if (file_exists($filename)) { -+ unlink($filename); -+ } - } - } - rmdir($dirname); -@@ -595,7 +598,10 @@ private function _tearDownKeyring() - - foreach ($iterator as $file) { - if (!$file->isDot()) { -- unlink($homedir . '/' . $file->getFilename()); -+ $filename = $homedir . '/' . $file->getFilename(); -+ if (file_exists($filename)) { -+ unlink($filename); -+ } - } - } - -@@ -614,10 +620,12 @@ private function _tearDownTempdir() - foreach ($iterator as $file) { - if (!$file->isDot()) { - $filename = $this->getTempFilename($file->getFilename()); -- if (is_dir($filename)) { -- rmdir($filename); -- } else { -- unlink($filename); -+ if (file_exists($filename)) { -+ if (is_dir($filename)) { -+ rmdir($filename); -+ } else { -+ unlink($filename); -+ } - } - } - }
