Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 02 Apr 2022 19:52:08
Message-Id: 1648929081.9d4666536e3bcb722b472587c5cca71ca0bc54b6.mattst88@gentoo
1 commit: 9d4666536e3bcb722b472587c5cca71ca0bc54b6
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 2 19:48:15 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 19:51:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d466653
7
8 xorg-3.eclass: Fix undocumented variable warnings
9
10 - drop WANT_AUTOCONF/WANT_AUTOMAKE declarations: these are the default
11 values
12 - unset other variables after use so they don't leak to consumers
13
14 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
15
16 eclass/xorg-3.eclass | 5 ++---
17 1 file changed, 2 insertions(+), 3 deletions(-)
18
19 diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
20 index fa2731585429..f718a95f142e 100644
21 --- a/eclass/xorg-3.eclass
22 +++ b/eclass/xorg-3.eclass
23 @@ -52,6 +52,7 @@ fi
24 # we need to inherit autotools first to get the deps
25 inherit autotools libtool multilib toolchain-funcs flag-o-matic \
26 ${FONT_ECLASS} ${GIT_ECLASS}
27 +unset FONT_ECLASS GIT_ECLASS
28
29 if [[ ${XORG_MULTILIB} == yes ]]; then
30 inherit multilib-minimal
31 @@ -142,12 +143,10 @@ if [[ ${PN} != util-macros ]] ; then
32 # Required even by xorg-server
33 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
34 fi
35 -WANT_AUTOCONF="latest"
36 -WANT_AUTOMAKE="latest"
37 for arch in ${XORG_EAUTORECONF_ARCHES}; do
38 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
39 done
40 -unset arch
41 +unset arch XORG_EAUTORECONF_ARCHES
42 BDEPEND+=" ${EAUTORECONF_DEPENDS}"
43 [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
44 unset EAUTORECONF_DEPENDS