| 1 |
commit: f939882e96e9020835ec6d883a5a8e4e4e1ad971 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 3 17:19:39 2015 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 3 17:20:09 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f939882e |
| 7 |
|
| 8 |
app-shells/psh: Add compatibility patch for Perl 5.22; other QA cleanups |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
app-shells/psh/files/psh-1.8.1-defined-array.patch | 11 +++++++++++ |
| 13 |
app-shells/psh/psh-1.8.1-r1.ebuild | 7 ++++--- |
| 14 |
.../{psh-1.8.1-r1.ebuild => psh-1.8.1-r2.ebuild} | 22 +++++++++++++++------- |
| 15 |
3 files changed, 30 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..e25c4df |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-shells/psh/files/psh-1.8.1-defined-array.patch |
| 22 |
@@ -0,0 +1,11 @@ |
| 23 |
+--- lib/Psh.pm 2007-07-21 16:40:44.000000000 +1200 |
| 24 |
++++ lib/Psh.pm 2015-07-18 05:30:29.840928282 +1200 |
| 25 |
+@@ -367,7 +367,7 @@ |
| 26 |
+ |
| 27 |
+ sub defined_and_nonempty |
| 28 |
+ { |
| 29 |
+- if (!defined(@_)) { return 0; } |
| 30 |
++ if (!@_) { return 0; } |
| 31 |
+ if (scalar(@_) == 0) { return 0; } |
| 32 |
+ |
| 33 |
+ if (scalar(@_) == 1) { |
| 34 |
|
| 35 |
diff --git a/app-shells/psh/psh-1.8.1-r1.ebuild b/app-shells/psh/psh-1.8.1-r1.ebuild |
| 36 |
index 8731c59..79a11d7 100644 |
| 37 |
--- a/app-shells/psh/psh-1.8.1-r1.ebuild |
| 38 |
+++ b/app-shells/psh/psh-1.8.1-r1.ebuild |
| 39 |
@@ -1,4 +1,4 @@ |
| 40 |
-# Copyright 1999-2013 Gentoo Foundation |
| 41 |
+# Copyright 1999-2015 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
# $Id$ |
| 44 |
|
| 45 |
@@ -16,8 +16,9 @@ KEYWORDS="amd64 ppc x86" |
| 46 |
# Package warrants USE doc & examples |
| 47 |
IUSE="readline" |
| 48 |
|
| 49 |
-DEPEND="" |
| 50 |
-RDEPEND="readline? ( |
| 51 |
+DEPEND="<dev-lang/perl-5.22.0" |
| 52 |
+RDEPEND="<dev-lang/perl-5.22.0 |
| 53 |
+ readline? ( |
| 54 |
dev-perl/Term-ReadLine-Gnu |
| 55 |
dev-perl/TermReadKey )" |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/app-shells/psh/psh-1.8.1-r1.ebuild b/app-shells/psh/psh-1.8.1-r2.ebuild |
| 59 |
similarity index 66% |
| 60 |
copy from app-shells/psh/psh-1.8.1-r1.ebuild |
| 61 |
copy to app-shells/psh/psh-1.8.1-r2.ebuild |
| 62 |
index 8731c59..5a4e07a 100644 |
| 63 |
--- a/app-shells/psh/psh-1.8.1-r1.ebuild |
| 64 |
+++ b/app-shells/psh/psh-1.8.1-r2.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2013 Gentoo Foundation |
| 67 |
+# Copyright 1999-2015 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
# $Id$ |
| 70 |
|
| 71 |
@@ -10,20 +10,28 @@ DESCRIPTION="Combines the interactive nature of a Unix shell with the power of P |
| 72 |
HOMEPAGE="http://www.focusresearch.com/gregor/sw/psh/" |
| 73 |
SRC_URI="http://www.focusresearch.com/gregor/download/${P}.tar.gz" |
| 74 |
|
| 75 |
-LICENSE="|| ( Artistic GPL-2 )" |
| 76 |
SLOT="0" |
| 77 |
-KEYWORDS="amd64 ppc x86" |
| 78 |
+KEYWORDS="~amd64 ~ppc ~x86" |
| 79 |
# Package warrants USE doc & examples |
| 80 |
IUSE="readline" |
| 81 |
|
| 82 |
-DEPEND="" |
| 83 |
-RDEPEND="readline? ( |
| 84 |
- dev-perl/Term-ReadLine-Gnu |
| 85 |
- dev-perl/TermReadKey )" |
| 86 |
+RDEPEND=" |
| 87 |
+ readline? ( |
| 88 |
+ dev-perl/Term-ReadLine-Gnu |
| 89 |
+ dev-perl/TermReadKey |
| 90 |
+ ) |
| 91 |
+" |
| 92 |
+DEPEND="${RDEPEND} |
| 93 |
+ virtual/perl-ExtUtils-MakeMaker |
| 94 |
+" |
| 95 |
|
| 96 |
SRC_TEST="do parallel" |
| 97 |
myinst="SITEPREFIX=${D}/usr" |
| 98 |
|
| 99 |
+PATCHES=( |
| 100 |
+ "${FILESDIR}/${P}-defined-array.patch" |
| 101 |
+) |
| 102 |
+ |
| 103 |
src_install() { |
| 104 |
perl-module_src_install |
| 105 |
dodoc examples/complete-examples doc/* |
Archives