summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2019-02-27 21:14:41 -0800
committerMatt Turner <mattst88@gentoo.org>2019-02-27 21:44:46 -0800
commit16c2d3215a1f3e58a456b87d3a9cde4e02d371b9 (patch)
treec96d5f61836247d396bcd36a848eaf9ef6b01447
parentxorg-2.eclass: Allow dev-ruby/asciidoctor to be used (diff)
downloadgentoo-16c2d3215a1f3e58a456b87d3a9cde4e02d371b9.tar.gz
gentoo-16c2d3215a1f3e58a456b87d3a9cde4e02d371b9.tar.bz2
gentoo-16c2d3215a1f3e58a456b87d3a9cde4e02d371b9.zip
xorg-2.eclass: Make variable defaults apparent
XORG_MODULE_REBUILD has never been used outside of x11-libs/glamor which was removed a few years ago. Closes: https://bugs.gentoo.org/637898 Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--eclass/xorg-2.eclass17
1 files changed, 3 insertions, 14 deletions
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 081d5de6a38..416a3ae30ec 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -80,7 +80,8 @@ HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
# The subdirectory to download source from. Possible settings are app,
# doc, data, util, driver, font, lib, proto, xserver. Set above the
# inherit to override the default autoconfigured module.
-if [[ -z ${XORG_MODULE} ]]; then
+: ${XORG_MODULE:="auto"}
+if [[ ${XORG_MODULE} == auto ]]; then
case ${CATEGORY} in
app-doc) XORG_MODULE=doc/ ;;
media-fonts) XORG_MODULE=font/ ;;
@@ -257,19 +258,7 @@ case ${XORG_DOC} in
esac
unset DOC_DEPEND
-# @ECLASS-VARIABLE: XORG_MODULE_REBUILD
-# @DESCRIPTION:
-# Describes whether a package contains modules that need to be rebuilt on
-# xorg-server upgrade. This has an effect only since EAPI=5.
-# Possible values are "yes" or "no". Default value is "yes" for packages which
-# are recognized as DRIVER by this eclass and "no" for all other packages.
-if [[ "${DRIVER}" == yes ]]; then
- : ${XORG_MODULE_REBUILD:="yes"}
-else
- : ${XORG_MODULE_REBUILD:="no"}
-fi
-
-if [[ ${XORG_MODULE_REBUILD} == yes ]]; then
+if [[ ${DRIVER} == yes ]]; then
case ${EAPI} in
4)
;;