From 77f41cb32418c535b2e948e4bd29d4647b6c99c0 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 16 Sep 2019 02:03:38 +0200 Subject: [PATCH] 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 --- ...l-compat-1.0.2s.ebuild => openssl-compat-1.0.2s-r1.ebuild} | 4 +--- ...l-compat-1.0.2t.ebuild => openssl-compat-1.0.2t-r1.ebuild} | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) rename dev-libs/openssl-compat/{openssl-compat-1.0.2s.ebuild => openssl-compat-1.0.2s-r1.ebuild} (98%) rename dev-libs/openssl-compat/{openssl-compat-1.0.2t.ebuild => openssl-compat-1.0.2t-r1.ebuild} (98%) 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 7449ff20b7e6..f956fa3826a9 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 717d2d311a8e..670f557544d2 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 -- 2.26.2