diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2018-04-27 17:59:44 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2018-04-27 17:59:44 +0000 |
| commit | 3d79d7f628008b63b39e4a9579bd2693783d9597 (patch) | |
| tree | 0a484762239e182d4b2e7fa1c42c933e8740685a | |
| parent | 2018-04-27 17:17:21 UTC (diff) | |
| parent | xorg-2.eclass: Add missing required space (diff) | |
| download | gentoo-3d79d7f628008b63b39e4a9579bd2693783d9597.tar.gz gentoo-3d79d7f628008b63b39e4a9579bd2693783d9597.tar.bz2 gentoo-3d79d7f628008b63b39e4a9579bd2693783d9597.zip | |
Merge updates from master
| -rw-r--r-- | eclass/kde4-base.eclass | 2 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 | ||||
| -rw-r--r-- | eclass/xorg-2.eclass | 27 |
3 files changed, 5 insertions, 27 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 8abade2677d4..72e4fcfe526b 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -387,7 +387,7 @@ kdedepend=" dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 - x11-proto/xf86vidmodeproto + x11-base/xorg-proto " kderdepend="" diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 2da455ad4e3b..df76dc4feb8c 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -206,11 +206,10 @@ DEPEND="${RDEPEND} if in_iuse gcj ; then GCJ_DEPS=">=media-libs/libart_lgpl-2.1" GCJ_GTK_DEPS=" + x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst - x11-proto/xproto - x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig " diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 42067095b55b..98a8df0cd3ad 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -199,26 +199,18 @@ 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 +unset DRI_COMMON_DEPEND if [[ -n "${DRIVER}" ]]; then COMMON_DEPEND+=" @@ -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 |