public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl-compat/
Date: Mon, 16 Sep 2019 00:06:33 +0000 (UTC)	[thread overview]
Message-ID: <1568592378.77f41cb32418c535b2e948e4bd29d4647b6c99c0.whissi@gentoo> (raw)

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


             reply	other threads:[~2019-09-16  0:06 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-16  0:06 Thomas Deutschmann [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-26  9:01 [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl-compat/ Sam James
2024-08-25 15:24 Andreas K. Hüttel
2024-07-01 18:55 Mike Gilbert
2024-05-16 16:47 Arthur Zamarin
2024-04-04  1:07 Sam James
2023-09-09 20:24 Sam James
2023-06-22  3:08 Sam James
2023-06-22  2:49 Sam James
2023-06-14  5:22 Sam James
2023-05-30 16:01 Sam James
2023-05-13  3:23 Sam James
2022-12-15  6:16 Sam James
2022-11-15  8:46 Sam James
2022-06-11  5:12 Sam James
2021-07-21 12:56 Thomas Deutschmann
2020-05-19  9:49 Thomas Deutschmann
2020-05-19  9:49 Thomas Deutschmann
2020-05-08 23:28 Thomas Deutschmann
2020-01-01 21:25 Thomas Deutschmann
2020-01-01 21:25 Thomas Deutschmann
2019-12-21 20:31 Thomas Deutschmann
2019-11-25  0:42 Thomas Deutschmann
2019-11-02 14:56 Thomas Deutschmann
2019-10-22  7:45 Lars Wendler
2019-10-01 19:38 Thomas Deutschmann
2019-09-16  0:06 Thomas Deutschmann
2019-09-16  0:06 Thomas Deutschmann
2019-09-15 20:37 Thomas Deutschmann
2019-09-15 20:28 Thomas Deutschmann
2019-09-13 12:15 Mikle Kolyada
2019-09-13  0:00 Thomas Deutschmann
2019-09-12 13:57 Thomas Deutschmann
2019-08-23 18:10 Thomas Deutschmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1568592378.77f41cb32418c535b2e948e4bd29d4647b6c99c0.whissi@gentoo \
    --to=whissi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox