x11-apps/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index df9d6c081a20c61444b2cec91089a9e2ab63dfde..6c3220866fdda2da40523298b07d4dfeda67d4d7 100644 (file)
--- 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 084c861bc6bedb13943b7f302bdf0e1f70ae055d..fbcafd4b17a2709bdf3c566d6d3216ffd101ed3e 100644 (file)
--- 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 f14f3fa384ae06447e4f01df64c49ae3c0023626..69ac7b3936c9572c11a7a9406b9948ba027b66bb 100644 (file)
--- 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 1e807c1632f6a5dbd9174b33e3083274fdef837c..aa6ffbd8f9a21819eddd56f031f860c182df64db 100644 (file)
--- 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 d999d44c52e54c4f845bcbad9cd48480dc71f9e4..07729580b3295907066ad2f237452d88c482992c 100644 (file)
--- 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 3765af34344b2911af22de57b5b935f910f6f73c..5d949f23bd544caaff643f87289523577c4e975f 100644 (file)
--- 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 c95b6737e41525a6a9f254c5dee7fbc4a01918c8..ca04af88a15bc948c39d9da409c61c0c1e4dc460 100644 (file)
--- 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 17fd24b91e3a2a3622ebd62fab91b5900754d613..4283de38eefaa52078062f374a38b6f150ff8160 100644 (file)
--- 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 1766e34c190b53bcf4fbc9540a7e3c5022d920d7..495a445d1f95565ae51a1a6caa0c14e4c715e29d 100644 (file)
--- 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 cdc6a73115a21bff0f324f8901bc2aaaba26bd8a..79ed018a5ac08b7e91feb741bf629414e73f3174 100644 (file)
--- 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 8dc4a3f076f244376a85467c3a4373cec639a091..16d1e459c1caab12b27155091af4eff1ac1c5497 100644 (file)
--- 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 2193ff0538aa123b41ae5509e036c4af89d323d1..b2c0ed90b6ffc70b1dc28f4158c27a02fc326546 100644 (file)
--- 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 a2f14e270867871791eaf45ffb2f6c7796976beb..d0aa1d6e3b3de4cd60c3936d72d8ca6d117065ce 100644 (file)
--- 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 061b3239cd7b59071d6bd57cb595b5a5513cfa59..d0aa1d6e3b3de4cd60c3936d72d8ca6d117065ce 100644 (file)
--- 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 aa93c76e218372586f22815fba43c54ab463e62d..8df4f1fe96fc4e0697c53749e03322376cae48f3 100644 (file)
--- 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 4233aea63111d771ce3de6b4616064123d55a8b7..7799fbfa3e79e6520a85bd5887c2342ad44a760e 100644 (file)
--- 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 fe6297132ec0a30c4322eb62e303714b04550769..1b65aca89d8023364013b58b997e101717547c06 100644 (file)
--- 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 fe6297132ec0a30c4322eb62e303714b04550769..1b65aca89d8023364013b58b997e101717547c06 100644 (file)
--- 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 bc84de10df6ee1d732a74815a37b69f6a277d3ee..9e95c9e43c3f759cbbec493d4f568aa9cd07dba1 100644 (file)
--- 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 1801d61d66e8d5d695ac7b50570bd8fd5df82359..8a64373394aef4db89457f1863db266aa53151bc 100644 (file)
--- 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 2194489aa3b84fd10dba78d9dd7f64bce6d9008e..ec3eda23d5fa80461263c97f7605e80dbb3fa7e6 100644 (file)
--- 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 33c1a0371cd4ff74d6711ab25ada4e46adefb9ac..29d2b7979e0fb5b1ef2d765ceb3915597bb92e3b 100644 (file)
--- 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 33fa3524c0a33fa661cbab6c682b53360afadc67..89597872cdb66997b5662128c65bd66b30bd2500 100644 (file)
--- 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 711a48f43226ce925a51c5d8d88ea0601d492d0d..bc105e08848b254e86e887b617afefd8a8a824a2 100644 (file)
--- 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 b7a197a96249be91b582001eed20b5bd9545cacc..54f51932cad0bf775a9525afdecd1060e793bd67 100644 (file)
--- 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 56ec43dcc08d25aa550b1b09de368aa642d5adf2..3b30c64ba019433336bbadec343ee161194e88f5 100644 (file)
--- 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 6084a3a12fb4a01ffa4719acc3484bc34ab587ff..4e7ffe27b9aeaef4cd8e647707039e376d829f96 100644 (file)
--- 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 b8c25fa73d308e8b5861817c5f7ef70585f92e04..8922936566fa2bfaff653055239416caaf0cd1e7 100644 (file)
--- 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 65e87ccc79eecd05cd2fae66ecb6adffe8c1fcda..574b5572a9fa105f2bf09b896e30e84ff831c4e9 100644 (file)
--- 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 eaa51ead5c37ccaa348854a9fb557da2b413c6f2..574b5572a9fa105f2bf09b896e30e84ff831c4e9 100644 (file)
--- 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 f5919090c5e618e53659f55cb2874a63fd9a6745..fbe79b1339ed351be927629bf8f78dba0a13345f 100644 (file)
--- 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 4575e7f8ec75f94dcf77f4760746add95d5ba022..1df4ff1b4458d73fd0d14d213b237aea50430887 100644 (file)
--- 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 c0e6df2bc89423849178eb4461689b63864c924c..2da520d4712c55cc525bf068387a1f6884bfc902 100644 (file)
--- 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 eb84ada1084d4714b06e964235eb1cf5747f1146..c4801d350364a00aa066dbde06a68ecd4cfece8f 100644 (file)
--- 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 ec840a7e31bf5127c999b4463f4dbdbc14026789..cd0a83992aefeae62dbf4ff7afcc702683fa5f70 100644 (file)
--- 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 d88f8dfd465cfc14d172788e3507311df8ee6fd3..cd0a83992aefeae62dbf4ff7afcc702683fa5f70 100644 (file)
--- 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 9a8fb51ef20c022533a5d62ac40e615df6d2a72d..251eb77838dcd63aa61c480688d3beb928889e23 100644 (file)
--- 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 4e7c0e6044cc5ccdd188cbca01fc929539e53779..251eb77838dcd63aa61c480688d3beb928889e23 100644 (file)
--- 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