summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2020-08-15 15:48:39 -0400
committerMatt Turner <mattst88@gentoo.org>2020-08-16 17:08:55 -0700
commitb10527bc50026ed35184df44d63b688de2f72f85 (patch)
tree041a8e7f568dd0481e22e632184bbed0557d930b /eclass/xorg-3.eclass
parentsys-cluster/kubernetes: 1.16.14 1.17.11 and 1.18.8 bump (diff)
downloadgentoo-b10527bc50026ed35184df44d63b688de2f72f85.tar.gz
gentoo-b10527bc50026ed35184df44d63b688de2f72f85.tar.bz2
gentoo-b10527bc50026ed35184df44d63b688de2f72f85.zip
xorg-3.eclass: set XORG_MODULE for xcb-util packages
Other packages like xcb-proto and libxcb are also under xcb/, but they are duplicated under proto/ and lib/ and are already working there, so this only affects xcb-util packages. Signed-off-by: David Michael <fedora.dm0@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17133 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'eclass/xorg-3.eclass')
-rw-r--r--eclass/xorg-3.eclass19
1 files changed, 10 insertions, 9 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index d7729285becd..78c843401cc7 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -85,15 +85,16 @@ IUSE=""
# inherit to override the default autoconfigured module.
: ${XORG_MODULE:="auto"}
if [[ ${XORG_MODULE} == auto ]]; then
- case ${CATEGORY} in
- app-doc) XORG_MODULE=doc/ ;;
- media-fonts) XORG_MODULE=font/ ;;
- x11-apps|x11-wm) XORG_MODULE=app/ ;;
- x11-misc|x11-themes) XORG_MODULE=util/ ;;
- x11-base) XORG_MODULE=xserver/ ;;
- x11-drivers) XORG_MODULE=driver/ ;;
- x11-libs) XORG_MODULE=lib/ ;;
- *) XORG_MODULE= ;;
+ case "${CATEGORY}/${P}" in
+ app-doc/*) XORG_MODULE=doc/ ;;
+ media-fonts/*) XORG_MODULE=font/ ;;
+ x11-apps/*|x11-wm/*) XORG_MODULE=app/ ;;
+ x11-misc/*|x11-themes/*) XORG_MODULE=util/ ;;
+ x11-base/*) XORG_MODULE=xserver/ ;;
+ x11-drivers/*) XORG_MODULE=driver/ ;;
+ x11-libs/xcb-util-*) XORG_MODULE=xcb/ ;;
+ x11-libs/*) XORG_MODULE=lib/ ;;
+ *) XORG_MODULE= ;;
esac
fi