diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-perl/WWW-Curl | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-perl/WWW-Curl')
-rw-r--r-- | dev-perl/WWW-Curl/Manifest | 7 | ||||
-rw-r--r-- | dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 25 | ||||
-rw-r--r-- | dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild | 28 | ||||
-rw-r--r-- | dev-perl/WWW-Curl/files/WWW-Curl-4.150.0-curl-7.50.2.patch | 40 | ||||
-rw-r--r-- | dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch | 26 | ||||
-rw-r--r-- | dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch | 190 | ||||
-rw-r--r-- | dev-perl/WWW-Curl/metadata.xml | 16 |
7 files changed, 332 insertions, 0 deletions
diff --git a/dev-perl/WWW-Curl/Manifest b/dev-perl/WWW-Curl/Manifest new file mode 100644 index 000000000000..5c5cbca3b3c1 --- /dev/null +++ b/dev-perl/WWW-Curl/Manifest @@ -0,0 +1,7 @@ +AUX WWW-Curl-4.150.0-curl-7.50.2.patch 1233 BLAKE2B 9f5b17b559191481b688f525a6d51f7d8dbea778f7fd5e9a1dfca4db48b4d56ef2e0a1c04d66f6d41cf21d5255efbe7870bcb12196b47274d75ca95f0b982c64 SHA512 9a65b26ec3d3121c526b3d06ac33ce4b6dd6bd30e19799b8e0601b972712739f03b40584466fa0e32d91d226077152f5f469efd6f810052768fa52e1a5c7e719 +AUX WWW-Curl-4.17-dotinc.patch 695 BLAKE2B fe6aeb27706b1f6dec9db500ce527a980a1d4048a2798bb2e7e8f690ad42b19b92f31e64f60c03d12450f3652d74462f40e03bb447b47eb5dc018f6c8d7700c3 SHA512 c81ea9d16269f60a260401731552b875e94b83840fd8914371cff74022114110e8c99deb2e94aadce61942e33988165a025e5f2524d219e989f8c26e2db7d199 +AUX WWW-Curl-4.17-networktests.patch 3938 BLAKE2B 7f2af37af8c1cf619c9c444cc64969f60083e798fc7f25c107a2fd2ace565004b104d5499c7a958b8e995d51de3d193b0aec67554810441af221ecd0ca0bf1ee SHA512 126e5592e299dea7feeeddd6d68e9d880106c5f55fabab00f2629a45080f0473d0b0cca8edc62d25fb84facfd7b800ab104b83abd4399d3e5dae82b80f11aa4a +DIST WWW-Curl-4.17.tar.gz 50917 BLAKE2B 6f07570fb0db535b506b8e4a879a05f1901d4c1a2c0fb8c775ae330fb3ea44c523d921494d30f9e02b8eb84e4a006eb53e8594bbce6615ad162090b0d422edfb SHA512 bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6 +EBUILD WWW-Curl-4.170.0-r1.ebuild 562 BLAKE2B 56c628f15f752a4bec43fd082a86fdcfa1f120a3e2ced871ad5aeb9a5f067e20cc6a15a84db92af881864c8982d195790df2f9f2934d45f622c14b22d2f640dd SHA512 3057b33bef600eeaf2cff8a3dcc092fd36a71be03ebc4aa2125a36877e362f1b045987da5027a133217f9dee2047fd2910858d470b30581a58b8ca8bc0bfcfcc +EBUILD WWW-Curl-4.170.0.ebuild 630 BLAKE2B 3790e3d7520b2c52d68f6c285f4631d434f16f696e94f9e0982cc88a3e65aec251cdf9960c066bb817c3d8990dd80b9cb3e9c322bd4036690da3bb2a22812950 SHA512 a3470fafed67d177874d0348058f3bee2a0d34184cdfb619018092f72bf0f7368cafd323558ebfd1faf39643b8d22d1a4a61284362c57431243865dd80d2b3f8 +MISC metadata.xml 638 BLAKE2B 7bb65ae85c64c8602486d0a1d279abe7ce30e89c9ef9705b5fffe7e890fc72f16a95aefeae5f91a8fdb634e842e311980bc001ef1a53998b057c024710745a06 SHA512 3836ea633a8e613b67fad2aee01058fb3c67f7a625f98d8da5d0c72a23b643abebc0378d1933320b64cc7a171b80818a611e8362ad8be56548785c1e6300086b 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/WWW-Curl-4.170.0.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild new file mode 100644 index 000000000000..8a61bc797f13 --- /dev/null +++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +MODULE_AUTHOR=SZBALINT +MODULE_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}" + +SRC_TEST=online + +PATCHES=("${FILESDIR}"/${PN}-4.150.0-curl-7.50.2.patch) + +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 +} diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.150.0-curl-7.50.2.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.150.0-curl-7.50.2.patch new file mode 100644 index 000000000000..2fecfce621a8 --- /dev/null +++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.150.0-curl-7.50.2.patch @@ -0,0 +1,40 @@ +curl-7.50.2 introduced a #define without integer value: + + #ifdef CURL_NO_OLDIES + #define CURL_STRICTER + #endif + +Heuristics in 'Makefile.PL' assumes all defines in form of + #define CURL_<something> <an-expression> +and generates a symbol lookup table in 'curlopt-constants.c' +as: + + static int + constant(const char *name) + { + errno = 0; + + if (strncmp(name, "CURL_", 5) == 0) { + name += 5; + switch (*name) { + ... + case 'S': + if (strEQ(name, "STRICTER")) return CURL_STRICTER; +Which is not valid C: + curlopt-constants.c:128:49: error: ‘CURL_STRICTER’ undeclared (first use in this function) + if (strEQ(name, "STRICTER")) return CURL_STRICTER; + ^~~~~~~~~~~~~ +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..fc1a55a 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -122,2 +122,9 @@ if (!defined($curl_h)) { + while(<H>) { ++ # Skip defines without values like: ++ # #define CURL_STRICTER ++ if (/^#define (CURL[A-Za-z0-9_]*)$/) { ++ chomp; ++ warn "Skipping '$_': does not define a symbol"; ++ next; ++ } + if (/^#define (CURL[A-Za-z0-9_]*)/) { 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 <kentnl@gentoo.org> +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 <kentnl@gentoo.org> +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 + diff --git a/dev-perl/WWW-Curl/metadata.xml b/dev-perl/WWW-Curl/metadata.xml new file mode 100644 index 000000000000..64621d09bd32 --- /dev/null +++ b/dev-perl/WWW-Curl/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> + <upstream> + <remote-id type="cpan">WWW-Curl</remote-id> + <remote-id type="cpan-module">WWW::Curl</remote-id> + <remote-id type="cpan-module">WWW::Curl::Easy</remote-id> + <remote-id type="cpan-module">WWW::Curl::Form</remote-id> + <remote-id type="cpan-module">WWW::Curl::Multi</remote-id> + <remote-id type="cpan-module">WWW::Curl::Share</remote-id> + </upstream> +</pkgmetadata> |