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@gentoo.org>

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 b4902db7e537d9b727eda80cf8aa6e91b5e6ce5c..fbf3c919b91d264331f3403a548c682d5df5ed22 100644 (file)
--- 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 a778b483edc4651eb738876146835ce4180d1d13..6dbbac432cd7035ee6f14872d52a06026706550b 100644 (file)
--- 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