Merge remote-tracking branch 'github/pr/951'

3 files changed, 79 insertions, 0 deletions

diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index e34d2568b5e7..751c5a8518cd 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -1 +1,2 @@
 DIST Net-HTTP-6.06.tar.gz 15609 SHA256 1d4e3ced899efad12431564d93abe73dd2a1224aa208af5f4ab829e7a2dd39d4 SHA512 fefa06eb960b354ec5f760b720d2d7e29820fbc5aad8fd0dbc8a63ec6a7cda0000b8449cce83e38d2f4bf03bf8aa0aa19351c7f5508cb435bb9b938b34ab9e53 WHIRLPOOL 4c2ff0ed5b4fb1299b5928a8dc868fac894fa9992d4e1fa6dc0624e0ebaee4edb28cd58f817696462fa271ecf45a3085646312f7c89d729d45fdedf13484546f
+DIST Net-HTTP-6.09.tar.gz 17686 SHA256 52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d SHA512 ae36c8367206f18190237f9c6db417054b78f99cfa79cc651550d3612505faf9d31e415c8b32e7f87f4fd389ccaa0e23f62c3781f6f27485b7296b2fe48d7e45 WHIRLPOOL e29a0193e607507538d4e6c7e08808a4c5c8a58d035fa3054a82fc9e148105961de8a8b12c5dff485246a0f4b97075832785ddfa992cce7720d7e56047ef631c
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.90.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.90.0.ebuild
new file mode 100644
index 000000000000..8257b714df01
--- /dev/null
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.90.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=6.09
+inherit perl-module
+
+DESCRIPTION="Low-level HTTP connection (client)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal"
+
+PATCHES=( "${FILESDIR}/networktest.patch" )
+RDEPEND="
+	!minimal? (
+		>=dev-perl/IO-Socket-SSL-1.380.0
+	)
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-IO
+	virtual/perl-IO-Compress
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-HTTP/files/networktest.patch b/dev-perl/Net-HTTP/files/networktest.patch
new file mode 100644
index 000000000000..c1789424f0ce
--- /dev/null
+++ b/dev-perl/Net-HTTP/files/networktest.patch
@@ -0,0 +1,48 @@
+diff -Naur Net-HTTP-6.09/Makefile.PL Net-HTTP-6.09b/Makefile.PL
+--- Net-HTTP-6.09/Makefile.PL	2015-05-02 03:08:06.000000000 +0000
++++ Net-HTTP-6.09b/Makefile.PL	2016-03-01 03:52:01.412179572 +0000
+@@ -3,16 +3,6 @@
+ require 5.006002;
+ use strict;
+ use ExtUtils::MakeMaker;
+-use Getopt::Long qw(GetOptions);
+-GetOptions(\my %opt, 'live-tests',) or warn "Usage: $0 [--live-tests]\n";
+-
+-my $flag_file = "t/LIVE_TESTS";
+-if ($opt{"live-tests"}) {
+-    open(my $fh, ">", $flag_file) || die;
+-}
+-else {
+-    unlink($flag_file);
+-}
+ 
+ WriteMakefile(
+     NAME => 'Net::HTTP',
+diff -Naur Net-HTTP-6.09/t/apache-https.t Net-HTTP-6.09b/t/apache-https.t
+--- Net-HTTP-6.09/t/apache-https.t	2015-05-01 18:12:51.000000000 +0000
++++ Net-HTTP-6.09b/t/apache-https.t	2016-03-01 03:51:19.511547486 +0000
+@@ -1,8 +1,8 @@
+ #!perl -w
+ 
+ BEGIN {
+-    unless (-f "t/LIVE_TESTS" || -f "LIVE_TESTS") {
+-	print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n";
++  if ($ENV{NO_NETWORK_TESTING}) {
++	print "1..0 # SKIP Live tests disabled\n";
+ 	exit;
+     }
+     eval {
+diff -Naur Net-HTTP-6.09/t/apache.t Net-HTTP-6.09b/t/apache.t
+--- Net-HTTP-6.09/t/apache.t	2015-05-01 18:12:51.000000000 +0000
++++ Net-HTTP-6.09b/t/apache.t	2016-03-01 04:01:59.267131963 +0000
+@@ -1,8 +1,8 @@
+ #!perl -w
+ 
+ BEGIN {
+-    unless (-f "t/LIVE_TESTS" || -f "LIVE_TESTS") {
+-	print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n";
++  if( $ENV{NO_NETWORK_TESTING} ) {
++	print "1..0 # SKIP Live tests disabled\n";
+ 	exit;
+     }
+     eval {