[gentoo-commits] repo/gentoo:master commit in: dev-perl/Debug-Client/files/, dev-perl/Debug-Client/
commit: fb6893eaa60459793dc9061680cd1fd0440f Author: Kent Fredric gentoo org> AuthorDate: Thu Apr 12 08:29:45 2018 + Commit: Kent Fredric gentoo org> CommitDate: Sun Apr 15 08:36:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6893ea dev-perl/Debug-Client: Cleanup old Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild | 41 -- dev-perl/Debug-Client/Manifest | 1 - .../files/Debug-Client-0.30-no-dot-inc.patch | 534 - 3 files changed, 576 deletions(-) diff --git a/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild b/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild deleted file mode 100644 index 4aa9d2aeffe..000 --- a/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=MANWAR -DIST_VERSION=0.30 -inherit perl-module - -DESCRIPTION="Client side code for perl debugger" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND=" - >=virtual/perl-Carp-1.330.100 - >=virtual/perl-Exporter-5.700.0 - >=virtual/perl-IO-Socket-IP-0.290.0 - >=dev-perl/PadWalker-1.980.0 - >=virtual/perl-Term-ReadLine-1.140.0 - >=dev-perl/Term-ReadLine-Gnu-1.200.0 -" -DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.590.0 - test? ( - >=dev-perl/File-HomeDir-1.0.0 - >=virtual/perl-File-Temp-0.230.400 - >=virtual/perl-Scalar-List-Utils-1.380.0 - >=dev-perl/Test-CheckDeps-0.10.0 - >=dev-perl/Test-Class-0.420.0 - >=dev-perl/Test-Deep-0.112.0 - >=virtual/perl-Test-Simple-1.1.3 - >=dev-perl/Test-Requires-0.70.0 - >=virtual/perl-parent-0.228.0 - >=virtual/perl-version-0.990.800 - >=dev-perl/PadWalker-1.920.0 - >=dev-perl/Term-ReadLine-Perl-1.30.300 - ) -" -PATCHES=( "${FILESDIR}/${PN}-0.30-no-dot-inc.patch" ) diff --git a/dev-perl/Debug-Client/Manifest b/dev-perl/Debug-Client/Manifest index 89c410909a9..d990cc19b97 100644 --- a/dev-perl/Debug-Client/Manifest +++ b/dev-perl/Debug-Client/Manifest @@ -1,2 +1 @@ -DIST Debug-Client-0.30.tar.gz 41779 BLAKE2B 8a3d92f0119d729ef72d4ff3fcebeef90ffd7cc9cde570dcde43699d1021114aaf2a13b7274e0cbcaef483520880cd5fee00cd89bfcf8b88408b454a6f432881 SHA512 7de7abac46d6a7f7e1785921f69a23b4d92fa3fe03d0609d5354a0d3459c616213e7715237a8a0a1863363ba21e5ebd99c1f9fb8bf4f622b96aec3dd20eedaf9 DIST Debug-Client-0.31.tar.gz 41937 BLAKE2B 556d2e59616865a81766dcb7c0a91711c171f7db689492e04f3bf03f6410e3be6cc8f05ea61b40a06a837d3f2e26c66d124839a6895a15760fb8c5c92ca8c476 SHA512 7eed66e7698bb9feae8fe768af05399331cdc31dff3ce5e27331050b8a1bb69c081099ff69bd56345d1620605c31e5584a7442feefac50a495d0cff303a87439 diff --git a/dev-perl/Debug-Client/files/Debug-Client-0.30-no-dot-inc.patch b/dev-perl/Debug-Client/files/Debug-Client-0.30-no-dot-inc.patch deleted file mode 100644 index 4727a9a7a40..000 --- a/dev-perl/Debug-Client/files/Debug-Client-0.30-no-dot-inc.patch +++ /dev/null @@ -1,534 +0,0 @@ -From b49aa99cbf608072dd6969bd859765dbf4be71f5 Mon Sep 17 00:00:00 2001 -From: Kent Fredric-Date: Sat, 1 Jul 2017 12:21:16 +1200 -Subject: [PATCH] Fix broken loading of local modules under Perl 5.26 - -Perl 5.26 breaks the implication that: - - use inc::Module::Install; - use t::lib::Debugger; - -Will load: - - ./inc/Module/Install.pm - ./t/lib/Debugger.pm - -Respectively, due to '.' ceasing to be in @INC - -This fixes: -- Makefile.PL by re-inserting the '.' ( which is the only - thing that works, due to Module::Install shenanigans ). -- Tests by replacing "use" statements with equivalent "require" -statements. - -Some of the existing code ( eg: use_ok ) was already spurious and not -very smart, because calling ->import while being outside of BEGIN { } -has limited usefullness. - -But this was left with the semantically equivalent code that retains -the loading of the relative path. - -There are strategies that would be "nicer" than what I've done, -but they all wind up with you wanting to rename "Debugger.pm" to -something else, because: - - use lib "t/lib"; - use Debugger; - -Is going to give people a much different impression from either - - use t::lib::Debugger - -Or - - BEGIN { -require "./t/lib/Debugger.pm"; -t::lib::Debugger->import(); - } - -This closes https://github.com/PadreIDE/Debug-Client/issues/6 -PR: https://github.com/PadreIDE/Debug-Client/pull/7 - Changes | 2 ++ - Makefile.PL | 1 + - t/01-compile.t | 2 +- - t/08-io.t| 5 - - t/10-top_tail.t | 5 - - t/10-top_tail_old.t | 6 +- - t/11-add.t | 5 - - t/13-return.t| 5 - - t/14-run.t
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Debug-Client/files/, dev-perl/Debug-Client/
commit: 120dd1264fc3463f6ce7ee647448dbd7276e14eb Author: Kent Fredric gentoo org> AuthorDate: Sat Jul 1 00:59:07 2017 + Commit: Kent Fredric gentoo org> CommitDate: Sat Jul 1 00:59:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120dd126 dev-perl/Debug-Client: Fix test failures due to '.' in @INC ( bug #615722 ) - Communicates src_prepare hack to patch - Fixes test logic with patch to not fail as well ( submitted upstream ) Bug: https://bugs.gentoo.org/615722 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild | 7 +- .../files/Debug-Client-0.30-no-dot-inc.patch | 534 + 2 files changed, 535 insertions(+), 6 deletions(-) diff --git a/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild b/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild index 27b9217908b..4aa9d2aeffe 100644 --- a/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild +++ b/dev-perl/Debug-Client/Debug-Client-0.300.0.ebuild @@ -38,9 +38,4 @@ DEPEND="${RDEPEND} >=dev-perl/Term-ReadLine-Perl-1.30.300 ) " - -src_prepare() { - sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} +PATCHES=( "${FILESDIR}/${PN}-0.30-no-dot-inc.patch" ) diff --git a/dev-perl/Debug-Client/files/Debug-Client-0.30-no-dot-inc.patch b/dev-perl/Debug-Client/files/Debug-Client-0.30-no-dot-inc.patch new file mode 100644 index 000..4727a9a7a40 --- /dev/null +++ b/dev-perl/Debug-Client/files/Debug-Client-0.30-no-dot-inc.patch @@ -0,0 +1,534 @@ +From b49aa99cbf608072dd6969bd859765dbf4be71f5 Mon Sep 17 00:00:00 2001 +From: Kent Fredric+Date: Sat, 1 Jul 2017 12:21:16 +1200 +Subject: [PATCH] Fix broken loading of local modules under Perl 5.26 + +Perl 5.26 breaks the implication that: + + use inc::Module::Install; + use t::lib::Debugger; + +Will load: + + ./inc/Module/Install.pm + ./t/lib/Debugger.pm + +Respectively, due to '.' ceasing to be in @INC + +This fixes: +- Makefile.PL by re-inserting the '.' ( which is the only + thing that works, due to Module::Install shenanigans ). +- Tests by replacing "use" statements with equivalent "require" +statements. + +Some of the existing code ( eg: use_ok ) was already spurious and not +very smart, because calling ->import while being outside of BEGIN { } +has limited usefullness. + +But this was left with the semantically equivalent code that retains +the loading of the relative path. + +There are strategies that would be "nicer" than what I've done, +but they all wind up with you wanting to rename "Debugger.pm" to +something else, because: + + use lib "t/lib"; + use Debugger; + +Is going to give people a much different impression from either + + use t::lib::Debugger + +Or + + BEGIN { +require "./t/lib/Debugger.pm"; +t::lib::Debugger->import(); + } + +This closes https://github.com/PadreIDE/Debug-Client/issues/6 +PR: https://github.com/PadreIDE/Debug-Client/pull/7 +--- + Changes | 2 ++ + Makefile.PL | 1 + + t/01-compile.t | 2 +- + t/08-io.t| 5 - + t/10-top_tail.t | 5 - + t/10-top_tail_old.t | 6 +- + t/11-add.t | 5 - + t/13-return.t| 5 - + t/14-run.t | 5 - + t/15-run_to_line.t | 5 - + t/16-run_to_sub.t| 5 - + t/17-stepin.t| 5 - + t/18-stepout.t | 5 - + t/19-stepover.t | 5 - + t/20-get_value.t | 5 - + t/21-toggle_trace.t | 5 - + t/22-subnames.t | 5 - + t/23-breakpoints.t | 5 - + t/24-y_zero.t| 5 - + t/25-get_v_vars.t| 5 - + t/26-get_x_vars.t| 5 - + t/27-get_p_exp.t | 5 - + t/28-get_h_var.t | 5 - + t/29-options.t | 5 - + t/40-test_1415-old.t | 5 - + t/40-test_1415.t | 5 - + t/99-perldb.t| 5 - + t/lib/Test_1415.pm | 5 - + t/lib/Top_Tail.pm| 3 ++- + 29 files changed, 107 insertions(+), 27 deletions(-) + +diff --git a/Changes b/Changes +index 104d73f..f9b1090 100644 +--- a/Changes b/Changes +@@ -1,5 +1,7 @@ + Changes for Debug::Client + ++ - Fix build and test failures under Perl 5.26 when '.' is not in @INC (KENTNL, PR #7) ++ + 0.30 2017-06-19 + - Merged PR #5 (Fixed test failure due to perl regression fix in 5.21.3), thanks @TBSliver. + +diff --git a/Makefile.PL b/Makefile.PL +index 8702771..74201e3 100644 +--- a/Makefile.PL b/Makefile.PL +@@ -1,3 +1,4 @@ ++use lib '.'; + use inc::Module::Install 1.08; + + name 'Debug-Client'; +diff --git a/t/01-compile.t b/t/01-compile.t +index 73eb289..a6130a5 100644 +--- a/t/01-compile.t b/t/01-compile.t +@@ -8,7 +8,7 @@ use Test::More tests => 18; + + BEGIN { + use_ok('Debug::Client'); +- use_ok('t::lib::Debugger'); ++ require_ok('./t/lib/Debugger.pm'); + +