commit: c0631c02e908780c195d5f52e02e36281a81b7d9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 19:41:24 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 19:42:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0631c02
Revert "sys-libs/glibc: remove deps on implicit system packages"
This reverts commit f4ad4f8f0fa05e7504efb3ef6ef46a650b47a4d6.
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-libs/glibc/glibc-2.32-r8.ebuild | 15 +++++++++++++++
sys-libs/glibc/glibc-2.33-r1.ebuild | 15 +++++++++++++++
sys-libs/glibc/glibc-2.33-r7.ebuild | 15 +++++++++++++++
sys-libs/glibc/glibc-2.34-r2.ebuild | 15 +++++++++++++++
sys-libs/glibc/glibc-9999.ebuild | 15 +++++++++++++++
5 files changed, 75 insertions(+)
diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild
b/sys-libs/glibc/glibc-2.32-r8.ebuild
index f91909bea8da..101254fce5ab 100644
--- a/sys-libs/glibc/glibc-2.32-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r8.ebuild
@@ -91,11 +91,18 @@ fi
# Lastly, let's avoid some openssh nastiness, bug 708224, as
# convenience to our users.
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-0.1.10
sys-devel/bison
doc? ( sys-apps/texinfo )
+ !compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
"
COMMON_DEPEND="
gd? ( media-libs/gd:2= )
@@ -109,9 +116,17 @@ COMMON_DEPEND="
!<net-misc/openssh-8.1_p1-r2
"
DEPEND="${COMMON_DEPEND}
+ compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
sys-apps/gentoo-functions
"
diff --git a/sys-libs/glibc/glibc-2.33-r1.ebuild
b/sys-libs/glibc/glibc-2.33-r1.ebuild
index fdd2b96d886e..cdbca06cc5d5 100644
--- a/sys-libs/glibc/glibc-2.33-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r1.ebuild
@@ -90,11 +90,18 @@ fi
# Lastly, let's avoid some openssh nastiness, bug 708224, as
# convenience to our users.
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-1.3.1
sys-devel/bison
doc? ( sys-apps/texinfo )
+ !compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
"
COMMON_DEPEND="
gd? ( media-libs/gd:2= )
@@ -107,9 +114,17 @@ COMMON_DEPEND="
systemtap? ( dev-util/systemtap )
"
DEPEND="${COMMON_DEPEND}
+ compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
sys-apps/gentoo-functions
!<app-misc/pax-utils-1.3.1
!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild
b/sys-libs/glibc/glibc-2.33-r7.ebuild
index 1d944e2affa0..20390ea8ba2a 100644
--- a/sys-libs/glibc/glibc-2.33-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r7.ebuild
@@ -96,11 +96,18 @@ fi
# Lastly, let's avoid some openssh nastiness, bug 708224, as
# convenience to our users.
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-1.3.1
sys-devel/bison
doc? ( sys-apps/texinfo )
+ !compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
"
COMMON_DEPEND="
gd? ( media-libs/gd:2= )
@@ -113,9 +120,17 @@ COMMON_DEPEND="
systemtap? ( dev-util/systemtap )
"
DEPEND="${COMMON_DEPEND}
+ compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
sys-apps/gentoo-functions
!<app-misc/pax-utils-1.3.1
!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.34-r2.ebuild
b/sys-libs/glibc/glibc-2.34-r2.ebuild
index 365382d35fae..00c85cf62a55 100644
--- a/sys-libs/glibc/glibc-2.34-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r2.ebuild
@@ -102,11 +102,18 @@ fi
# Lastly, let's avoid some openssh nastiness, bug 708224, as
# convenience to our users.
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
sys-devel/bison
doc? ( sys-apps/texinfo )
+ !compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
"
COMMON_DEPEND="
gd? ( media-libs/gd:2= )
@@ -119,9 +126,17 @@ COMMON_DEPEND="
systemtap? ( dev-util/systemtap )
"
DEPEND="${COMMON_DEPEND}
+ compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
sys-apps/gentoo-functions
!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index dd80e39f1e04..72cca561f703 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -103,11 +103,18 @@ fi
# Lastly, let's avoid some openssh nastiness, bug 708224, as
# convenience to our users.
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
sys-devel/bison
doc? ( sys-apps/texinfo )
+ !compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
"
COMMON_DEPEND="
gd? ( media-libs/gd:2= )
@@ -120,9 +127,17 @@ COMMON_DEPEND="
systemtap? ( dev-util/systemtap )
"
DEPEND="${COMMON_DEPEND}
+ compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
sys-apps/gentoo-functions
!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
!<net-misc/openssh-8.1_p1-r2
