[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Andreas K. Hüttel]

commit:     8ea89b86b63b91759bd5ee476bc8ee9008f7398b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 21:35:54 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 21:36:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea89b86

sys-libs/glibc: BDEPEND implementation

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-libs/glibc/glibc-9999.ebuild | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 09bf788700f..ea591126e85 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -64,6 +64,16 @@ fi
 # We need a new-enough binutils/gcc to match upstream baseline.
 # Also we need to make sure our binutils/gcc supports TLS,
 # and that gcc already contains the hardened patches.
+BDEPEND="
+       ${PYTHON_DEPS}
+       >=app-misc/pax-utils-0.1.10
+       sys-devel/bison
+       !<sys-apps/sandbox-1.6
+       !<sys-apps/portage-2.1.2
+       !<sys-devel/bison-2.7
+       !<sys-devel/make-4
+       doc? ( sys-apps/texinfo )
+"
 COMMON_DEPEND="
        nscd? ( selinux? (
                audit? ( sys-process/audit )
@@ -74,14 +84,6 @@ COMMON_DEPEND="
        systemtap? ( dev-util/systemtap )
 "
 DEPEND="${COMMON_DEPEND}
-       ${PYTHON_DEPS}
-       >=app-misc/pax-utils-0.1.10
-       sys-devel/bison
-       !<sys-apps/sandbox-1.6
-       !<sys-apps/portage-2.1.2
-       !<sys-devel/bison-2.7
-       !<sys-devel/make-4
-       doc? ( sys-apps/texinfo )
        test? ( >=net-dns/libidn2-2.0.5 )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -91,17 +93,17 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-       DEPEND+=" !headers-only? (
+       BDEPEND+=" !headers-only? (
                >=${CATEGORY}/binutils-2.24
                >=${CATEGORY}/gcc-6
        )"
-       [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+       [[ ${CATEGORY} == *-linux* ]] && BDEPEND+=" ${CATEGORY}/linux-headers"
 else
-       DEPEND+="
+       BDEPEND+="
                >=sys-devel/binutils-2.24
                >=sys-devel/gcc-6
-               virtual/os-headers
        "
+       DEPEND+=" virtual/os-headers "
        RDEPEND+="
                >=net-dns/libidn2-2.0.5
                vanilla? ( !sys-libs/timezone-data )