commit: 00a8e87b3afc16af56632d08884263623800bd99 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Mar 25 21:16:14 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Mar 25 21:16:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a8e87b
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 <AT> gentoo.org> sys-libs/glibc/glibc-2.28-r5.ebuild | 6 ++++-- sys-libs/glibc/glibc-2.29-r1.ebuild | 6 ++++-- sys-libs/glibc/glibc-2.29.ebuild | 6 ++++-- sys-libs/glibc/glibc-9999.ebuild | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild index 2bdf8ec2bb5..b006cb19449 100644 --- 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 eba80bd41ff..1beb44e7ca9 100644 --- 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 98113f0210b..e2028c49d8f 100644 --- 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 417b38d3008..478b5e5c9dc 100644 --- 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
