* [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Crypt_GPG/files/, dev-php/PEAR-Crypt_GPG/
@ 2017-11-15 4:51 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2017-11-15 4:51 UTC (permalink / raw
To: gentoo-commits
commit: b94584584d063065778fc438d93922a5ee29f609
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 02:27:45 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 04:50:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9458458
dev-php/PEAR-Crypt_GPG: new version 1.6.2.
This new version fixes two issues, in addition to whatever upstream
changes took place:
1. We now use the tiny PEAR-Exception instead of big PEAR-PEAR.
2. An upstream commit was backported to fix the test suite
with newer versions of app-crypt/gnupg.
Thanks to Rolf Eike Beer for reporting the test suite issue.
Closes: https://bugs.gentoo.org/636728
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-php/PEAR-Crypt_GPG/Manifest | 1 +
dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild | 48 +++++++++++++++++++
.../files/fix-unit-tests-with-new-gpg.patch | 55 ++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 7b86112fb35..42b48952a7a 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -2,3 +2,4 @@ DIST Crypt_GPG-1.3.2.tgz 339001 SHA256 67f77bfb9b21dd428587f5bd336e4b9b2e200a1b6
DIST Crypt_GPG-1.4.2.tgz 345962 SHA256 8e1cf98b5bf37fead50745327261c021efac8c1ee2bddd57c38be57e8f1bc969 SHA512 c0384f0b4a35f8e7d7189b0b08c277c2629e7fa84e13f2c8c92aaafbeace7a60b6e18f2347571e7bcdf4bc504fd9463f080d9c2938063fdfcabc8f44dd7f4950 WHIRLPOOL ea6e2d0dfbfc56cf4bec5bcdfa312a5f43109c305b699b501e102e81908ad1ba350a97525b5d9ada45d6713ef64512744b6e04f208b5dc2f029ad01fedbffb4e
DIST Crypt_GPG-1.6.0.tgz 345474 SHA256 efbe714d553d9e478f39bd181acf684a68180353971c05e764d8d70bc59f68ed SHA512 b5119204114218a8100d978ea265f1b4f7883b0155c6c984e493737ec7185a9a37c2eb3255b3dd30ccc8821363dbd5c86f8861b8da206c0a0efff89086ac6ae0 WHIRLPOOL d6098e37966ff9aea5467f6f98e5ae9ff3c2605c719c9fad3ff914b75a622e1cc29075507703dc3f6905df957dac77b7b83aae3513b04cf5af77eeb8babdedd1
DIST Crypt_GPG-1.6.0b3.tgz 345445 SHA256 fc3757b33a1ea39f9816521aca50dee4bf6c07cc9c7be60600db32066cf89d29 SHA512 0a3cb665fac8e84a0699600155cb74e2394e4759fe0b111d971d253ca511a371d06d826e54abadfbb3f707833cd3d6b369f52d04541b3e04f217056ec8439f4c WHIRLPOOL 0df9a3b21bbfc0d2f8e3cd8efaf8e19a58981520976faf1c4b501a363bbb05c2e4299de22e3c987f8f5ead36e98b5401c813d07947e4e84c6c664c2d46c4e3fa
+DIST Crypt_GPG-1.6.2.tgz 346709 SHA256 5b552ef565c4323af56114c6eac30a7431d36667c271adf68fe4a76e00b51224 SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd WHIRLPOOL 1f4e0beb51a2d690a493a80bfaf27e818e9e73f2c314e160645e5dd4994feddfeba3fc5b55a46056cd8cae8520359081d304978d7f85e41f86215156bcc6a527
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
new file mode 100644
index 00000000000..78ed9b3dd21
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://pear.php.net/package/${MY_PN}"
+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"
+
+RDEPEND="app-crypt/gnupg
+ dev-lang/php:*[posix,unicode]
+ dev-php/PEAR-Console_CommandLine
+ dev-php/PEAR-Exception"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+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
new file mode 100644
index 00000000000..8e49a2f263f
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch
@@ -0,0 +1,55 @@
+From 14a884dd5127141929ef7a58185c298e92602c40 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+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);
++ }
+ }
+ }
+ }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Crypt_GPG/files/, dev-php/PEAR-Crypt_GPG/
@ 2022-02-16 19:14 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2022-02-16 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 4cfbe3bd8b37007ed590cd1e1f34d3e83031fa79
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 19:13:24 2022 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 19:14:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cfbe3bd
dev-php/PEAR-Crypt_GPG: Drop old unstable
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-php/PEAR-Crypt_GPG/Manifest | 4 --
dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild | 47 --------------------
dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild | 49 ---------------------
dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild | 51 ----------------------
dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild | 49 ---------------------
dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch | 45 -------------------
6 files changed, 245 deletions(-)
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index eb329d0e6a8d..94e41118baf7 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,6 +1,2 @@
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
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.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild
deleted file mode 100644
index 720a949b0606..000000000000
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.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 )"
-
-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_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/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);
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Crypt_GPG/files/, dev-php/PEAR-Crypt_GPG/
@ 2023-07-05 20:50 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2023-07-05 20:50 UTC (permalink / raw
To: gentoo-commits
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 <machniak@kolabsys.com>
-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);
-+ }
- }
- }
- }
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-05 20:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-16 19:14 [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Crypt_GPG/files/, dev-php/PEAR-Crypt_GPG/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2023-07-05 20:50 Michael Orlitzky
2017-11-15 4:51 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox