From 66c6463987bd802e86c4de5595fd8ed4de21771b Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Wed, 15 Apr 2020 23:59:06 +1200 Subject: [PATCH] dev-perl/Net-SSLeay: Remove old 1.820.0 Package-Manager: Portage-2.3.97, Repoman-2.3.22 Signed-off-by: Kent Fredric --- dev-perl/Net-SSLeay/Manifest | 1 - dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild | 58 ------------------- .../files/Net-SSLeay-1.82-fix-libdir.patch | 27 --------- .../Net-SSLeay-1.82-fix-network-tests.patch | 29 ---------- .../Net-SSLeay-1.82-respect-cflags.patch | 26 --------- 5 files changed, 141 deletions(-) delete mode 100644 dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild delete mode 100644 dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch delete mode 100644 dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-network-tests.patch delete mode 100644 dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest index 53c8e6fefb7f..23f7c63a02e5 100644 --- a/dev-perl/Net-SSLeay/Manifest +++ b/dev-perl/Net-SSLeay/Manifest @@ -1,2 +1 @@ -DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716 DIST Net-SSLeay-1.88.tar.gz 436215 BLAKE2B 1a58296693cf41c464ac67a7f630598ccbf261ed0374a5381e3f718361b66418d13b5357bf7a49267a9e3bcd8d423fdedccd6b60d34aa60c975a5e3d1b0688e7 SHA512 37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682 diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild deleted file mode 100644 index b2f24506d373..000000000000 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=MIKEM -DIST_VERSION=1.82 -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 sparc x86 ~ppc-aix ~x64-cygwin ~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" -RESTRICT="!test? ( test )" - -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 - -PATCHES=( - "${FILESDIR}/${PN}-1.82-respect-cflags.patch" - "${FILESDIR}/${PN}-1.82-fix-libdir.patch" - "${FILESDIR}/${PN}-1.82-fix-network-tests.patch" -) - -src_prepare() { - use test && perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t' - perl-module_src_prepare -} - -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 -} diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch deleted file mode 100644 index 6aff3f85ab22..000000000000 --- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm ---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2017-10-13 01:38:01.000000000 +0100 -+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2017-12-03 10:52:27.304861804 +0000 -@@ -65,10 +65,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.82-fix-network-tests.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-network-tests.patch deleted file mode 100644 index 6c3e76858e77..000000000000 --- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-network-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 36c14369372f0371e033019c9cea197b31a93bde Mon Sep 17 00:00:00 2001 -From: Kent Fredric -Date: Sat, 5 Mar 2016 12:41:11 +1300 -Subject: Fix network tests re: Networking - ---- - inc/Module/Install/PRIVATE/Net/SSLeay.pm | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm -index 0a3aa24..f27b43f 100644 ---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm -+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm -@@ -46,11 +46,7 @@ EOM - 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 ) { -+ if ( 'yes' eq ( $ENV{NETWORK_TESTS} || '' ) ) { - $self->tests('t/*/*.t t/*/*/*.t'); - } else { - $self->tests('t/local/*.t t/handle/local/*.t'); --- -2.14.3 - diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch deleted file mode 100644 index 03d06b6b8d44..000000000000 --- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-respect-cflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8472348e588c16ad5332fe0b1f1dc9cc8eb4ab7d Mon Sep 17 00:00:00 2001 -From: Torsten Veller -Date: Mon, 16 Jul 2012 05:31:43 +1200 -Subject: Respect CFLAGS - -Bug: https://bugs.gentoo.org/378657 ---- - inc/Module/Install/PRIVATE/Net/SSLeay.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm -index 5abcf70..49913e6 100644 ---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm -+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm -@@ -129,7 +129,7 @@ EOM - - if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') { - print "*** Enabling HPUX aCC options (+e)\n"; -- $opts->{optimize} = '+e -O2 -g'; -+ $opts->{optimize} = '+e ' . $opts->{optimize}; - } - - if ( (($Config{ccname} || $Config{cc}) eq 'gcc') && ($Config{cccdlflags} =~ /-fpic/) ) { --- -2.14.3 - -- 2.26.2