gentoo resync : 11.07.2019

4 files changed, 111 insertions, 0 deletions

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 2e69d1f07869..b3223279ec97 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,8 +1,12 @@
 AUX Net-SSLeay-1.82-fix-libdir.patch 1060 BLAKE2B d348bc4bbf3b1dcf05b676e3a28c23e04f5331bcca9f03395d78e1ddf5ea2f321dcc9663775ec979d140f66fcffdf3e051deedd382d9bb5026e5c322192f8b10 SHA512 8cd2b57fd5adfe2d624308e823e54426d14418fa394be6030b16e089906718ed9fb5588b8998f7bb0f25216ceb88951cc0608e82eeafbf274be3af9887c56ad8
 AUX Net-SSLeay-1.82-fix-network-tests.patch 1033 BLAKE2B 88978bf64b1f6e0fef97176253aa8f20187f74611d5e6121b8ce538d99c31516d4855bada6ecebf753906c65bb96a4abf37f9057934cfbe143a8185599ba48cd SHA512 caf76f1173ebc00e7a5edba5fa19ce25fd403dc9a35402fe2d399197805eae8e558b57c2bc313f7f1dee16ece03a3ed9146456f884890587488647f9d7c84673
 AUX Net-SSLeay-1.82-respect-cflags.patch 902 BLAKE2B e95a0c49ba70d820ff419a2ef7fe1d5c23477ef5ad075a03111b3431cf7b3cdc22fb26aefe3af886ce6f7d5b0fc309eb01843c2645b98d854759318ae7912898 SHA512 6db7c6549bce36d6a1d41e31805e387ab871271a843a1146de818c3c417b866c2c3e65f58a0e0af1f8a0e80703df8b15b9822502d03ee9aead49cf5620a43f75
+AUX Net-SSLeay-1.88-fix-libdir.patch 946 BLAKE2B 8f3522ccc62c5b09942d61dbe73fb87bec5c5fb15e460b5a00b4a0108f6c50299304acc7e37a268a46d75af86cbdfdfab80cdf2ebecf5836f676503869727cb5 SHA512 76ff12ce42631393dcf95008b3a4a5064f2f0cc54dd44b1002fe02fccdc4b8a47871f77b28ce43346f140058c23bd9d6be08261d6a4cecffc45ced5416aa4cb3
+AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455bb37b4cfa81879a880b35a315a90df9012b1fcbc545205b206777e6929454d31f881f2581d9dbd9f6b22cd849846bc0b9f3c6484b SHA512 7fd3078e55b4c829224289e7e1cc0628e2fb162dccf151b559022d5367ac06593a460779b28d9cae015dba6614d9e273399fa6b81144aefaf47d710f63b6c046
 DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716
 DIST Net-SSLeay-1.85.tar.gz 418349 BLAKE2B 0f639145e5be9406264cc7ef6240a30e0d62e631bfe29b8d1cbc85ab3bf721e8d344a8472faaa87816a5d148cedd7f13faeec925d0632fc1b75ecd1c5c44f6d1 SHA512 74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b
+DIST Net-SSLeay-1.88.tar.gz 436215 BLAKE2B 1a58296693cf41c464ac67a7f630598ccbf261ed0374a5381e3f718361b66418d13b5357bf7a49267a9e3bcd8d423fdedccd6b60d34aa60c975a5e3d1b0688e7 SHA512 37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682
 EBUILD Net-SSLeay-1.820.0.ebuild 1542 BLAKE2B 00b1596f731ce7782aa95a19eb9d7c9467d7dad0db05a1cb85e97391179fa844863ee8cba8117c067ee561fd5e234fb9eeba90b6689d4cccab4deaf315004ec9 SHA512 2492bf29fe40fa770273085042c3cab2110b185eeaf0ca6bf0cf12de1d8aa8c37bd32c221b8c877c628caeb5801c3f7692da01d4db0ab3cda5f279c3ff421659
 EBUILD Net-SSLeay-1.850.0.ebuild 1675 BLAKE2B 86d7a6ae6adaafb35df933e0fe1b6d6fac7eb83baf57eeceee441fa2bab9704c4ec5a832993f1a9e00af3be607f84359cc3bb6fdbc661e315d63457c104cfbf5 SHA512 89faa3f06a078ba6e1e75550ffd54b04b96637bf25c0d8fd2bb2227f60f43ceb05c90d6e00317988b878e091c4926e8d1f7aa244eda90acd11a87acd9f0f14d8
+EBUILD Net-SSLeay-1.880.0.ebuild 1539 BLAKE2B 8e4ea31738c3cd5a4e9513220f13fdda9feab297768f3145f8bf29e63a1aea81a1eff7a40e8ef180b1128dc726debc936cfec58e6966255e5158e4f5ad002271 SHA512 6381f43a99643e2df7dee536bbf20835d7bacbf34c4b683d402c26843a5a6b85f0153d5b532e9159b1bda41299dc7160232c05688128a649eb5c8c5f9a3934c6
 MISC metadata.xml 458 BLAKE2B a1f463c2ae637ac0ce9708d85768747073cb613831fad5454e72801618889ce2a96a5b6393aa06df0d0a34a05ef3ddb3aaad00fa1647ec8bde8a5aa1b65a6e90 SHA512 1502d6c58c7345b12fca3555c3bde82403f0a7bdff6d253a31c4b5b82bc981127fb2bab9e03d47d50963c3cf70533ec8ceebc025b71fe9127bdc294f092d955b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
new file mode 100644
index 000000000000..9d69832552c8
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CHRISN
+DIST_VERSION=1.88
+DIST_EXAMPLES=("examples/*")
+inherit multilib perl-module
+
+DESCRIPTION="Perl extension for using OpenSSL"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl test minimal examples"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/perl-MIME-Base64
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			dev-perl/Test-Exception
+			dev-perl/Test-Warn
+			dev-perl/Test-NoWarnings
+		)
+		virtual/perl-Test-Simple
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.88-fix-network-tests.patch"
+	"${FILESDIR}/${PN}-1.88-fix-libdir.patch"
+)
+PERL_RM_FILES=(
+	# Hateful author tests
+	't/local/01_pod.t'
+	't/local/02_pod_coverage.t'
+	't/local/kwalitee.t'
+)
+
+src_configure() {
+	if use test && has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		export NETWORK_TESTS=yes
+	else
+		use test && einfo "Network tests will be skipped without DIST_TEST_OVERRIDE=~network"
+		export NETWORK_TESTS=no
+	fi
+	export LIBDIR=$(get_libdir)
+	perl-module_src_configure
+}
+
+src_compile() {
+	mymake=(
+		OPTIMIZE="${CFLAGS}"
+		OPENSSL_PREFIX="${EPREFIX}"/usr
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-libdir.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-libdir.patch
new file mode 100644
index 000000000000..d78acb9c6153
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-libdir.patch
@@ -0,0 +1,27 @@
+Bug: https://bugs.gentoo.org/416339
+
+The previous patch for the above bug report used $ENV{LIBDIR} but this
+wasn't enough to help with cross-compiling. We could use $ENV{SYSROOT}
+but this results in a bogus RPATH entry. It is better to simply trust
+the toolchain, which may have its own sysroot applied.
+
+Cross-compiling Perl modules requires additional hackery but at least
+that hackery will work now. :)
+
+Chewi
+2017/12/03
+
+diff -Naur a/Makefile.PL b/Makefile.PL
+--- a/Makefile.PL	2017-10-13 01:38:01.000000000 +0100
++++ b/Makefile.PL	2017-12-03 10:52:27.304861804 +0000
+@@ -141,10 +141,8 @@
+         cccdlflags => '',
+     };
+     for ("$prefix/include", "$prefix/inc32", '/usr/kerberos/include') {
+-      push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
+     }
+     for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
+-      push @{$opts->{lib_paths}}, $_ if -d $_;
+     }
+ 
+     my $rsaref  = $self->ssleay_is_rsaref;
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-network-tests.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-network-tests.patch
new file mode 100644
index 000000000000..a98c4c8a0c9c
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-network-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.PL b/Makefile.PL
+index 31d9c74..91ac2b4 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -12,11 +12,7 @@ use Symbol qw(gensym);
+ # the Net-SSLeay loadable object on Windows
+ my $win_link_statically = 0;
+ 
+-my $tests = prompt(
+-  "Do you want to run external tests?\n".
+-  "These tests *will* *fail* if you do not have network connectivity.",
+-  'n',
+-) =~ /^y/i ? 't/*/*.t t/*/*/*.t' : 't/local/*.t t/handle/local/*.t';
++my $tests = ( 'yes' eq ( $ENV{NETWORK_TESTS} || '' ) ) ? 't/*/*.t t/*/*/*.t' : 't/local/*.t t/handle/local/*.t';
+ 
+ my %eumm_args = (
+   NAME => 'Net::SSLeay',