DRI_DEPEND can go away since all xf86-video-* drivers now directly depend on x11-base/xorg-proto, which includes the dependencies from DRI_DEPEND. --- eclass/xorg-2.eclass | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 42067095b55b..96a469163cfd 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -199,25 +199,17 @@ DRI_COMMON_DEPEND=" x11-base/xorg-server[-minimal] x11-libs/libdrm " -DRI_DEPEND=" - x11-proto/xf86driproto - x11-proto/glproto - x11-proto/dri2proto -" case ${XORG_DRI} in no) ;; always) COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}" - DEPEND+=" ${DRI_DEPEND}" ;; *) COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )" - DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )" IUSE+=" ${XORG_DRI}" ;; esac -unset DRI_DEPEND unset DRI_COMMONDEPEND if [[ -n "${DRIVER}" ]]; then @@ -226,26 +218,13 @@ if [[ -n "${DRIVER}" ]]; then " fi if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then - DEPEND+=" - x11-proto/inputproto - x11-proto/kbproto - x11-proto/xproto - " + DEPEND+="x11-base/xorg-proto" fi if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then COMMON_DEPEND+=" x11-libs/libpciaccess " - # we also needs some protos and libs in all cases - DEPEND+=" - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - " + DEPEND+="x11-base/xorg-proto" fi # @ECLASS-VARIABLE: XORG_DOC -- 2.16.1