From cb7bcc894d9da062a55040a3d2cdc733bfe0fbc3 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Wed, 21 Mar 2018 21:16:28 +1300 Subject: [PATCH] dev-perl/WWW-Curl: EAPI6 + tests - EAPI6ify - Enable tests - Purge unwanted POD tests - Add network controls to network tests - Patchify dot-inc fix. Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 25 +++ .../WWW-Curl/files/WWW-Curl-4.17-dotinc.patch | 26 +++ .../files/WWW-Curl-4.17-networktests.patch | 190 ++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild create mode 100644 dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch create mode 100644 dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild new file mode 100644 index 000000000000..002c1a778c65 --- /dev/null +++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=SZBALINT +DIST_VERSION=4.17 +inherit perl-module + +DESCRIPTION="Perl extension interface for libcurl" + +LICENSE="|| ( MPL-1.0 MPL-1.1 MIT )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="net-misc/curl" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.150.0-curl-7.50.2.patch + "${FILESDIR}"/${PN}-4.17-dotinc.patch + "${FILESDIR}"/${PN}-4.17-networktests.patch +) +PERL_RM_FILES=("t/meta.t" "t/pod-coverage.t" "t/pod.t") diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch new file mode 100644 index 000000000000..bb6ea23ceb70 --- /dev/null +++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch @@ -0,0 +1,26 @@ +From 326705b559b7e488314a776d171aef40e687e91b Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Fri, 16 Jun 2017 13:42:13 +1200 +Subject: Fix for '.' in @INC removal on Perl 5.26+ + +Bug: https://rt.cpan.org/Ticket/Display.html?id=122110 +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index fc1a55a..b455410 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -1,7 +1,7 @@ + # Makefile.PL for Perl module WWW::Curl + # Check out the README file for more information. + +-use inc::Module::Install; ++use lib q[.]; use inc::Module::Install; + + name 'WWW-Curl'; + abstract 'Perl extension interface for libcurl'; +-- +2.16.2 + diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch new file mode 100644 index 000000000000..38bc8b4ecd2e --- /dev/null +++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch @@ -0,0 +1,190 @@ +From 7102fd54eb385920ddf41c59e1196fc221ad9ea2 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Wed, 21 Mar 2018 21:08:45 +1300 +Subject: Disable network tests w/ NO_NETWORK_TESTING set. + +Gentoo users can opt-in to these tests by doing: + + DIST_TEST_OVERRIDE="do network" + +Or Similar +--- + t/01basic.t | 6 ++++++ + t/02callbacks.t | 7 +++++++ + t/04abort-test.t | 7 +++++++ + t/05progress.t | 7 +++++++ + t/08ssl.t | 7 +++++++ + t/09times.t | 7 +++++++ + t/14duphandle.t | 7 ++++++- + t/15duphandle-callback.t | 7 ++++++- + t/18twinhandles.t | 7 ++++++- + t/21write-to-scalar.t | 6 ++++++ + 10 files changed, 65 insertions(+), 3 deletions(-) + +diff --git a/t/01basic.t b/t/01basic.t +index 93e12b1..77ca444 100644 +--- a/t/01basic.t ++++ b/t/01basic.t +@@ -1,5 +1,11 @@ + #!perl + ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} + use strict; + use warnings; + use Test::More tests => 19; +diff --git a/t/02callbacks.t b/t/02callbacks.t +index 76aff4f..344b4c5 100644 +--- a/t/02callbacks.t ++++ b/t/02callbacks.t +@@ -1,5 +1,12 @@ + #!perl + ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} ++ + use strict; + use warnings; + use Test::More tests => 7; +diff --git a/t/04abort-test.t b/t/04abort-test.t +index c653c49..dcba4fd 100644 +--- a/t/04abort-test.t ++++ b/t/04abort-test.t +@@ -1,5 +1,12 @@ + #!perl + ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} ++ + use strict; + use warnings; + use Test::More tests => 8; +diff --git a/t/05progress.t b/t/05progress.t +index 52129ea..25a08fa 100644 +--- a/t/05progress.t ++++ b/t/05progress.t +@@ -1,5 +1,12 @@ + #!perl + ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} ++ + use strict; + use warnings; + use Test::More tests => 16; +diff --git a/t/08ssl.t b/t/08ssl.t +index 7374e06..d332d37 100644 +--- a/t/08ssl.t ++++ b/t/08ssl.t +@@ -1,5 +1,12 @@ + #!perl + ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} ++ + use strict; + use warnings; + use Test::More; +diff --git a/t/09times.t b/t/09times.t +index 6b3c43a..49bf76a 100644 +--- a/t/09times.t ++++ b/t/09times.t +@@ -1,5 +1,12 @@ + #!perl + ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} ++ + use strict; + use warnings; + use Test::More tests => 19; +diff --git a/t/14duphandle.t b/t/14duphandle.t +index f56ac57..f4211d0 100644 +--- a/t/14duphandle.t ++++ b/t/14duphandle.t +@@ -1,5 +1,10 @@ + #!perl +- ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} + use strict; + use warnings; + use lib 'inc'; +diff --git a/t/15duphandle-callback.t b/t/15duphandle-callback.t +index 3c5ecd0..ee67b8a 100644 +--- a/t/15duphandle-callback.t ++++ b/t/15duphandle-callback.t +@@ -1,5 +1,10 @@ + #!perl +- ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} + use strict; + use warnings; + use lib 'inc'; +diff --git a/t/18twinhandles.t b/t/18twinhandles.t +index 5b0b86b..a6acdb7 100644 +--- a/t/18twinhandles.t ++++ b/t/18twinhandles.t +@@ -1,5 +1,10 @@ + #!perl +- ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} + use strict; + use warnings; + use Test::More tests => 12; +diff --git a/t/21write-to-scalar.t b/t/21write-to-scalar.t +index 85d916e..6b691b5 100644 +--- a/t/21write-to-scalar.t ++++ b/t/21write-to-scalar.t +@@ -1,4 +1,10 @@ + #!perl ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP NO_NETWORK_TESTING set"; ++ exit 0; ++ } ++} + use strict; + use warnings; + use Test::More 'no_plan'; +-- +2.16.2 + -- 2.26.2