diff options
168 files changed, 317 insertions, 480 deletions
diff --git a/dev-libs/ace/ace-5.7.2.ebuild b/dev-libs/ace/ace-5.7.2.ebuild index 36c1041a8db7..9eef7e48a630 100644 --- a/dev-libs/ace/ace-5.7.2.ebuild +++ b/dev-libs/ace/ace-5.7.2.ebuild @@ -24,7 +24,7 @@ RDEPEND="${COMMON_DEPEND} X? ( x11-libs/libXt x11-libs/libXaw )" DEPEND="${COMMON_DEPEND} - X? ( x11-proto/xproto )" + X? ( x11-base/xorg-proto )" S="${WORKDIR}/ACE_wrappers" diff --git a/dev-libs/ace/ace-5.8.3.ebuild b/dev-libs/ace/ace-5.8.3.ebuild index 5acad9eca3ce..295e81552a44 100644 --- a/dev-libs/ace/ace-5.8.3.ebuild +++ b/dev-libs/ace/ace-5.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ RDEPEND="${COMMON_DEPEND} X? ( x11-libs/libXt x11-libs/libXaw )" DEPEND="${COMMON_DEPEND} - X? ( x11-proto/xproto )" + X? ( x11-base/xorg-proto )" S="${WORKDIR}/ACE_wrappers" diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild index ace881fbca4b..34aacce2afe5 100644 --- a/dev-libs/libotf/libotf-0.9.13.ebuild +++ b/dev-libs/libotf/libotf-0.9.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,9 +21,9 @@ RDEPEND=">=media-libs/freetype-2.4.9 )" DEPEND="${RDEPEND} X? ( + x11-base/xorg-proto x11-libs/libICE x11-libs/libXmu - x11-proto/xproto )" DOCS="AUTHORS ChangeLog NEWS README" diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild index 1fdded3749e9..e0066ed99ca6 100644 --- a/dev-libs/libotf/libotf-0.9.16.ebuild +++ b/dev-libs/libotf/libotf-0.9.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,9 +22,9 @@ RDEPEND=">=media-libs/freetype-2.4.9 DEPEND="${RDEPEND} virtual/pkgconfig X? ( + x11-base/xorg-proto x11-libs/libICE x11-libs/libXmu - x11-proto/xproto )" DOCS="AUTHORS ChangeLog NEWS README" diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1.ebuild index ca71eba94a9c..cfa602722b05 100644 --- a/dev-libs/libstroke/libstroke-0.5.1.ebuild +++ b/dev-libs/libstroke/libstroke-0.5.1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" RDEPEND="x11-libs/libX11" -DEPEND="x11-proto/xproto +DEPEND="x11-base/xorg-proto ${RDEPEND}" src_unpack() { diff --git a/dev-lisp/clisp/clisp-2.48-r1.ebuild b/dev-lisp/clisp/clisp-2.48-r1.ebuild index 5c05721ba2e1..72cda6b64d06 100644 --- a/dev-lisp/clisp/clisp-2.48-r1.ebuild +++ b/dev-lisp/clisp/clisp-2.48-r1.ebuild @@ -31,7 +31,7 @@ RDEPEND="virtual/libiconv berkdb? ( sys-libs/db:4.5 )" DEPEND="${RDEPEND} - X? ( new-clx? ( x11-misc/imake x11-proto/xextproto ) )" + X? ( new-clx? ( x11-base/xorg-proto x11-misc/imake ) )" # dev-lisp/gentoo-init is obsolete, it will be dropped soon # This version of clisp is its last consumer diff --git a/dev-lisp/clisp/clisp-2.49-r9.ebuild b/dev-lisp/clisp/clisp-2.49-r9.ebuild index 8e7dacc3438d..f26813fdcd3d 100644 --- a/dev-lisp/clisp/clisp-2.49-r9.ebuild +++ b/dev-lisp/clisp/clisp-2.49-r9.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=dev-lisp/asdf-2.33-r3 # jit? ( >=dev-libs/lightning-1.2 ) DEPEND="${RDEPEND} - X? ( x11-misc/imake x11-proto/xextproto )" + X? ( x11-base/xorg-proto x11-misc/imake )" enable_modules() { [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument" diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild index 88ef82dddc38..8bf41b361b25 100644 --- a/dev-lisp/clisp/clisp-2.49.90.ebuild +++ b/dev-lisp/clisp/clisp-2.49.90.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=dev-lisp/asdf-2.33-r3 berkdb? ( sys-libs/db:4.8 )" DEPEND="${RDEPEND} - X? ( x11-misc/imake x11-proto/xextproto )" + X? ( x11-base/xorg-proto x11-misc/imake )" enable_modules() { [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument" diff --git a/dev-util/ddd/ddd-3.3.12-r3.ebuild b/dev-util/ddd/ddd-3.3.12-r3.ebuild index bed46086f113..25d5352a90b8 100644 --- a/dev-util/ddd/ddd-3.3.12-r3.ebuild +++ b/dev-util/ddd/ddd-3.3.12-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -28,7 +28,7 @@ COMMON_DEPEND=" readline? ( sys-libs/readline ) " DEPEND="${COMMON_DEPEND} - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} x11-apps/xfontsel diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild index 6c0222b31bf7..4110ccf39cd6 100644 --- a/dev-util/ddd/ddd-3.3.12-r4.ebuild +++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -28,7 +28,7 @@ COMMON_DEPEND=" readline? ( sys-libs/readline:* ) " DEPEND="${COMMON_DEPEND} - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} x11-apps/xfontsel diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild index 468dfb481a95..6dc61fc310ac 100644 --- a/gnome-base/gdm/gdm-3.24.3.ebuild +++ b/gnome-base/gdm/gdm-3.24.3.ebuild @@ -86,10 +86,8 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.0 dev-util/itstool virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto + x11-base/xorg-proto test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) " DOC_CONTENTS=" diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild index 3824d26612f3..5e32940aad46 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild @@ -110,9 +110,7 @@ RDEPEND="${COMMON_DEPEND} PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" DEPEND="${COMMON_DEPEND} - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto + x11-base/xorg-proto dev-libs/libxml2:2 dev-libs/libxslt diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild index e716fbf0258d..dbcd5ea476d1 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -37,8 +37,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 - x11-proto/xproto - >=x11-proto/randrproto-1.2 + x11-base/xorg-proto " PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}] >=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}] diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild index 2077b8c28950..23ef79b6f8aa 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild index ce672aeecd01..30c725168566 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild @@ -90,10 +90,7 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/kbproto - >=x11-proto/xproto-7.0.15 + x11-base/xorg-proto " # TypeErrors with python3; weird test errors with python2; all in power component that was made required now diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild index 080c2d9dfbba..50a2aedfd4d6 100644 --- a/gnome-base/nautilus/nautilus-3.20.4.ebuild +++ b/gnome-base/nautilus/nautilus-3.20.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} packagekit? ( app-admin/packagekit-base ) diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild index 217195b511d1..ec1bd6f72c7a 100644 --- a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild +++ b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild @@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} packagekit? ( app-admin/packagekit-base ) diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild index b1b173b37c18..500f58d7c46c 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto + x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild index ee1441423e0d..94fc1bf250a4 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto + x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild index fc5ab9e8080f..a3713bb7b68c 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto + x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild index 12619ac98563..12f5a93bba7e 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild @@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-text/iso-codes - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto + x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild index 4fb86d3d0526..f9959dea6e70 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -36,8 +36,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild index 300489c9c44b..050cdcc7e02f 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild index 7aa1c85f8eea..ceaa3c29ed27 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild index 91b950b837fd..2280d16410e5 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild index 547abb541964..c83638f2d736 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild index 12c1fd995ce9..a509d28ded90 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild @@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild index 87130ef96d5c..54a0d6e276ac 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild index 69108cbe65c8..7ae4daa8640b 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild index 7f9d0a8f6e6d..2b978b4e29d7 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild index f0b8bd8fd34e..b0916e14019a 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild index 163a5fbf28b7..53df4f1a9edc 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,10 +53,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild index 2c25f8005f72..d50ce77b2437 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild index 0f8f1d48b79e..f200fc231f7d 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild index cf81203bff73..af5cf3ca3e43 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild index cf81203bff73..af5cf3ca3e43 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild index 7f0fe607beef..0c336581cdca 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild @@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild index 566c3485d0d5..e175e6c40547 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -56,10 +56,7 @@ DEPEND="${COMMON_DEPEND} gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto + x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild index 88f1e7a56f1e..016d70f05fcd 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -52,7 +52,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild index 0c265d4540ec..57a99bc20855 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -51,7 +51,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild index 49d57f84de36..26b72223362b 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild index 8dc7f204f0a0..9ec0e9bcb654 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild index 5e1ec395b16a..9ec0e9bcb654 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild index 5e1ec395b16a..9ec0e9bcb654 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild index 8d31f636ef97..66ed58615ece 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild @@ -51,7 +51,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild index 33d4587404d7..5967c0fed3f1 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 - x11-proto/kbproto + x11-base/xorg-proto virtual/pkgconfig " diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild index 040231ce2727..5e67d409645f 100644 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild +++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild @@ -26,7 +26,7 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-sgml-utils dev-libs/appstream-glib >=sys-devel/gettext-0.19.7 - x11-proto/randrproto + x11-base/xorg-proto virtual/pkgconfig test? ( sys-apps/dbus ) " diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild index 2020a0d68e8d..b596e147e0ec 100644 --- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -25,7 +25,7 @@ RDEPEND=" >=net-libs/libsoup-2.26.0:2.4 " DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig diff --git a/gnome-extra/nemo/nemo-2.8.7.ebuild b/gnome-extra/nemo/nemo-2.8.7.ebuild index 1de930b387b7..91c651ac20c3 100644 --- a/gnome-extra/nemo/nemo-2.8.7.ebuild +++ b/gnome-extra/nemo/nemo-2.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common diff --git a/gnome-extra/nemo/nemo-3.0.6.ebuild b/gnome-extra/nemo/nemo-3.0.6.ebuild index 1de930b387b7..91c651ac20c3 100644 --- a/gnome-extra/nemo/nemo-3.0.6.ebuild +++ b/gnome-extra/nemo/nemo-3.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common diff --git a/gnome-extra/nemo/nemo-3.2.0.ebuild b/gnome-extra/nemo/nemo-3.2.0.ebuild index acb9b63c9b0a..9350691d26c2 100644 --- a/gnome-extra/nemo/nemo-3.2.0.ebuild +++ b/gnome-extra/nemo/nemo-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common diff --git a/gnome-extra/nemo/nemo-3.4.4.ebuild b/gnome-extra/nemo/nemo-3.4.4.ebuild index 2b85d70f926a..b553c7f9dce1 100644 --- a/gnome-extra/nemo/nemo-3.4.4.ebuild +++ b/gnome-extra/nemo/nemo-3.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common diff --git a/gnome-extra/nemo/nemo-3.4.7.ebuild b/gnome-extra/nemo/nemo-3.4.7.ebuild index 2b85d70f926a..b553c7f9dce1 100644 --- a/gnome-extra/nemo/nemo-3.4.7.ebuild +++ b/gnome-extra/nemo/nemo-3.4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild index 7b81e88dd9aa..d840df8f6897 100644 --- a/gnome-extra/nemo/nemo-3.6.4.ebuild +++ b/gnome-extra/nemo/nemo-3.6.4.ebuild @@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild index 91b4a855d733..c9b66ed53477 100644 --- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild +++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*" diff --git a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild index fca6534c9223..33b7a1fe0432 100644 --- a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild +++ b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*" diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild index ed1597ebd57f..240f763610ca 100644 --- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild +++ b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*" diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild index 5b8e1b43dc4d..0cb5aac9bf36 100644 --- a/media-libs/allegro/allegro-4.4.2-r1.ebuild +++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,12 +35,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) )" DEPEND="${RDEPEND} virtual/pkgconfig - X? ( - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - x11-proto/xproto - )" + X? ( x11-base/xorg-proto )" PATCHES=( "${FILESDIR}"/${P}-shared.patch diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild index 1dd3002441e6..f54c046fec53 100644 --- a/media-libs/allegro/allegro-5.0.11.ebuild +++ b/media-libs/allegro/allegro-5.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -34,9 +34,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch ) diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild index 147ec0c3800e..3c7f941a6632 100644 --- a/media-libs/coin/coin-3.1.3-r2.ebuild +++ b/media-libs/coin/coin-3.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xextproto + x11-base/xorg-proto doc? ( app-doc/doxygen ) " S="${WORKDIR}/${MY_P}" diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild index da490ba09d21..815c8aa67e80 100644 --- a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild +++ b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" simage? ( media-libs/simage ) " DEPEND="${RDEPEND} - x11-proto/xextproto + x11-base/xorg-proto doc? ( app-doc/doxygen qthelp? ( dev-qt/qthelp:5 ) diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild index 9c833edd6833..4d74269bfece 100644 --- a/media-libs/devil/devil-1.7.8-r2.ebuild +++ b/media-libs/devil/devil-1.7.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -36,7 +36,7 @@ RDEPEND=" xpm? ( x11-libs/libXpm )" DEPEND="${RDEPEND} virtual/pkgconfig - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" PATCHES=( "${FILESDIR}/${P}"-CVE-2009-3994.patch diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild index 5999aa059199..e82008028a8d 100644 --- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild +++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,8 +22,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig - >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" + x11-base/xorg-proto" PATCHES=( # Please read the comments in the patch before thinking about dropping it diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild index e1adbfa5560e..c3ee6fb9dd2b 100644 --- a/media-libs/freeglut/freeglut-3.0.0.ebuild +++ b/media-libs/freeglut/freeglut-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,8 +24,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] # gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} virtual/pkgconfig - >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" + x11-base/xorg-proto" HTML_DOCS=( doc/. ) diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild index 8c4a9717025f..cc4b3786ef67 100644 --- a/media-libs/glew/glew-1.10.0-r100.ebuild +++ b/media-libs/glew/glew-1.10.0-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,8 +16,8 @@ RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] !=media-libs/glew-1.10*:0" DEPEND="${RDEPEND} - x11-libs/libX11 - x11-proto/xproto" + x11-base/xorg-proto + x11-libs/libX11" DOCS="" diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild index 1ce200c72f2e..e730aa775712 100644 --- a/media-libs/glew/glew-1.6.0-r100.ebuild +++ b/media-libs/glew/glew-1.6.0-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - x11-libs/libX11 - x11-proto/xproto" + x11-base/xorg-proto + x11-libs/libX11" DOCS="" diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild index 16339238ba98..e2424730804f 100644 --- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild +++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -41,10 +41,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - X? ( - >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) " multilib_src_configure() { diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild index 7d3e5f7618e5..e3e797dd39e4 100644 --- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild +++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild @@ -41,10 +41,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - X? ( - >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) " multilib_src_configure() { diff --git a/media-libs/imlib2/imlib2-1.4.10.ebuild b/media-libs/imlib2/imlib2-1.4.10.ebuild index 01bf754dc87c..c6cf6140491b 100644 --- a/media-libs/imlib2/imlib2-1.4.10.ebuild +++ b/media-libs/imlib2/imlib2-1.4.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -33,10 +33,7 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}] mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - )" + X? ( x11-base/xorg-proto )" multilib_src_configure() { # imlib2 has diff configure options for x86/amd64 assembly diff --git a/media-libs/imlib2/imlib2-1.4.9.ebuild b/media-libs/imlib2/imlib2-1.4.9.ebuild index 9205b5741a33..5f43a4f2b01d 100644 --- a/media-libs/imlib2/imlib2-1.4.9.ebuild +++ b/media-libs/imlib2/imlib2-1.4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -33,10 +33,7 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}] mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - )" + X? ( x11-base/xorg-proto )" multilib_src_configure() { # imlib2 has diff configure options for x86/amd64 assembly diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild index b9c2d44d1bce..20c6dc888539 100644 --- a/media-libs/imlib2/imlib2-1.5.1.ebuild +++ b/media-libs/imlib2/imlib2-1.5.1.ebuild @@ -32,10 +32,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( - x11-proto/xextproto[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] - ) + X? ( x11-base/xorg-proto ) " multilib_src_configure() { diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild index dccea068d84c..d615b8dd8ead 100644 --- a/media-libs/imlib2/imlib2-9999.ebuild +++ b/media-libs/imlib2/imlib2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -31,10 +31,8 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}] mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - )" + X? ( x11-base/xorg-proto ) +" multilib_src_configure() { # imlib2 has diff configure options for x86/amd64 assembly diff --git a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild index e6e47afe01ea..a07d828b9ebc 100644 --- a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild +++ b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,11 +14,12 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="X static-libs" -RDEPEND="X? ( >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] +RDEPEND="X? ( + >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" src_configure() { local myeconfargs=( diff --git a/media-libs/libXcm/libXcm-0.5.4.ebuild b/media-libs/libXcm/libXcm-0.5.4.ebuild index cd3d3486d625..9cc1630a341a 100644 --- a/media-libs/libXcm/libXcm-0.5.4.ebuild +++ b/media-libs/libXcm/libXcm-0.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,10 +25,10 @@ RDEPEND=" x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] x11-libs/libXmu[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" [[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}" diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild index 1ffafce9a399..d39e3f05a318 100644 --- a/media-libs/libXcm/libXcm-9999.ebuild +++ b/media-libs/libXcm/libXcm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,10 +25,10 @@ RDEPEND=" x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] x11-libs/libXmu[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" [[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}" diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild index f2ef350c2460..c811abb6f5d7 100644 --- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild +++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ RDEPEND=" tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype )" DEPEND="${RDEPEND} - X? ( x11-proto/xextproto ) + X? ( x11-base/xorg-proto ) virtual/pkgconfig !!x11-wm/afterstep" REQUIRED_USE=" diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild index 3bf50416b5cf..49ee65b7e717 100644 --- a/media-libs/libggi/libggi-2.2.2.ebuild +++ b/media-libs/libggi/libggi-2.2.2.ebuild @@ -20,9 +20,7 @@ RDEPEND=">=media-libs/libgii-1.0.2 svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( >=media-libs/aalib-1.2-r1 )" DEPEND="${RDEPEND} - X? ( x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" src_compile() { local myconf="" diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild index 0404b4793fc8..a894b9e8eea8 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild +++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,7 +22,7 @@ RDEPEND="sdl? ( media-libs/libsdl ) x11-libs/libXt )" DEPEND="${RDEPEND} - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" DOCS=( AUTHORS ChangeLog NEWS README TODO ) diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild index f52066263bb0..ddb69d4245d5 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild +++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild @@ -47,7 +47,7 @@ DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] sys-devel/gettext doc? ( app-doc/doxygen ) - X? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )" + X? ( x11-base/xorg-proto )" REQUIRED_USE="opengl? ( X )" diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild index 9adcccf9a4b9..f5679f595b96 100644 --- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild +++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -39,14 +39,8 @@ RDEPEND=" tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - nas? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) + nas? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" S=${WORKDIR}/SDL-${PV} diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild index 64d505347c66..e3a0c12691c3 100644 --- a/media-libs/libsdl2/libsdl2-2.0.4.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.4.ebuild @@ -57,10 +57,7 @@ RDEPEND=" xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) + X? ( x11-base/xorg-proto ) virtual/pkgconfig" S=${WORKDIR}/${MY_P} diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild index 8ee6ce877f35..dc0b149e259b 100644 --- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild @@ -55,10 +55,7 @@ RDEPEND=" xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) + X? ( x11-base/xorg-proto ) virtual/pkgconfig" MULTILIB_WRAPPED_HEADERS=( diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild index 0690eaf5b399..e94f3842e77f 100644 --- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild @@ -55,10 +55,7 @@ RDEPEND=" xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) + X? ( x11-base/xorg-proto ) virtual/pkgconfig" MULTILIB_WRAPPED_HEADERS=( diff --git a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild index 2b029f159483..6be02060bb7c 100644 --- a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -43,7 +43,7 @@ RDEPEND=">=net-libs/ortp-0.17[ipv6?] DEPEND="${RDEPEND} dev-util/intltool virtual/pkgconfig - x11-proto/videoproto + x11-base/xorg-proto doc? ( app-doc/doxygen )" PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) ) diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild index 59f335c92f54..b86f9ade9547 100644 --- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) test? ( >=dev-util/cunit-2.1_p2[ncurses] ) video? ( dev-util/xxdi ) - X? ( x11-proto/videoproto ) + X? ( x11-base/xorg-proto ) " PDEPEND=" amr? ( !bindist? ( media-plugins/mediastreamer-amr ) ) diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild index c1821f5ec1b9..378c8541a722 100644 --- a/media-libs/mesa/mesa-17.3.9.ebuild +++ b/media-libs/mesa/mesa-17.3.9.ebuild @@ -76,7 +76,6 @@ REQUIRED_USE=" " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89" -# keep correct libdrm and dri2proto dep # keep blocks in rdepend for binpkg RDEPEND=" !<x11-base/xorg-server-1.7 @@ -222,15 +221,7 @@ DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] + x11-base/xorg-proto vulkan? ( $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") ) diff --git a/media-libs/mesa/mesa-18.0.2.ebuild b/media-libs/mesa/mesa-18.0.2.ebuild index 6cdc82a5cc3e..874ec0c25836 100644 --- a/media-libs/mesa/mesa-18.0.2.ebuild +++ b/media-libs/mesa/mesa-18.0.2.ebuild @@ -76,7 +76,6 @@ REQUIRED_USE=" " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89" -# keep correct libdrm and dri2proto dep # keep blocks in rdepend for binpkg RDEPEND=" !<x11-base/xorg-server-1.7 @@ -222,15 +221,7 @@ DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] + x11-base/xorg-proto vulkan? ( $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") ) diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild index 61931b3908bd..b32a29ee5f5a 100644 --- a/media-libs/nas/nas-1.9.4-r1.ebuild +++ b/media-libs/nas/nas-1.9.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,9 +26,9 @@ DEPEND="${RDEPEND} app-text/rman sys-devel/bison sys-devel/flex + x11-base/xorg-proto x11-misc/gccmakedep - x11-misc/imake - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" + x11-misc/imake" DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild index dd390c7ea581..f1d536a4f7b9 100644 --- a/media-libs/nas/nas-1.9.4-r2.ebuild +++ b/media-libs/nas/nas-1.9.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,9 +26,9 @@ DEPEND="${RDEPEND} app-text/rman sys-devel/bison sys-devel/flex + x11-base/xorg-proto x11-misc/gccmakedep - x11-misc/imake - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" + x11-misc/imake" DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) diff --git a/media-libs/nas/nas-1.9.4.ebuild b/media-libs/nas/nas-1.9.4.ebuild index a25f104c28aa..b4d725430ae5 100644 --- a/media-libs/nas/nas-1.9.4.ebuild +++ b/media-libs/nas/nas-1.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,9 +26,9 @@ DEPEND="${RDEPEND} app-text/rman sys-devel/bison sys-devel/flex + x11-base/xorg-proto x11-misc/gccmakedep - x11-misc/imake - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" + x11-misc/imake" DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild index d25337bcbd08..710fd2e1797e 100644 --- a/media-libs/urt/urt-3.1b-r1.ebuild +++ b/media-libs/urt/urt-3.1b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -19,7 +19,7 @@ RDEPEND="X? ( x11-libs/libXext ) tiff? ( media-libs/tiff ) postscript? ( app-text/ghostscript-gpl )" DEPEND="${RDEPEND} - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" S=${WORKDIR} diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild index 46fdc6533c60..085547073ef7 100644 --- a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -104,13 +104,12 @@ DEPEND="${RDEPEND} oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( + x11-base/xorg-proto x11-libs/libXt - x11-proto/xf86vidmodeproto - x11-proto/xproto ) - xv? ( x11-proto/videoproto ) - xvmc? ( x11-proto/videoproto ) - xinerama? ( x11-proto/xineramaproto )" + xv? ( x11-base/xorg-proto ) + xvmc? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto )" REQUIRED_USE="vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )" diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild index b3fd25d6f7a1..8b7764e24710 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild @@ -103,13 +103,12 @@ DEPEND="${RDEPEND} oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( + x11-base/xorg-proto x11-libs/libXt - x11-proto/xf86vidmodeproto - x11-proto/xproto ) - xv? ( x11-proto/videoproto ) - xvmc? ( x11-proto/videoproto ) - xinerama? ( x11-proto/xineramaproto )" + xv? ( x11-base/xorg-proto ) + xvmc? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto )" REQUIRED_USE="vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )" diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index 7938ae7f0b18..053e16e28383 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -103,13 +103,12 @@ DEPEND="${RDEPEND} oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( + x11-base/xorg-proto x11-libs/libXt - x11-proto/xf86vidmodeproto - x11-proto/xproto ) - xv? ( x11-proto/videoproto ) - xvmc? ( x11-proto/videoproto ) - xinerama? ( x11-proto/xineramaproto )" + xv? ( x11-base/xorg-proto ) + xvmc? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto )" REQUIRED_USE="vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )" diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild index 99e52cef5e35..bc72aa245074 100644 --- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild +++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -12,8 +12,7 @@ IUSE="" RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]" + x11-base/xorg-proto" # xshm is a compile time option of ximage, which is in libXext GST_PLUGINS_BUILD="x xshm" diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild index 6e3450be6137..1b1b38a13ef3 100644 --- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -18,10 +18,7 @@ RDEPEND=" >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] + x11-base/xorg-proto " # xshm is a compile time option of ximage diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild index 46d150ccc6ab..e9a0f3958ffb 100644 --- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,10 +18,7 @@ RDEPEND=" >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] + x11-base/xorg-proto " # xshm is a compile time option of ximage diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild index 572d5865e96b..5beb37b776a6 100644 --- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild @@ -18,10 +18,7 @@ RDEPEND=" >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] + x11-base/xorg-proto " # xshm is a compile time option of ximage diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild index e66e5e0c87f9..56fece1ff408 100644 --- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild +++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -12,9 +12,7 @@ IUSE="" RDEPEND=">=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]" + x11-base/xorg-proto" # xshm is a compile time option of xvideo # x is needed to build any X plugins, but we build/install only xv anyway diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild index 5eace810e33c..22ecc06ccddf 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext ) xine? ( X? ( - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXxf86vm ) )" diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild index 570df0c7c24a..d594f721d335 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext ) xine? ( X? ( - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXxf86vm ) )" diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild index ba800d6eb61f..6f3eb19458b0 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext ) xine? ( X? ( - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXxf86vm ) )" diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild index 6f0aac3f5d5d..d383380175cd 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext ) xine? ( X? ( - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXxf86vm ) )" diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild index b3c8f7c0edad..bca8332076fa 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext ) xine? ( X? ( - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXxf86vm ) )" diff --git a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild index cb7082f7b1e8..47b54c20984a 100644 --- a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild +++ b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild @@ -22,7 +22,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext media-libs/alsa-lib" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" S=${WORKDIR}/${MY_P} diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11.ebuild index 70e8fdeb0cdc..a5df5a182405 100644 --- a/media-sound/bristol/bristol-0.60.11.ebuild +++ b/media-sound/bristol/bristol-0.60.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,8 +22,8 @@ RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11" # osc? ( >=media-libs/liblo-0.22 ) DEPEND="${RDEPEND} - x11-proto/xproto - virtual/pkgconfig" + virtual/pkgconfig + x11-base/xorg-proto" DOCS=( AUTHORS ChangeLog HOWTO NEWS README ) diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild index 84cc501d0363..1b2744c0bfc8 100644 --- a/media-sound/bristol/bristol-0.60.9.ebuild +++ b/media-sound/bristol/bristol-0.60.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -21,8 +21,8 @@ RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11" # osc? ( >=media-libs/liblo-0.22 ) DEPEND="${RDEPEND} - x11-proto/xproto - virtual/pkgconfig" + virtual/pkgconfig + x11-base/xorg-proto" DOCS=( AUTHORS ChangeLog HOWTO NEWS README ) diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild index 19665203aa80..2647e954d2c2 100644 --- a/media-sound/mup/mup-6.6.ebuild +++ b/media-sound/mup/mup-6.6.ebuild @@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11 virtual/jpeg:0 media-libs/libpng:0=" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) diff --git a/media-sound/playmidi/playmidi-2.5-r2.ebuild b/media-sound/playmidi/playmidi-2.5-r2.ebuild index a0ed1dae4518..a1bcd8e8f0c0 100644 --- a/media-sound/playmidi/playmidi-2.5-r2.ebuild +++ b/media-sound/playmidi/playmidi-2.5-r2.ebuild @@ -20,7 +20,7 @@ RDEPEND="sys-libs/ncurses x11-libs/libSM x11-libs/libXaw )" DEPEND="${RDEPEND} - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" S="${WORKDIR}/${P/2.5/2.4}" diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild index 718125ed583f..05a7ad3d1780 100644 --- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild @@ -90,7 +90,7 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) test? ( >=dev-libs/check-0.9.10 ) X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] + x11-base/xorg-proto >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] ) dev-libs/libatomic_ops diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild index b64ae46f367d..14de37e0dfb3 100644 --- a/media-sound/schismtracker/schismtracker-20120105.ebuild +++ b/media-sound/schismtracker/schismtracker-20120105.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -21,9 +21,7 @@ RDEPEND="media-libs/alsa-lib x11-libs/libXxf86misc" DEPEND="${RDEPEND} virtual/os-headers - x11-proto/kbproto - x11-proto/xf86miscproto - x11-proto/xproto" + x11-base/xorg-proto" DOCS="AUTHORS NEWS README TODO" diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4.ebuild index d5c52c114d11..ade33b06d5b9 100644 --- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild +++ b/media-sound/synaesthesia/synaesthesia-2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=2 @@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext sdl? ( >=media-libs/libsdl-1.2 ) svga? ( >=media-libs/svgalib-1.4.3 )" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" src_prepare() { sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \ diff --git a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild index 8723f7c1e47a..4a36941b17d5 100644 --- a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild +++ b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -17,7 +17,7 @@ IUSE="" RDEPEND="media-libs/alsa-lib x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" pkg_setup() { tc-export CXX diff --git a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild index cdf69d35b90a..56fd2ccbeca4 100644 --- a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild +++ b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=2 @@ -18,10 +18,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) lash? ( media-sound/lash ) x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xf86bigfontproto - x11-proto/bigreqsproto - x11-proto/xextproto - x11-proto/xcmiscproto" + x11-base/xorg-proto" S=${WORKDIR}/${PN} diff --git a/media-tv/mythtv/mythtv-0.28.1-r4.ebuild b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild index c030c6623d2f..50c45fc9e8bf 100644 --- a/media-tv/mythtv/mythtv-0.28.1-r4.ebuild +++ b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -129,8 +129,7 @@ RDEPEND="${COMMON} " DEPEND="${COMMON} dev-lang/yasm - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto + x11-base/xorg-proto " S="${WORKDIR}/${P}/mythtv" diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild index 39d120ba773d..e188d0766f7b 100644 --- a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild +++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ RDEPEND="sys-apps/pciutils[-zlib] x11-libs/libXxf86vm )" DEPEND="${RDEPEND} - X? ( x11-proto/xf86vidmodeproto )" + X? ( x11-base/xorg-proto )" PATCHES=( "${FILESDIR}/respect-cflags.patch" ) diff --git a/net-im/kadu/kadu-2.1-r1.ebuild b/net-im/kadu/kadu-2.1-r1.ebuild index fd2aded6d050..a1626c60b44c 100644 --- a/net-im/kadu/kadu-2.1-r1.ebuild +++ b/net-im/kadu/kadu-2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -57,9 +57,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} >=dev-qt/linguist-tools-5.2.0:5 - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} speech? ( app-accessibility/powiedz ) diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild index e348cb31a4d5..c6c749dc4d31 100644 --- a/net-im/kadu/kadu-4.3-r2.ebuild +++ b/net-im/kadu/kadu-4.3-r2.ebuild @@ -57,9 +57,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-qt/linguist-tools:5 - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} speech? ( app-accessibility/powiedz ) diff --git a/net-im/pidgin/pidgin-2.12.0.ebuild b/net-im/pidgin/pidgin-2.12.0.ebuild index 1a3a72f94475..8b5835e6f762 100644 --- a/net-im/pidgin/pidgin-2.12.0.ebuild +++ b/net-im/pidgin/pidgin-2.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -87,7 +87,7 @@ DEPEND="$RDEPEND dev-perl/XML-Parser virtual/pkgconfig gtk? ( - x11-proto/scrnsaverproto + x11-base/xorg-proto ${NLS_DEPEND} ) dbus? ( ${PYTHON_DEPS} ) diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild index 3b87c2f0879c..f82241ebac7c 100644 --- a/net-im/pidgin/pidgin-2.13.0.ebuild +++ b/net-im/pidgin/pidgin-2.13.0.ebuild @@ -88,7 +88,7 @@ DEPEND="$RDEPEND dev-perl/XML-Parser virtual/pkgconfig gtk? ( - x11-proto/scrnsaverproto + x11-base/xorg-proto ${NLS_DEPEND} ) dbus? ( ${PYTHON_DEPS} ) diff --git a/net-mail/asmail/asmail-2.1-r1.ebuild b/net-mail/asmail/asmail-2.1-r1.ebuild index ca22bcd63a64..0aaf3d03b700 100644 --- a/net-mail/asmail/asmail-2.1-r1.ebuild +++ b/net-mail/asmail/asmail-2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -24,7 +24,7 @@ RDEPEND=" x11-libs/libSM jpeg? ( virtual/jpeg:= )" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" src_prepare() { epatch "${FILESDIR}"/${P}-ldflags.patch diff --git a/net-mail/asmail/asmail-2.1.ebuild b/net-mail/asmail/asmail-2.1.ebuild index 93fc38e7cdde..3adcfa115c3b 100644 --- a/net-mail/asmail/asmail-2.1.ebuild +++ b/net-mail/asmail/asmail-2.1.ebuild @@ -22,7 +22,7 @@ RDEPEND="dev-libs/openssl x11-libs/libSM jpeg? ( virtual/jpeg )" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" src_compile() { epatch "${FILESDIR}"/${P}-ldflags.patch diff --git a/net-misc/nx/nx-3.5.0.33.ebuild b/net-misc/nx/nx-3.5.0.33.ebuild index ab94da473f76..2623a5acd254 100644 --- a/net-misc/nx/nx-3.5.0.33.ebuild +++ b/net-misc/nx/nx-3.5.0.33.ebuild @@ -20,10 +20,10 @@ RDEPEND="media-libs/freetype:2 virtual/jpeg:*" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-libs/libfontenc x11-misc/gccmakedep - x11-misc/imake - x11-proto/inputproto" + x11-misc/imake" S=${WORKDIR}/nx-libs-${PV} diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild index e073af44a604..7983f9f624fc 100644 --- a/net-misc/nx/nx-3.5.99.16.ebuild +++ b/net-misc/nx/nx-3.5.99.16.ebuild @@ -36,11 +36,10 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig + x11-base/xorg-proto x11-libs/libfontenc x11-misc/gccmakedep - x11-misc/imake - x11-proto/inputproto - x11-proto/xextproto" + x11-misc/imake" S="${WORKDIR}/nx-libs-${PV}" diff --git a/net-misc/suite3270/suite3270-3.4_p10.ebuild b/net-misc/suite3270/suite3270-3.4_p10.ebuild index d3e53d33da3d..8eaf62808b26 100644 --- a/net-misc/suite3270/suite3270-3.4_p10.ebuild +++ b/net-misc/suite3270/suite3270-3.4_p10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 )" DEPEND="${RDEPEND} X? ( + x11-base/xorg-proto x11-misc/xbitmaps - x11-proto/xproto app-text/rman x11-apps/mkfontdir x11-apps/bdftopcf diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild index 54e2cc5b3a59..8f3125ae488d 100644 --- a/net-misc/suite3270/suite3270-3.5_p10.ebuild +++ b/net-misc/suite3270/suite3270-3.5_p10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 )" DEPEND="${RDEPEND} X? ( + x11-base/xorg-proto x11-misc/xbitmaps - x11-proto/xproto app-text/rman x11-apps/mkfontdir x11-apps/bdftopcf diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild index b3723ee24476..f842aa368b8c 100644 --- a/net-misc/suite3270/suite3270-3.5_p12.ebuild +++ b/net-misc/suite3270/suite3270-3.5_p12.ebuild @@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 )" DEPEND="${RDEPEND} X? ( + x11-base/xorg-proto x11-misc/xbitmaps - x11-proto/xproto app-text/rman x11-apps/mkfontdir x11-apps/bdftopcf diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild index b3723ee24476..f842aa368b8c 100644 --- a/net-misc/suite3270/suite3270-3.6_p4.ebuild +++ b/net-misc/suite3270/suite3270-3.6_p4.ebuild @@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 )" DEPEND="${RDEPEND} X? ( + x11-base/xorg-proto x11-misc/xbitmaps - x11-proto/xproto app-text/rman x11-apps/mkfontdir x11-apps/bdftopcf diff --git a/net-misc/vncrec/vncrec-0.2-r2.ebuild b/net-misc/vncrec/vncrec-0.2-r2.ebuild index 759d2b27ac5f..cb4d1e4f751c 100644 --- a/net-misc/vncrec/vncrec-0.2-r2.ebuild +++ b/net-misc/vncrec/vncrec-0.2-r2.ebuild @@ -22,9 +22,9 @@ RDEPEND=" " DEPEND="${RDEPEND} app-text/rman + x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake - x11-proto/xextproto " DOCS=( README README.vnc ) diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.20.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.20.1.ebuild index 990e91c2b0f6..e3aadafacfd3 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.20.1.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.20.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} dev-util/itstool virtual/libudev virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " # eautoreconf needs: # gnome-base/gnome-common diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild index df9d6c081a20..6c3220866fdd 100644 --- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild +++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild @@ -10,6 +10,5 @@ DESCRIPTION="X.Org bdftopcf application" KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND=" - x11-proto/fontsproto - x11-proto/xproto" + x11-base/xorg-proto" RDEPEND="" diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild index 084c861bc6be..fbcafd4b17a2 100644 --- a/x11-apps/iceauth/iceauth-1.0.8.ebuild +++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild @@ -12,4 +12,4 @@ IUSE="" RDEPEND="x11-libs/libICE" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild index f14f3fa384ae..69ac7b3936c9 100644 --- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild +++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild @@ -18,7 +18,7 @@ X86_RDEPEND=" x11-libs/libXext x11-libs/libXv )" -X86_DEPEND=">=x11-proto/dri2proto-2.6" +X86_DEPEND="x11-base/xorg-proto" RDEPEND="sys-apps/kmod:= sys-process/procps:= >=x11-libs/cairo-1.12.0[X?] diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild index 1e807c1632f6..aa6ffbd8f9a2 100644 --- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ RDEPEND=" DEPEND="${RDEPEND} media-libs/glew virtual/glu - x11-proto/xproto" + x11-base/xorg-proto" S=${WORKDIR}/${MY_P} EGIT_CHECKOUT_DIR=${S} diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild index d999d44c52e5..07729580b329 100644 --- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ RDEPEND=" DEPEND="${RDEPEND} media-libs/glew virtual/glu - x11-proto/xproto" + x11-base/xorg-proto" S=${WORKDIR}/${MY_P} EGIT_CHECKOUT_DIR=${S} diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 3765af34344b..5d949f23bd54 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ RDEPEND=" DEPEND="${RDEPEND} media-libs/glew virtual/glu - x11-proto/xproto" + x11-base/xorg-proto" S=${WORKDIR}/${MY_P} EGIT_CHECKOUT_DIR=${S} diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild index c95b6737e415..ca04af88a15b 100644 --- a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild +++ b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ IUSE="" RDEPEND="x11-libs/libfontenc media-libs/freetype:2" DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto app-arch/gzip app-arch/bzip2" diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild index 17fd24b91e3a..4283de38eefa 100644 --- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild +++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc sys-libs/zlib app-arch/bzip2" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-misc/util-macros - x11-proto/xproto app-arch/gzip" XORG_CONFIGURE_OPTIONS=( diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild index 1766e34c190b..495a445d1f95 100644 --- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild +++ b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild @@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc sys-libs/zlib app-arch/bzip2" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-misc/util-macros - x11-proto/xproto app-arch/gzip" XORG_CONFIGURE_OPTIONS=( diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild index cdc6a73115a2..79ed018a5ac0 100644 --- a/x11-apps/rgb/rgb-1.0.5.ebuild +++ b/x11-apps/rgb/rgb-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,4 +11,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f IUSE="" RDEPEND="" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild index 8dc4a3f076f2..16d1e459c1ca 100644 --- a/x11-apps/rgb/rgb-1.0.6.ebuild +++ b/x11-apps/rgb/rgb-1.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,5 +11,5 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - x11-misc/util-macros - x11-proto/xproto" + x11-base/xorg-proto + x11-misc/util-macros" diff --git a/x11-apps/sessreg/sessreg-1.1.1.ebuild b/x11-apps/sessreg/sessreg-1.1.1.ebuild index 2193ff0538aa..b2c0ed90b6ff 100644 --- a/x11-apps/sessreg/sessreg-1.1.1.ebuild +++ b/x11-apps/sessreg/sessreg-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,4 +11,4 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild index a2f14e270867..d0aa1d6e3b3d 100644 --- a/x11-apps/transset/transset-1.0.1.ebuild +++ b/x11-apps/transset/transset-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,4 +13,4 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - >=x11-proto/xproto-7.0.17" + x11-base/xorg-proto" diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild index 061b3239cd7b..d0aa1d6e3b3d 100644 --- a/x11-apps/transset/transset-1.0.2.ebuild +++ b/x11-apps/transset/transset-1.0.2.ebuild @@ -13,4 +13,4 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - >=x11-proto/xproto-7.0.17" + x11-base/xorg-proto" diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild index aa93c76e2183..8df4f1fe96fc 100644 --- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild +++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,6 +14,5 @@ RDEPEND=" x11-libs/libX11 " DEPEND="${RDEPEND} - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild index 4233aea63111..7799fbfa3e79 100644 --- a/x11-apps/xdm/xdm-1.1.11-r3.ebuild +++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,9 +28,8 @@ RDEPEND="x11-apps/xrdb pam? ( virtual/pam ) !<sys-apps/systemd-187" DEPEND="${RDEPEND} - consolekit? ( !=sys-auth/pambase-20101024-r1 ) - x11-proto/xineramaproto - x11-proto/xproto" + x11-base/xorg-proto + consolekit? ( !=sys-auth/pambase-20101024-r1 )" pkg_setup() { PATCHES=( diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild index fe6297132ec0..1b65aca89d80 100644 --- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild +++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,16 +22,7 @@ RDEPEND=" xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} - x11-proto/compositeproto - x11-proto/inputproto - x11-proto/kbproto - x11-proto/renderproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xproto - dga? ( x11-proto/xf86dgaproto ) - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " pkg_setup() { diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild index fe6297132ec0..1b65aca89d80 100644 --- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild +++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,16 +22,7 @@ RDEPEND=" xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} - x11-proto/compositeproto - x11-proto/inputproto - x11-proto/kbproto - x11-proto/renderproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xproto - dga? ( x11-proto/xf86dgaproto ) - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " pkg_setup() { diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild index bc84de10df6e..9e95c9e43c3f 100644 --- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild +++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ IUSE="" RDEPEND="x11-libs/libX11 virtual/opengl" DEPEND="${RDEPEND} - x11-proto/glproto" + x11-base/xorg-proto" pkg_setup() { xorg-2_pkg_setup diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild index 1801d61d66e8..8a64373394ae 100644 --- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild +++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild @@ -12,7 +12,7 @@ IUSE="" RDEPEND="x11-libs/libX11 virtual/opengl" DEPEND="${RDEPEND} - x11-proto/glproto" + x11-base/xorg-proto" pkg_setup() { xorg-2_pkg_setup diff --git a/x11-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild index 2194489aa3b8..ec3eda23d5fa 100644 --- a/x11-apps/xev/xev-1.2.1.ebuild +++ b/x11-apps/xev/xev-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,4 +13,4 @@ IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXrandr" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild index 33c1a0371cd4..29d2b7979e0f 100644 --- a/x11-apps/xev/xev-1.2.2.ebuild +++ b/x11-apps/xev/xev-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,4 +13,4 @@ IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXrandr" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild index 33fa3524c0a3..89597872cdb6 100644 --- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild +++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,4 +13,4 @@ IUSE="" RDEPEND="x11-libs/libX11 >=x11-libs/libXxf86dga-1.1" DEPEND="${RDEPEND} - x11-proto/xf86dgaproto" + x11-base/xorg-proto" diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild index 711a48f43226..bc105e08848b 100644 --- a/x11-apps/xgamma/xgamma-1.0.5.ebuild +++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -12,4 +12,4 @@ IUSE="" RDEPEND="x11-libs/libXxf86vm x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild index b7a197a96249..54f51932cad0 100644 --- a/x11-apps/xgamma/xgamma-1.0.6.ebuild +++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,4 +12,4 @@ IUSE="" RDEPEND="x11-libs/libXxf86vm x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild index 56ec43dcc08d..3b30c64ba019 100644 --- a/x11-apps/xinput/xinput-1.6.1.ebuild +++ b/x11-apps/xinput/xinput-1.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3 x11-libs/libXinerama x11-libs/libXrandr" DEPEND="${RDEPEND} - >=x11-proto/inputproto-2.1.99.1" + x11-base/xorg-proto" diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild index 6084a3a12fb4..4e7ffe27b9ae 100644 --- a/x11-apps/xinput/xinput-1.6.2.ebuild +++ b/x11-apps/xinput/xinput-1.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3 x11-libs/libXinerama x11-libs/libXrandr" DEPEND="${RDEPEND} - >=x11-proto/inputproto-2.1.99.1" + x11-base/xorg-proto" diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild index b8c25fa73d30..8922936566fa 100644 --- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild +++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,5 +14,4 @@ RDEPEND="x11-libs/libX11 x11-libs/libXt x11-libs/libXaw" DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/inputproto" + x11-base/xorg-proto" diff --git a/x11-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild index 65e87ccc79ee..574b5572a9fa 100644 --- a/x11-apps/xprop/xprop-1.2.2.ebuild +++ b/x11-apps/xprop/xprop-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,5 +11,5 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - >=x11-proto/xproto-7.0.17 + x11-base/xorg-proto " diff --git a/x11-apps/xprop/xprop-1.2.3.ebuild b/x11-apps/xprop/xprop-1.2.3.ebuild index eaa51ead5c37..574b5572a9fa 100644 --- a/x11-apps/xprop/xprop-1.2.3.ebuild +++ b/x11-apps/xprop/xprop-1.2.3.ebuild @@ -11,5 +11,5 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - >=x11-proto/xproto-7.0.25 + x11-base/xorg-proto " diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild index f5919090c5e6..fbe79b1339ed 100644 --- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild +++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -10,4 +10,4 @@ IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXTrap" DEPEND="${RDEPEND} - x11-proto/trapproto" + x11-base/xorg-proto" diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild index 4575e7f8ec75..1df4ff1b4458 100644 --- a/x11-apps/xtrap/xtrap-1.0.3.ebuild +++ b/x11-apps/xtrap/xtrap-1.0.3.ebuild @@ -11,4 +11,4 @@ RDEPEND="x11-libs/libX11 x11-libs/libXt x11-libs/libXTrap" DEPEND="${RDEPEND} - x11-proto/trapproto" + x11-base/xorg-proto" diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild index c0e6df2bc894..2da520d4712c 100644 --- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild +++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw x11-libs/libXt x11-libs/libXxf86vm" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild index eb84ada1084d..c4801d350364 100644 --- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild +++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw x11-libs/libXt x11-libs/libXxf86vm" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild index ec840a7e31bf..cd0a83992aef 100644 --- a/x11-apps/xwd/xwd-1.0.6.ebuild +++ b/x11-apps/xwd/xwd-1.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,6 +13,6 @@ IUSE="" # libXt dependency is not in configure.ac, bug #408629, upstream #47462." RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-libs/libXt - x11-libs/libxkbfile - x11-proto/xproto" + x11-libs/libxkbfile" diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild index d88f8dfd465c..cd0a83992aef 100644 --- a/x11-apps/xwd/xwd-1.0.7.ebuild +++ b/x11-apps/xwd/xwd-1.0.7.ebuild @@ -13,6 +13,6 @@ IUSE="" # libXt dependency is not in configure.ac, bug #408629, upstream #47462." RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-libs/libXt - x11-libs/libxkbfile - x11-proto/xproto" + x11-libs/libxkbfile" diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild index 9a8fb51ef20c..251eb77838dc 100644 --- a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild +++ b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,8 +12,8 @@ IUSE="" RDEPEND=">=x11-libs/libxcb-1.6" DEPEND="${RDEPEND} - x11-libs/libX11 - >=x11-proto/xproto-7.0.17" + x11-base/xorg-proto + x11-libs/libX11" pkg_setup() { # interix has a _very_ old iconv in libc, however, including diff --git a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild index 4e7c0e6044cc..251eb77838dc 100644 --- a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild +++ b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild @@ -12,8 +12,8 @@ IUSE="" RDEPEND=">=x11-libs/libxcb-1.6" DEPEND="${RDEPEND} - x11-libs/libX11 - >=x11-proto/xproto-7.0.17" + x11-base/xorg-proto + x11-libs/libX11" pkg_setup() { # interix has a _very_ old iconv in libc, however, including |