[gentoo-commits] repo/gentoo:master commit in: dev-perl/GnuPG-Interface/files/, dev-perl/GnuPG-Interface/

[Sam James]

commit:     3842db814612481f5efb1320c1aab404fae09a40
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 06:18:04 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 25 06:21:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3842db81

dev-perl/GnuPG-Interface: don't call which

We don't want to rely on sys-apps/which and it doesn't serve much purpose
to do this check at all. We already die if we can't find the gpg version
on the next line anyway.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild   |  6 +++++-
 .../files/GnuPG-Interface-1.30.0-which-hunt.patch        | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild 
b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild
index 44bf41c3feeb..e071f56eb781 100644
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,10 @@ BDEPEND="
        >=virtual/perl-ExtUtils-MakeMaker-6.360.0
 "
 
+PATCHES=(
+       "${FILESDIR}"/GnuPG-Interface-1.30.0-which-hunt.patch
+)
+
 src_test() {
        # Nearly all tests succeed with this patchset and GnuPG 2.1 when 
running outside the
        # emerge sandbox. However, the agent architecture is not really 
sandbox-friendly, so...

diff --git 
a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-1.30.0-which-hunt.patch 
b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-1.30.0-which-hunt.patch
new file mode 100644
index 000000000000..5e7f8b6a3efe
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-1.30.0-which-hunt.patch
@@ -0,0 +1,16 @@
+We don't want to rely on sys-apps/which and it doesn't serve much purpose
+to do this check at all. We already die if we can't find the gpg version
+on the next line anyway.
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -3,10 +3,6 @@ use strict;
+ use warnings;
+ use inc::Module::Install;
+ 
+-print "which gpg ... ";
+-system("which", "gpg");
+-die "gpg (GnuPG) not found" if ( $? != 0 );
+-
+ my $output = `gpg --version`;
+ die "Can't determine gpg version"
+     unless $output =~ /^gpg \(GnuPG.*?\) (\d+\.\d+)/;