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: Thu, 28 Feb 2019 05:47:48
Message-Id: 1551332686.16c2d3215a1f3e58a456b87d3a9cde4e02d371b9.mattst88@gentoo
1 commit: 16c2d3215a1f3e58a456b87d3a9cde4e02d371b9
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 28 05:14:41 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 28 05:44:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c2d321
7
8 xorg-2.eclass: Make variable defaults apparent
9
10 XORG_MODULE_REBUILD has never been used outside of x11-libs/glamor which
11 was removed a few years ago.
12
13 Closes: https://bugs.gentoo.org/637898
14 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
15
16 eclass/xorg-2.eclass | 17 +++--------------
17 1 file changed, 3 insertions(+), 14 deletions(-)
18
19 diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
20 index 081d5de6a38..416a3ae30ec 100644
21 --- a/eclass/xorg-2.eclass
22 +++ b/eclass/xorg-2.eclass
23 @@ -80,7 +80,8 @@ HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
24 # The subdirectory to download source from. Possible settings are app,
25 # doc, data, util, driver, font, lib, proto, xserver. Set above the
26 # inherit to override the default autoconfigured module.
27 -if [[ -z ${XORG_MODULE} ]]; then
28 +: ${XORG_MODULE:="auto"}
29 +if [[ ${XORG_MODULE} == auto ]]; then
30 case ${CATEGORY} in
31 app-doc) XORG_MODULE=doc/ ;;
32 media-fonts) XORG_MODULE=font/ ;;
33 @@ -257,19 +258,7 @@ case ${XORG_DOC} in
34 esac
35 unset DOC_DEPEND
36
37 -# @ECLASS-VARIABLE: XORG_MODULE_REBUILD
38 -# @DESCRIPTION:
39 -# Describes whether a package contains modules that need to be rebuilt on
40 -# xorg-server upgrade. This has an effect only since EAPI=5.
41 -# Possible values are "yes" or "no". Default value is "yes" for packages which
42 -# are recognized as DRIVER by this eclass and "no" for all other packages.
43 -if [[ "${DRIVER}" == yes ]]; then
44 - : ${XORG_MODULE_REBUILD:="yes"}
45 -else
46 - : ${XORG_MODULE_REBUILD:="no"}
47 -fi
48 -
49 -if [[ ${XORG_MODULE_REBUILD} == yes ]]; then
50 +if [[ ${DRIVER} == yes ]]; then
51 case ${EAPI} in
52 4)
53 ;;