commit: b10527bc50026ed35184df44d63b688de2f72f85 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Sat Aug 15 19:48:39 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Aug 17 00:08:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10527bc
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 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17133 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> eclass/xorg-3.eclass | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index d7729285bec..78c843401cc 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
