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

[Thomas Deutschmann]

commit:     77f41cb32418c535b2e948e4bd29d4647b6c99c0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 00:03:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 00:06:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f41cb3

dev-libs/openssl-compat: 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-compat-1.0.2s.ebuild => openssl-compat-1.0.2s-r1.ebuild} | 4 +---
 .../{openssl-compat-1.0.2t.ebuild => openssl-compat-1.0.2t-r1.ebuild} | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild 
b/dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild
similarity index 98%
rename from dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild
rename to dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild
index 7449ff20b7e..f956fa3826a 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild
@@ -100,9 +100,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-compat/openssl-compat-1.0.2t.ebuild 
b/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
similarity index 98%
rename from dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild
rename to dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
index 717d2d311a8..670f557544d 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
@@ -89,9 +89,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