| 1 |
commit: a21ed49cf57d9a8111876fb49cdd6fc6afb8bd90 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 16 00:01:28 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 16 00:06:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21ed49c |
| 7 |
|
| 8 |
dev-libs/openssl: restore Gentoo patch set |
| 9 |
|
| 10 |
Patch set for 1.0.2x series were longer applied when ebuilds were |
| 11 |
bumped to EAPI=7 and unified. |
| 12 |
|
| 13 |
Fixes a039f65 ("dev-libs/openssl: bump to EAPI 7") |
| 14 |
Closes: https://bugs.gentoo.org/694512 |
| 15 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 16 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 17 |
|
| 18 |
.../openssl/{openssl-1.0.2s-r1.ebuild => openssl-1.0.2s-r2.ebuild} | 4 +--- |
| 19 |
dev-libs/openssl/{openssl-1.0.2t.ebuild => openssl-1.0.2t-r1.ebuild} | 4 +--- |
| 20 |
2 files changed, 2 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild b/dev-libs/openssl/openssl-1.0.2s-r2.ebuild |
| 23 |
similarity index 98% |
| 24 |
rename from dev-libs/openssl/openssl-1.0.2s-r1.ebuild |
| 25 |
rename to dev-libs/openssl/openssl-1.0.2s-r2.ebuild |
| 26 |
index b4902db7e53..fbf3c919b91 100644 |
| 27 |
--- a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild |
| 28 |
+++ b/dev-libs/openssl/openssl-1.0.2s-r2.ebuild |
| 29 |
@@ -96,9 +96,7 @@ src_prepare() { |
| 30 |
rm -f Makefile |
| 31 |
|
| 32 |
if ! use vanilla ; then |
| 33 |
- if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then |
| 34 |
- [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" |
| 35 |
- fi |
| 36 |
+ eapply "${WORKDIR}"/patch/*.patch |
| 37 |
fi |
| 38 |
|
| 39 |
eapply_user |
| 40 |
|
| 41 |
diff --git a/dev-libs/openssl/openssl-1.0.2t.ebuild b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild |
| 42 |
similarity index 98% |
| 43 |
rename from dev-libs/openssl/openssl-1.0.2t.ebuild |
| 44 |
rename to dev-libs/openssl/openssl-1.0.2t-r1.ebuild |
| 45 |
index a778b483edc..6dbbac432cd 100644 |
| 46 |
--- a/dev-libs/openssl/openssl-1.0.2t.ebuild |
| 47 |
+++ b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild |
| 48 |
@@ -85,9 +85,7 @@ src_prepare() { |
| 49 |
rm -f Makefile |
| 50 |
|
| 51 |
if ! use vanilla ; then |
| 52 |
- if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then |
| 53 |
- [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" |
| 54 |
- fi |
| 55 |
+ eapply "${WORKDIR}"/patch/*.patch |
| 56 |
fi |
| 57 |
|
| 58 |
eapply_user |
Archives