* [gentoo-commits] repo/gentoo:master commit in: app-shells/psh/, app-shells/psh/files/
@ 2015-12-03 17:20 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2015-12-03 17:20 UTC (permalink / raw
To: gentoo-commits
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/*
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/psh/, app-shells/psh/files/
@ 2017-01-22 10:44 Kent Fredric
0 siblings, 0 replies; 3+ messages in thread
From: Kent Fredric @ 2017-01-22 10:44 UTC (permalink / raw
To: gentoo-commits
commit: 95e18c72344745e8f9c89c1737b92d0a3a45fbc7
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 10:41:55 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 10:44:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e18c72
app-shells/psh: -r3 bump to use Github for SRC_URI + Fixes
- EAPI6
- Use Github instead of dead mirror
- Fix some basic bugs
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-shells/psh/Manifest | 1 +
.../files/psh-1.8.1-r3-array-ref-deprecated.patch | 37 +++++++++++++++++++
.../psh/files/psh-1.8.1-r3-defined-array.patch | 11 ++++++
app-shells/psh/psh-1.8.1-r3.ebuild | 41 ++++++++++++++++++++++
4 files changed, 90 insertions(+)
diff --git a/app-shells/psh/Manifest b/app-shells/psh/Manifest
index 609c5dc..088e20d 100644
--- a/app-shells/psh/Manifest
+++ b/app-shells/psh/Manifest
@@ -1 +1,2 @@
+DIST psh-1.8.1-r3.tar.gz 120552 SHA256 c8414c4381a6a715800a7b59c39276d1f19087bf2e0b6a9b950af4feaf7701a8 SHA512 01e9def98fa89f347ad540cbb0584773de4b7e11595432d7b8e1f1a563725004b898a5fd30f39b01de661ac6ec3274b6cfecdbd7f0bec3fe175119493163ca9a WHIRLPOOL 378aba28927a747560fa8cf6513900f93e473d1d2e5bcff4e87ed2d8c9c84daab1a86887aa2d774d3616ef541e23607bc59123d4adc584b66fbdfa4e75fa4d2d
DIST psh-1.8.1.tar.gz 120036 SHA256 9c6d276f98a3e62086bda76e1eddc0eaba6b003b903c94261bd53e80700ef88f SHA512 20ac6d6d39ff0820eee6314e73c02f18b9362ef3dde6e2c6cd68094d1ebc435d26bf3528e858042b95372916821077e5a4e5d4b376aac68caf6d8fc629a61c07 WHIRLPOOL 10d2005aa0a551823d82e475bb10d7619dfde21fc39dbee37989e08c4f8fd59b0a44ba3ea70157e55db80388ff4af099afe073c91bf0f3e95065e62f97539c95
diff --git a/app-shells/psh/files/psh-1.8.1-r3-array-ref-deprecated.patch b/app-shells/psh/files/psh-1.8.1-r3-array-ref-deprecated.patch
new file mode 100644
index 00000000..13c4970
--- /dev/null
+++ b/app-shells/psh/files/psh-1.8.1-r3-array-ref-deprecated.patch
@@ -0,0 +1,37 @@
+From fec038344e05b4fe1b369a979b9ab224343297dd Mon Sep 17 00:00:00 2001
+From: r <rocky@gnu.org>
+Date: Sun, 25 Mar 2012 18:17:45 -0400
+Subject: [PATCH] Get rid of 'Using an array as a reference is deprecated in
+ Psh/StrategyBunch.pm'
+
+---
+ lib/Psh/Strategy/Darwin_apps.pm | 2 +-
+ lib/Psh/Strategy/Executable.pm | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Psh/Strategy/Darwin_apps.pm b/lib/Psh/Strategy/Darwin_apps.pm
+index cbcbb1d..8c4879e 100644
+--- a/lib/Psh/Strategy/Darwin_apps.pm
++++ b/lib/Psh/Strategy/Darwin_apps.pm
+@@ -44,7 +44,7 @@ sub _recursive_search {
+
+
+ sub applies {
+- my $com= @{$_[2]}->[0];
++ my $com= $_[2]->[0];
+ if ($com !~ m/$Psh::which_regexp/) { return ''; }
+ my $path=$ENV{APP_PATH}||'/Applications';
+ my @path= split /:/, $path;
+diff --git a/lib/Psh/Strategy/Executable.pm b/lib/Psh/Strategy/Executable.pm
+index 7d09119..7767082 100644
+--- a/lib/Psh/Strategy/Executable.pm
++++ b/lib/Psh/Strategy/Executable.pm
+@@ -24,7 +24,7 @@ sub runs_before {
+ }
+
+ sub applies {
+- my $com= @{$_[2]}->[0];
++ my $com= $_[2]->[0];
+ my $executable= Psh::Util::which($com);
+ return $executable if defined $executable;
+ return '';
diff --git a/app-shells/psh/files/psh-1.8.1-r3-defined-array.patch b/app-shells/psh/files/psh-1.8.1-r3-defined-array.patch
new file mode 100644
index 00000000..660ca34
--- /dev/null
+++ b/app-shells/psh/files/psh-1.8.1-r3-defined-array.patch
@@ -0,0 +1,11 @@
+--- a/lib/Psh.pm 2007-07-21 16:40:44.000000000 +1200
++++ b/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-r3.ebuild b/app-shells/psh/psh-1.8.1-r3.ebuild
new file mode 100644
index 00000000..71fd3ce
--- /dev/null
+++ b/app-shells/psh/psh-1.8.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+DIST_EXAMPLES=( "examples/*" )
+
+inherit perl-module
+
+DESCRIPTION="Combines the interactive nature of a Unix shell with the power of Perl"
+HOMEPAGE="https://gnp.github.io/psh/"
+SRC_URI="https://github.com/gnp/psh/archive/${P}.tar.gz -> ${PF}.tar.gz"
+S="${WORKDIR}/${PN}-${P}" # github--
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="readline"
+
+RDEPEND="
+ readline? (
+ dev-perl/Term-ReadLine-Gnu
+ dev-perl/TermReadKey
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+
+myinst="SITEPREFIX=${D}/usr"
+
+PATCHES=(
+ "${FILESDIR}/${PF}-defined-array.patch"
+ "${FILESDIR}/${PF}-array-ref-deprecated.patch"
+)
+
+src_install() {
+ perl-module_src_install
+ docompress -x "/usr/share/doc/${PF}/pod"
+ docinto pod/
+ dodoc -r doc/*
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/psh/, app-shells/psh/files/
@ 2017-01-22 12:18 Kent Fredric
0 siblings, 0 replies; 3+ messages in thread
From: Kent Fredric @ 2017-01-22 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 298cb79b8a590d92e03d43c3a6d63b95a0a9656f
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 12:16:56 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 12:17:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=298cb79b
app-shells/psh: Remove old/stable
No reverse dependencies require it being stable, and its state with
recent perls is a bit dodgy.
Newer patched versions bring better support for Perl, but still
needs much improvement upstream.
Killing blockers is required to purge old versions of Perl
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-shells/psh/Manifest | 1 -
app-shells/psh/files/psh-1.8.1-defined-array.patch | 11 -------
app-shells/psh/psh-1.8.1-r1.ebuild | 31 ------------------
app-shells/psh/psh-1.8.1-r2.ebuild | 38 ----------------------
4 files changed, 81 deletions(-)
diff --git a/app-shells/psh/Manifest b/app-shells/psh/Manifest
index 088e20d..7f0495d 100644
--- a/app-shells/psh/Manifest
+++ b/app-shells/psh/Manifest
@@ -1,2 +1 @@
DIST psh-1.8.1-r3.tar.gz 120552 SHA256 c8414c4381a6a715800a7b59c39276d1f19087bf2e0b6a9b950af4feaf7701a8 SHA512 01e9def98fa89f347ad540cbb0584773de4b7e11595432d7b8e1f1a563725004b898a5fd30f39b01de661ac6ec3274b6cfecdbd7f0bec3fe175119493163ca9a WHIRLPOOL 378aba28927a747560fa8cf6513900f93e473d1d2e5bcff4e87ed2d8c9c84daab1a86887aa2d774d3616ef541e23607bc59123d4adc584b66fbdfa4e75fa4d2d
-DIST psh-1.8.1.tar.gz 120036 SHA256 9c6d276f98a3e62086bda76e1eddc0eaba6b003b903c94261bd53e80700ef88f SHA512 20ac6d6d39ff0820eee6314e73c02f18b9362ef3dde6e2c6cd68094d1ebc435d26bf3528e858042b95372916821077e5a4e5d4b376aac68caf6d8fc629a61c07 WHIRLPOOL 10d2005aa0a551823d82e475bb10d7619dfde21fc39dbee37989e08c4f8fd59b0a44ba3ea70157e55db80388ff4af099afe073c91bf0f3e95065e62f97539c95
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
deleted file mode 100644
index e25c4df..00000000
--- a/app-shells/psh/files/psh-1.8.1-defined-array.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index fbcf4aa..00000000
--- a/app-shells/psh/psh-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Combines the interactive nature of a Unix shell with the power of Perl"
-HOMEPAGE="https://gnp.github.io/psh/"
-SRC_URI="http://www.focusresearch.com/gregor/download/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-# Package warrants USE doc & examples
-IUSE="readline"
-
-DEPEND="<dev-lang/perl-5.22.0"
-RDEPEND="<dev-lang/perl-5.22.0
- readline? (
- dev-perl/Term-ReadLine-Gnu
- dev-perl/TermReadKey )"
-
-SRC_TEST="do parallel"
-myinst="SITEPREFIX=${D}/usr"
-
-src_install() {
- perl-module_src_install
- dodoc examples/complete-examples doc/*
-}
diff --git a/app-shells/psh/psh-1.8.1-r2.ebuild b/app-shells/psh/psh-1.8.1-r2.ebuild
deleted file mode 100644
index 3ee78cc..00000000
--- a/app-shells/psh/psh-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Combines the interactive nature of a Unix shell with the power of Perl"
-HOMEPAGE="https://gnp.github.io/psh/"
-SRC_URI="http://www.focusresearch.com/gregor/download/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-# Package warrants USE doc & examples
-IUSE="readline"
-
-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/*
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-22 12:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-22 12:18 [gentoo-commits] repo/gentoo:master commit in: app-shells/psh/, app-shells/psh/files/ Kent Fredric
-- strict thread matches above, loose matches on Subject: below --
2017-01-22 10:44 Kent Fredric
2015-12-03 17:20 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox