sys-libs/glibc: avoid libidn2 in bootstrap, bug #681742

When bootstrapping a cross-toolchain don't pull in libidn2 into
the host as it's not stable yet everywhere (requires KEYWORDS
fiddling) and is not needed on host (it's cross-glibc).

Reported-by: Mahmoud Jaoune
Bug: https://bugs.gentoo.org/681742
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild
index 2bdf8ec2bb5febce63b0b8745f2e86baf71c6cab..b006cb19449c9e5cc9d5d36677cca45cebe4eec1 100644 (file)
--- a/sys-libs/glibc/glibc-2.28-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r5.ebuild
@@ -82,7 +82,6 @@ DEPEND="${COMMON_DEPEND}
        test? ( >=net-dns/libidn2-2.0.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-       >=net-dns/libidn2-2.0.5
        sys-apps/gentoo-functions
        !sys-kernel/ps3-sources
        !sys-libs/nss-db
@@ -100,7 +99,10 @@ else
                >=sys-devel/gcc-6
                virtual/os-headers
        "
-       RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+       RDEPEND+="
+               >=net-dns/libidn2-2.0.5
+               vanilla? ( !sys-libs/timezone-data )
+       "
        PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
 fi
 

diff --git a/sys-libs/glibc/glibc-2.29-r1.ebuild b/sys-libs/glibc/glibc-2.29-r1.ebuild
index eba80bd41ff2d5b0a065ddaae038aea92e633275..1beb44e7ca9f402f931caecb000ebfee4377010a 100644 (file)
--- a/sys-libs/glibc/glibc-2.29-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r1.ebuild
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
        test? ( >=net-dns/libidn2-2.0.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-       >=net-dns/libidn2-2.0.5
        sys-apps/gentoo-functions
        !sys-kernel/ps3-sources
        !sys-libs/nss-db
@@ -104,7 +103,10 @@ else
                >=sys-devel/gcc-6
                virtual/os-headers
        "
-       RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+       RDEPEND+="
+               >=net-dns/libidn2-2.0.5
+               vanilla? ( !sys-libs/timezone-data )
+       "
        PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
 fi
 

diff --git a/sys-libs/glibc/glibc-2.29.ebuild b/sys-libs/glibc/glibc-2.29.ebuild
index 98113f0210bfae1b8aeee1d6882051c01243adb0..e2028c49d8fdbe0c9fa234799601003616490e0f 100644 (file)
--- a/sys-libs/glibc/glibc-2.29.ebuild
+++ b/sys-libs/glibc/glibc-2.29.ebuild
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
        test? ( >=net-dns/libidn2-2.0.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-       >=net-dns/libidn2-2.0.5
        sys-apps/gentoo-functions
        !sys-kernel/ps3-sources
        !sys-libs/nss-db
@@ -104,7 +103,10 @@ else
                >=sys-devel/gcc-6
                virtual/os-headers
        "
-       RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+       RDEPEND+="
+               >=net-dns/libidn2-2.0.5
+               vanilla? ( !sys-libs/timezone-data )
+       "
        PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
 fi
 

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 417b38d300880958f6edb52f4ee3fc8ad3d4bd01..478b5e5c9dc6fb88b4f6a157993ca3e40327e34a 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
        test? ( >=net-dns/libidn2-2.0.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-       >=net-dns/libidn2-2.0.5
        sys-apps/gentoo-functions
        !sys-kernel/ps3-sources
        !sys-libs/nss-db
@@ -104,7 +103,10 @@ else
                >=sys-devel/gcc-6
                virtual/os-headers
        "
-       RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+       RDEPEND+="
+               >=net-dns/libidn2-2.0.5
+               vanilla? ( !sys-libs/timezone-data )
+       "
        PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
 fi