| 1 |
commit: b10527bc50026ed35184df44d63b688de2f72f85 |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 15 19:48:39 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 17 00:08:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10527bc |
| 7 |
|
| 8 |
xorg-3.eclass: set XORG_MODULE for xcb-util packages |
| 9 |
|
| 10 |
Other packages like xcb-proto and libxcb are also under xcb/, but |
| 11 |
they are duplicated under proto/ and lib/ and are already working |
| 12 |
there, so this only affects xcb-util packages. |
| 13 |
|
| 14 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/17133 |
| 16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/xorg-3.eclass | 19 ++++++++++--------- |
| 19 |
1 file changed, 10 insertions(+), 9 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass |
| 22 |
index d7729285bec..78c843401cc 100644 |
| 23 |
--- a/eclass/xorg-3.eclass |
| 24 |
+++ b/eclass/xorg-3.eclass |
| 25 |
@@ -85,15 +85,16 @@ IUSE="" |
| 26 |
# inherit to override the default autoconfigured module. |
| 27 |
: ${XORG_MODULE:="auto"} |
| 28 |
if [[ ${XORG_MODULE} == auto ]]; then |
| 29 |
- case ${CATEGORY} in |
| 30 |
- app-doc) XORG_MODULE=doc/ ;; |
| 31 |
- media-fonts) XORG_MODULE=font/ ;; |
| 32 |
- x11-apps|x11-wm) XORG_MODULE=app/ ;; |
| 33 |
- x11-misc|x11-themes) XORG_MODULE=util/ ;; |
| 34 |
- x11-base) XORG_MODULE=xserver/ ;; |
| 35 |
- x11-drivers) XORG_MODULE=driver/ ;; |
| 36 |
- x11-libs) XORG_MODULE=lib/ ;; |
| 37 |
- *) XORG_MODULE= ;; |
| 38 |
+ case "${CATEGORY}/${P}" in |
| 39 |
+ app-doc/*) XORG_MODULE=doc/ ;; |
| 40 |
+ media-fonts/*) XORG_MODULE=font/ ;; |
| 41 |
+ x11-apps/*|x11-wm/*) XORG_MODULE=app/ ;; |
| 42 |
+ x11-misc/*|x11-themes/*) XORG_MODULE=util/ ;; |
| 43 |
+ x11-base/*) XORG_MODULE=xserver/ ;; |
| 44 |
+ x11-drivers/*) XORG_MODULE=driver/ ;; |
| 45 |
+ x11-libs/xcb-util-*) XORG_MODULE=xcb/ ;; |
| 46 |
+ x11-libs/*) XORG_MODULE=lib/ ;; |
| 47 |
+ *) XORG_MODULE= ;; |
| 48 |
esac |
| 49 |
fi |
Archives