From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF023138334 for ; Mon, 16 Sep 2019 00:06:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09270E094F; Mon, 16 Sep 2019 00:06:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5D92E094F for ; Mon, 16 Sep 2019 00:06:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E254634B205 for ; Mon, 16 Sep 2019 00:06:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 165FA7F4 for ; Mon, 16 Sep 2019 00:06:33 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1568592378.77f41cb32418c535b2e948e4bd29d4647b6c99c0.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl-compat/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild X-VCS-Directories: dev-libs/openssl-compat/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 77f41cb32418c535b2e948e4bd29d4647b6c99c0 X-VCS-Branch: master Date: Mon, 16 Sep 2019 00:06:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b3b705b-c9ec-4044-b0a4-b880fef4f42f X-Archives-Hash: ebd664c9d5a157508b41c1753fbdda0b commit: 77f41cb32418c535b2e948e4bd29d4647b6c99c0 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Sep 16 00:03:38 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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