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? (

Reply via email to