commit:     6386d944b91ebd35c337c88f2091cf8a731e7863
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 01:30:14 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 01:30:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6386d944

dev-perl/*: drop as changes are upstream in gentoo.git

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 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 ----------
 .../files/Net-SSLeay-1.82-fix-network-tests.patch  | 29 -----------
 .../files/Net-SSLeay-1.82-libressl.patch           | 31 ------------
 .../files/Net-SSLeay-1.82-respect-cflags.patch     | 26 ----------
 dev-perl/Net-SSLeay/metadata.xml                   | 13 -----
 7 files changed, 185 deletions(-)

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
deleted file mode 100644
index 45ff273..0000000
--- a/dev-perl/Net-SSLeay/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 
0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d
 SHA512 
758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716

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 668a49a..0000000
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 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 
~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
-       )
-"
-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"
-       "${FILESDIR}/${PN}-1.82-libressl.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 6aff3f8..0000000
--- 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 6c3e768..0000000
--- 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 <[email protected]>
-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-libressl.patch 
b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-libressl.patch
deleted file mode 100644
index f320fc4..0000000
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/SSLeay.xs b/SSLeay.xs
-index 685c2f2..54b1f40 100644
---- a/SSLeay.xs
-+++ b/SSLeay.xs
-@@ -2667,7 +2667,7 @@ RAND_write_file(file_name)
- 
- #define REM40 "Minimal X509 stuff..., this is a bit ugly and should be put in 
its own modules Net::SSLeay::X509.pm"
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
- 
- int
- X509_check_host(X509 *cert, const char *name, unsigned int flags = 0, SV 
*peername = &PL_sv_undef)
-@@ -5409,7 +5409,7 @@ SSL_get_client_random(s)
- 
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && 
!defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- 
- void
- SSL_get_server_random(s)
-@@ -5440,7 +5440,7 @@ int
- SSL_get_keyblock_size(s)
-      SSL *   s
-      CODE:
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && 
!defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-         const SSL_CIPHER *ssl_cipher;
-       int cipher = NID_undef, digest = NID_undef, mac_secret_size = 0;
-       const EVP_CIPHER *c = NULL;

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 03d06b6..0000000
--- 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 <[email protected]>
-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
-

diff --git a/dev-perl/Net-SSLeay/metadata.xml b/dev-perl/Net-SSLeay/metadata.xml
deleted file mode 100644
index 3a182c2..0000000
--- a/dev-perl/Net-SSLeay/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Net-SSLeay</remote-id>
-    <remote-id type="cpan-module">Net::SSLeay</remote-id>
-    <remote-id type="cpan-module">Net::SSLeay::Handle</remote-id>
-  </upstream>
-</pkgmetadata>

Reply via email to