From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1090057-garchives=archives.gentoo.org@lists.gentoo.org>
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 1B925138334
for <garchives@archives.gentoo.org>; Tue, 14 May 2019 09:15:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 246E7E08AC;
Tue, 14 May 2019 09:15:50 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 E57F2E08AC
for <gentoo-commits@lists.gentoo.org>; Tue, 14 May 2019 09:15:49 +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 EA1BB3442E3
for <gentoo-commits@lists.gentoo.org>; Tue, 14 May 2019 09:15:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 496EC452
for <gentoo-commits@lists.gentoo.org>; Tue, 14 May 2019 09:15:45 +0000 (UTC)
From: "Michael Haubenwallner" <haubi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" <haubi@gentoo.org>
Message-ID: <1557825337.1b7efc9d2df6c56f7bf5231fb6e8d7a29b02fbd2.haubi@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: dev-libs/openssl/openssl-1.0.2r.ebuild dev-libs/openssl/openssl-1.1.0j-r1.ebuild dev-libs/openssl/openssl-1.1.1b-r2.ebuild
X-VCS-Directories: dev-libs/openssl/
X-VCS-Committer: haubi
X-VCS-Committer-Name: Michael Haubenwallner
X-VCS-Revision: 1b7efc9d2df6c56f7bf5231fb6e8d7a29b02fbd2
X-VCS-Branch: master
Date: Tue, 14 May 2019 09:15:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c8001214-6ffe-4476-9484-6630d0170bfb
X-Archives-Hash: f5e297846534144d600976b36f77e656
commit: 1b7efc9d2df6c56f7bf5231fb6e8d7a29b02fbd2
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 08:57:46 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue May 14 09:15:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1b7efc9d
dev-libs/openssl: no RDEPEND on c_rehash in prefix-stack
As long as there is no separate DEPEND variable for the merge/unmerge
phases (bug#660306), we need to use RDEPEND for pkg_* phase deps. But
these may not work in prefix-stack, so we need them in DEPEND there.
Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
dev-libs/openssl/openssl-1.0.2r.ebuild | 4 +++-
dev-libs/openssl/openssl-1.1.0j-r1.ebuild | 4 +++-
dev-libs/openssl/openssl-1.1.1b-r2.ebuild | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dev-libs/openssl/openssl-1.0.2r.ebuild b/dev-libs/openssl/openssl-1.0.2r.ebuild
index 98d1f809f5..232015ebfd 100644
--- a/dev-libs/openssl/openssl-1.0.2r.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2r.ebuild
@@ -26,11 +26,13 @@ KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x8
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
-RDEPEND=">=app-misc/c_rehash-1.7-r1
+MY_PKGINSTDEPS=">=app-misc/c_rehash-1.7-r1"
+RDEPEND="!prefix-stack? ( ${MY_PKGINSTDEPS} )
gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
+ prefix-stack? ( ${MY_PKGINSTDEPS} )
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
test? (
diff --git a/dev-libs/openssl/openssl-1.1.0j-r1.ebuild b/dev-libs/openssl/openssl-1.1.0j-r1.ebuild
index 94b0db972b..86ed6e0e1d 100644
--- a/dev-libs/openssl/openssl-1.1.0j-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0j-r1.ebuild
@@ -16,9 +16,11 @@ KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x8
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
-RDEPEND=">=app-misc/c_rehash-1.7-r1
+MY_PKGINSTDEPS=">=app-misc/c_rehash-1.7-r1"
+RDEPEND="!prefix-stack? ( ${MY_PKGINSTDEPS} )
zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
+ prefix-stack? ( ${MY_PKGINSTDEPS} )
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
test? (
diff --git a/dev-libs/openssl/openssl-1.1.1b-r2.ebuild b/dev-libs/openssl/openssl-1.1.1b-r2.ebuild
index 79cbc9170e..168a5e8758 100644
--- a/dev-libs/openssl/openssl-1.1.1b-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1b-r2.ebuild
@@ -17,9 +17,11 @@ KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x8
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
-RDEPEND=">=app-misc/c_rehash-1.7-r1
+MY_PKGINSTDEPS=">=app-misc/c_rehash-1.7-r1"
+RDEPEND="!prefix-stack? ( ${MY_PKGINSTDEPS} )
zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
+ prefix-stack? ( ${MY_PKGINSTDEPS} )
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
test? (