From: "Michael Haubenwallner" <haubi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/
Date: Tue, 14 May 2019 09:15:45 +0000 (UTC) [thread overview]
Message-ID: <1557825337.1b7efc9d2df6c56f7bf5231fb6e8d7a29b02fbd2.haubi@gentoo> (raw)
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? (
next reply other threads:[~2019-05-14 9:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 9:15 Michael Haubenwallner [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-15 0:42 [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/ Sam James
2021-06-21 18:37 Fabian Groffen
2021-03-26 7:54 Fabian Groffen
2021-01-06 11:58 Fabian Groffen
2020-12-26 19:16 Fabian Groffen
2020-12-08 23:24 Sam James
2020-06-07 13:10 Fabian Groffen
2019-09-17 10:47 Fabian Groffen
2019-02-26 9:17 Michael Haubenwallner
2019-02-15 20:10 Michael Haubenwallner
2019-02-13 16:31 Michael Haubenwallner
2018-07-03 20:03 Fabian Groffen
2018-07-03 13:24 Michael Haubenwallner
2018-06-22 8:49 Fabian Groffen
2017-10-03 7:49 Michael Haubenwallner
2016-05-09 15:57 Michael Haubenwallner
2016-03-24 7:14 Fabian Groffen
2015-11-02 19:06 Fabian Groffen
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=1557825337.1b7efc9d2df6c56f7bf5231fb6e8d7a29b02fbd2.haubi@gentoo \
--to=haubi@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