[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Crypt_GPG/files/, dev-php/PEAR-Crypt_GPG/

[Michael Orlitzky]

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@××××××××.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);
++                    }
+                 }
+             }
+         }