From f9f48bd53a97ffa57155009f9612cb8420c63377 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Tue, 20 Jun 2017 03:18:10 +1200 Subject: dev-perl/PPI: Fix test failure without '.' in @INC - Apply patch supplied upstream for t/marpa.t - Fix wrongly normalized version. Package-Manager: Portage-2.3.6, Repoman-2.3.2 --- dev-perl/PPI/PPI-1.224.0.ebuild | 39 ++++++++++++++++++++++ dev-perl/PPI/PPI-1.224.ebuild | 38 --------------------- .../PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch | 27 +++++++++++++++ dev-perl/PPI/metadata.xml | 1 - 4 files changed, 66 insertions(+), 39 deletions(-) create mode 100644 dev-perl/PPI/PPI-1.224.0.ebuild delete mode 100644 dev-perl/PPI/PPI-1.224.ebuild create mode 100644 dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch diff --git a/dev-perl/PPI/PPI-1.224.0.ebuild b/dev-perl/PPI/PPI-1.224.0.ebuild new file mode 100644 index 000000000000..2af6125c1c56 --- /dev/null +++ b/dev-perl/PPI/PPI-1.224.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=MITHALDU +DIST_VERSION=1.224 +inherit perl-module + +DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +IUSE="test" + +RDEPEND=" + >=dev-perl/Clone-0.300.0 + >=virtual/perl-Digest-MD5-2.350.0 + >=virtual/perl-File-Spec-3.270.100 + >=dev-perl/IO-String-1.70.0 + >=dev-perl/List-MoreUtils-0.160.0 + >=virtual/perl-Scalar-List-Utils-1.330.0 + >=dev-perl/Params-Util-1.000.0 + >=virtual/perl-Storable-2.170.0 + dev-perl/Task-Weaken +" +DEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.590.0 + test? ( + >=dev-perl/Class-Inspector-1.220.0 + >=dev-perl/File-Remove-1.420.0 + dev-perl/Test-Deep + >=virtual/perl-Test-Simple-0.860.0 + >=dev-perl/Test-Object-0.70.0 + >=dev-perl/Test-SubCalls-1.70.0 + >=dev-perl/Test-Warn-0.300.0 + ) +" +PATCHES=("${FILESDIR}/${P}-t-marpa-dot-inc.patch") diff --git a/dev-perl/PPI/PPI-1.224.ebuild b/dev-perl/PPI/PPI-1.224.ebuild deleted file mode 100644 index 95145cb7dadd..000000000000 --- a/dev-perl/PPI/PPI-1.224.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=MITHALDU -DIST_VERSION=1.224 -inherit perl-module - -DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="test" - -RDEPEND=" - >=dev-perl/Clone-0.300.0 - >=virtual/perl-Digest-MD5-2.350.0 - >=virtual/perl-File-Spec-3.270.100 - >=dev-perl/IO-String-1.70.0 - >=dev-perl/List-MoreUtils-0.160.0 - >=virtual/perl-Scalar-List-Utils-1.330.0 - >=dev-perl/Params-Util-1.000.0 - >=virtual/perl-Storable-2.170.0 - dev-perl/Task-Weaken -" -DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.590.0 - test? ( - >=dev-perl/Class-Inspector-1.220.0 - >=dev-perl/File-Remove-1.420.0 - dev-perl/Test-Deep - >=virtual/perl-Test-Simple-0.860.0 - >=dev-perl/Test-Object-0.70.0 - >=dev-perl/Test-SubCalls-1.70.0 - >=dev-perl/Test-Warn-0.300.0 - ) -" diff --git a/dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch b/dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch new file mode 100644 index 000000000000..2a02e1d71dc9 --- /dev/null +++ b/dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch @@ -0,0 +1,27 @@ +From 74e2e77fdce3e2f366342ad736c25e49379d2013 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Tue, 20 Jun 2017 03:04:48 +1200 +Subject: [PATCH] t/marpa.t: Fix test reliance on '.' in @INC + +Fixes https://github.com/adamkennedy/PPI/issues/200 +--- + t/marpa.t | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/t/marpa.t b/t/marpa.t +index a25fc2e..6e79003 100644 +--- a/t/marpa.t ++++ b/t/marpa.t +@@ -2,7 +2,8 @@ + + # Unit testing for PPI::Token::Unknown + +-use t::lib::PPI::Test::pragmas; ++use lib 't/lib'; ++use PPI::Test::pragmas; + use Test::More tests => 23 + ( $ENV{AUTHOR_TESTING} ? 1 : 0 ); + use B 'perlstring'; + +-- +2.13.1 + diff --git a/dev-perl/PPI/metadata.xml b/dev-perl/PPI/metadata.xml index 8f20830635c0..b16f7f1afbb9 100644 --- a/dev-perl/PPI/metadata.xml +++ b/dev-perl/PPI/metadata.xml @@ -17,7 +17,6 @@ PPI::Element PPI::Exception PPI::Exception::ParserRejection - PPI::Exception::ParserTimeout PPI::Find PPI::Lexer PPI::Node -- cgit v1.2.3-65-gdbad