From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- eclass/Manifest.gz | Bin 36794 -> 36796 bytes eclass/linux-mod.eclass | 2 +- eclass/xorg-3.eclass | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index e0a871ab0450..cfd71858154b 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index de005967a36c..b6dc2c84d09f 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -208,7 +208,7 @@ use_m() { # if the kernel version is greater than 2.6.6 then we should use # M= instead of SUBDIRS= - [ ${KV_MAJOR} -eq 3 ] && return 0 + [ ${KV_MAJOR} -ge 3 ] && return 0 [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \ return 0 || return 1 } diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 6ac90a64d59d..f135058fba6f 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -116,7 +116,8 @@ WANT_AUTOMAKE="latest" for arch in ${XORG_EAUTORECONF_ARCHES}; do EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" done -DEPEND+=" ${EAUTORECONF_DEPENDS}" +unset arch +BDEPEND+=" ${EAUTORECONF_DEPENDS}" [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}" unset EAUTORECONF_DEPENDS unset EAUTORECONF_DEPEND -- cgit v1.2.3