commit: f939882e96e9020835ec6d883a5a8e4e4e1ad971
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 3 17:19:39 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 17:20:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f939882e
app-shells/psh: Add compatibility patch for Perl 5.22; other QA cleanups
Package-Manager: portage-2.2.26
app-shells/psh/files/psh-1.8.1-defined-array.patch | 11 +++++++++++
app-shells/psh/psh-1.8.1-r1.ebuild | 7 ++++---
.../{psh-1.8.1-r1.ebuild => psh-1.8.1-r2.ebuild} | 22 +++++++++++++++-------
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/app-shells/psh/files/psh-1.8.1-defined-array.patch
b/app-shells/psh/files/psh-1.8.1-defined-array.patch
new file mode 100644
index 0000000..e25c4df
--- /dev/null
+++ b/app-shells/psh/files/psh-1.8.1-defined-array.patch
@@ -0,0 +1,11 @@
+--- lib/Psh.pm 2007-07-21 16:40:44.000000000 +1200
++++ lib/Psh.pm 2015-07-18 05:30:29.840928282 +1200
+@@ -367,7 +367,7 @@
+
+ sub defined_and_nonempty
+ {
+- if (!defined(@_)) { return 0; }
++ if (!@_) { return 0; }
+ if (scalar(@_) == 0) { return 0; }
+
+ if (scalar(@_) == 1) {
diff --git a/app-shells/psh/psh-1.8.1-r1.ebuild
b/app-shells/psh/psh-1.8.1-r1.ebuild
index 8731c59..79a11d7 100644
--- a/app-shells/psh/psh-1.8.1-r1.ebuild
+++ b/app-shells/psh/psh-1.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,9 @@ KEYWORDS="amd64 ppc x86"
# Package warrants USE doc & examples
IUSE="readline"
-DEPEND=""
-RDEPEND="readline? (
+DEPEND="<dev-lang/perl-5.22.0"
+RDEPEND="<dev-lang/perl-5.22.0
+ readline? (
dev-perl/Term-ReadLine-Gnu
dev-perl/TermReadKey )"
diff --git a/app-shells/psh/psh-1.8.1-r1.ebuild
b/app-shells/psh/psh-1.8.1-r2.ebuild
similarity index 66%
copy from app-shells/psh/psh-1.8.1-r1.ebuild
copy to app-shells/psh/psh-1.8.1-r2.ebuild
index 8731c59..5a4e07a 100644
--- a/app-shells/psh/psh-1.8.1-r1.ebuild
+++ b/app-shells/psh/psh-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,20 +10,28 @@ DESCRIPTION="Combines the interactive nature of a Unix
shell with the power of P
HOMEPAGE="http://www.focusresearch.com/gregor/sw/psh/";
SRC_URI="http://www.focusresearch.com/gregor/download/${P}.tar.gz";
-LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
# Package warrants USE doc & examples
IUSE="readline"
-DEPEND=""
-RDEPEND="readline? (
- dev-perl/Term-ReadLine-Gnu
- dev-perl/TermReadKey )"
+RDEPEND="
+ readline? (
+ dev-perl/Term-ReadLine-Gnu
+ dev-perl/TermReadKey
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
SRC_TEST="do parallel"
myinst="SITEPREFIX=${D}/usr"
+PATCHES=(
+ "${FILESDIR}/${P}-defined-array.patch"
+)
+
src_install() {
perl-module_src_install
dodoc examples/complete-examples doc/*
