[gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/

[Thomas Deutschmann]

commit:     a21ed49cf57d9a8111876fb49cdd6fc6afb8bd90
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 00:01:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 00:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21ed49c

dev-libs/openssl: restore Gentoo patch set

Patch set for 1.0.2x series were longer applied when ebuilds were
bumped to EAPI=7 and unified.

Fixes a039f65 ("dev-libs/openssl: bump to EAPI 7")
Closes: https://bugs.gentoo.org/694512
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../openssl/{openssl-1.0.2s-r1.ebuild => openssl-1.0.2s-r2.ebuild}    | 4 +---
 dev-libs/openssl/{openssl-1.0.2t.ebuild => openssl-1.0.2t-r1.ebuild}  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild 
b/dev-libs/openssl/openssl-1.0.2s-r2.ebuild
similarity index 98%
rename from dev-libs/openssl/openssl-1.0.2s-r1.ebuild
rename to dev-libs/openssl/openssl-1.0.2s-r2.ebuild
index b4902db7e53..fbf3c919b91 100644
--- a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2s-r2.ebuild
@@ -96,9 +96,7 @@ src_prepare() {
        rm -f Makefile
 
        if ! use vanilla ; then
-               if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; 
then
-                       [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-               fi
+               eapply "${WORKDIR}"/patch/*.patch
        fi
 
        eapply_user

diff --git a/dev-libs/openssl/openssl-1.0.2t.ebuild 
b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
similarity index 98%
rename from dev-libs/openssl/openssl-1.0.2t.ebuild
rename to dev-libs/openssl/openssl-1.0.2t-r1.ebuild
index a778b483edc..6dbbac432cd 100644
--- a/dev-libs/openssl/openssl-1.0.2t.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
@@ -85,9 +85,7 @@ src_prepare() {
        rm -f Makefile
 
        if ! use vanilla ; then
-               if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; 
then
-                       [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-               fi
+               eapply "${WORKDIR}"/patch/*.patch
        fi
 
        eapply_user