| 1 |
commit: c997aa2983897500ea89e38a12e99216bc84fd10 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 27 06:07:50 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 27 17:17:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c997aa29 |
| 7 |
|
| 8 |
xorg-2.eclass: Transition deps to x11-base/xorg-proto |
| 9 |
|
| 10 |
DRI_DEPEND can go away since all xf86-video-* drivers now directly |
| 11 |
depend on x11-base/xorg-proto, which includes the dependencies from |
| 12 |
DRI_DEPEND. |
| 13 |
|
| 14 |
eclass/xorg-2.eclass | 25 ++----------------------- |
| 15 |
1 file changed, 2 insertions(+), 23 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass |
| 18 |
index 42067095b55..96a469163cf 100644 |
| 19 |
--- a/eclass/xorg-2.eclass |
| 20 |
+++ b/eclass/xorg-2.eclass |
| 21 |
@@ -199,25 +199,17 @@ DRI_COMMON_DEPEND=" |
| 22 |
x11-base/xorg-server[-minimal] |
| 23 |
x11-libs/libdrm |
| 24 |
" |
| 25 |
-DRI_DEPEND=" |
| 26 |
- x11-proto/xf86driproto |
| 27 |
- x11-proto/glproto |
| 28 |
- x11-proto/dri2proto |
| 29 |
-" |
| 30 |
case ${XORG_DRI} in |
| 31 |
no) |
| 32 |
;; |
| 33 |
always) |
| 34 |
COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}" |
| 35 |
- DEPEND+=" ${DRI_DEPEND}" |
| 36 |
;; |
| 37 |
*) |
| 38 |
COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )" |
| 39 |
- DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )" |
| 40 |
IUSE+=" ${XORG_DRI}" |
| 41 |
;; |
| 42 |
esac |
| 43 |
-unset DRI_DEPEND |
| 44 |
unset DRI_COMMONDEPEND |
| 45 |
|
| 46 |
if [[ -n "${DRIVER}" ]]; then |
| 47 |
@@ -226,26 +218,13 @@ if [[ -n "${DRIVER}" ]]; then |
| 48 |
" |
| 49 |
fi |
| 50 |
if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then |
| 51 |
- DEPEND+=" |
| 52 |
- x11-proto/inputproto |
| 53 |
- x11-proto/kbproto |
| 54 |
- x11-proto/xproto |
| 55 |
- " |
| 56 |
+ DEPEND+="x11-base/xorg-proto" |
| 57 |
fi |
| 58 |
if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then |
| 59 |
COMMON_DEPEND+=" |
| 60 |
x11-libs/libpciaccess |
| 61 |
" |
| 62 |
- # we also needs some protos and libs in all cases |
| 63 |
- DEPEND+=" |
| 64 |
- x11-proto/fontsproto |
| 65 |
- x11-proto/randrproto |
| 66 |
- x11-proto/renderproto |
| 67 |
- x11-proto/videoproto |
| 68 |
- x11-proto/xextproto |
| 69 |
- x11-proto/xineramaproto |
| 70 |
- x11-proto/xproto |
| 71 |
- " |
| 72 |
+ DEPEND+="x11-base/xorg-proto" |
| 73 |
fi |
| 74 |
|
| 75 |
# @ECLASS-VARIABLE: XORG_DOC |
Archives