Gentoo Archives: gentoo-dev

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

Replies