[gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/

[Kent Fredric]

commit:     e03a06c1bdc974e0a7cfff6cef74a05745f73395
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 00:15:36 2018 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue May  1 00:17:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03a06c1

dev-perl/Net-SSLeay: Cleanup old re bug #614462

Closes: https://bugs.gentoo.org/614462
Closes: https://bugs.gentoo.org/630390
Package-Manager: Portage-2.3.29, Repoman-2.3.9

 dev-perl/Net-SSLeay/Manifest                       |  1 -
 dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild      | 56 ----------------------
 .../Net-SSLeay/files/1.72-config-nettest-no.patch  | 20 --------
 .../Net-SSLeay/files/1.72-config-nettest-yes.patch | 20 --------
 4 files changed, 97 deletions(-)

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 76a6996f48c..45ff273e456 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,2 +1 @@
-DIST Net-SSLeay-1.81.tar.gz 396631 BLAKE2B dfd0f14bbeb3196009d7e597c0c933dbe9cb7f9d4591ae62adc94a94d1b67d6e108992c7053defcea9b0c6dad90be3b26c1d53cea9e87a09016964d09fe2c5bd SHA512 8d4b72ede74ea22cf2ed681a8441f40965331cd5d4442c19677cf5bc7c1e61ed1e50d0f3a4f1b272428485bcc132ec99b0c75344ca43e8a34a9dd15539719f55
 DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716

diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
deleted file mode 100644
index bb4652597fb..00000000000
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MIKEM
-DIST_VERSION=1.81
-DIST_EXAMPLES=("examples/*")
-inherit multilib perl-module
-
-DESCRIPTION="Perl extension for using OpenSSL"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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
-	)
-"
-export OPTIMIZE="$CFLAGS"
-export OPENSSL_PREFIX=${EPREFIX}/usr
-
-src_prepare() {
-	sed -i \
-		-e "/\$opts->{optimize} = '-O2 -g';/d" \
-		-e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
-		inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
-
-	local my_test_control
-	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
-
-	if use test; then
-		perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t'
-	fi
-	if use test && has network ${my_test_control} ; then
-		eapply "${FILESDIR}/1.72-config-nettest-yes.patch"
-	else
-		eapply "${FILESDIR}/1.72-config-nettest-no.patch"
-	fi
-
-	perl-module_src_prepare
-}

diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
deleted file mode 100644
index 0090bfd83a0..00000000000
--- a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
---- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2015-08-02 05:54:14.000000000 +0000
-+++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2016-03-04 23:29:36.997983312 +0000
-@@ -47,15 +47,7 @@
-         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
-     );
- 
--    if ( $self->prompt(
--            "Do you want to run external tests?\n".
--            "These tests *will* *fail* if you do not have network connectivity.",
--            'n',
--    ) =~ /^y/i ) {
--        $self->tests('t/*/*.t t/*/*/*.t');
--    } else {
--        $self->tests('t/local/*.t t/handle/local/*.t');
--    }
-+    $self->tests('t/local/*.t t/handle/local/*.t');
- }
- 
- sub ssleay_get_build_opts {

diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
deleted file mode 100644
index d79662593f4..00000000000
--- a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
---- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2015-08-02 05:54:14.000000000 +0000
-+++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2016-03-04 23:28:49.543069218 +0000
-@@ -47,15 +47,7 @@
-         LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
-     );
- 
--    if ( $self->prompt(
--            "Do you want to run external tests?\n".
--            "These tests *will* *fail* if you do not have network connectivity.",
--            'n',
--    ) =~ /^y/i ) {
--        $self->tests('t/*/*.t t/*/*/*.t');
--    } else {
--        $self->tests('t/local/*.t t/handle/local/*.t');
--    }
-+    $self->tests('t/*/*.t t/*/*/*.t');
- }
- 
- sub ssleay_get_build_opts {