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

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index ad64f92fe6368789cefb13ca8d1be7cb6a0ba2a7..9751760d13b8c2673cf9ce5c95e787ff243120ad 100644 (file)
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-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
@@ -25,8 +25,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xf86vidmodeproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )

diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
index c69e5ccadd2c91280346559cb8dc7b20dfa30db1..f7dec4fbc6088c1c637b0344bfc4eb8354a05de3 100644 (file)
--- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.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=6
@@ -20,5 +20,5 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
 "

diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
index effec90b00f1bcd5c625ac94673d810ec311f370..6acd544ba6b45e32d30d4da8a472ad871a4b8411 100644 (file)
--- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3-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
@@ -20,7 +20,7 @@ RDEPEND="
        x11-libs/libX11
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 PATCHES=(
        "${FILESDIR}"/${P}-gcc4.3.patch

diff --git a/x11-misc/chgres/chgres-0.1-r2.ebuild b/x11-misc/chgres/chgres-0.1-r2.ebuild
index c88e4dd3ba1ef9151f46d0be5e23be577e92fafc..af5228d50ea5b6771fffa33df37cd5cebeefe1c0 100644 (file)
--- a/x11-misc/chgres/chgres-0.1-r2.ebuild
+++ b/x11-misc/chgres/chgres-0.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=6
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-       x11-proto/xf86vidmodeproto
-       x11-proto/xf86dgaproto"
+       x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}"/${P}-{flags,includes}.patch )
 

diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index a12b639f15df9a8ed81a9b3cbb9861b85210fc17..c0e2472a6353bc06a16a1513f80fbb6a7869e3eb 100644 (file)
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.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
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
        app-text/asciidoc
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
        drm? ( x11-libs/libdrm )"
 
 nobuildit() { use $1 || echo yes ; }

diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index 5b77b9aa14c664e6ed9e32542fd1079657ce1516..3837f2f126b9ea8eb94932964af26a0720f6d9d3 100644 (file)
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-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=6
@@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
        app-text/asciidoc
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
        drm? ( x11-libs/libdrm )"
 
 nobuildit() { use $1 || echo yes ; }

diff --git a/x11-misc/devilspie2/devilspie2-0.42.ebuild b/x11-misc/devilspie2/devilspie2-0.42.ebuild
index ad543d5081a1e2ed40c2c9d29bb5a9ec261f2d8d..5d8bea8c26cb9eb4047518bd51f20624c328f224 100644 (file)
--- a/x11-misc/devilspie2/devilspie2-0.42.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.42.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 @@ DEPEND="
        ${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index dbf358fff4977933164870bcbc896741542f7ff5..5d02c8d814f9eef6ef4f3dbf89474f470401138c 100644 (file)
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.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=5
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
index 05dc375cb2ba60b77b3e167eb0ce8b3d37f75c42..1bf43050b79d7f237e7de126a55b7d615389a521 100644 (file)
--- a/x11-misc/dmenu/dmenu-4.7-r1.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7-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
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-4.7-gentoo.patch

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 8740afefa1f1faaa18f41823528b904b85cf885e..1bf43050b79d7f237e7de126a55b7d615389a521 100644 (file)
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-4.7-gentoo.patch

diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 5cb15906696b0c568e6cd1a74af6c2ab34bfda8b..f2222c4d6bc8be59fb13151739d81101a1774fb1 100644 (file)
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 PATCHES=(
        "${FILESDIR}"/${P}-gentoo.patch

diff --git a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
index b1761c0c8b91b60b2f25c486b5a6699139de498a..14d7f61a15261cb6e3f43391ca1ecbf5d70747bd 100644 (file)
--- a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
+++ b/x11-misc/dxpc/dxpc-3.9.2-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
@@ -15,7 +15,7 @@ IUSE=""
 RDEPEND="x11-libs/libXt
        >=dev-libs/lzo-2"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS=( CHANGES README TODO )
 

diff --git a/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
index 12498cc73da39f0180c586d7635666dc801ec7b7..9addccdf4bb77a0d4efe3bcdf22e7fd9943005c2 100644 (file)
--- a/x11-misc/dzen/dzen-0.9.5-r1.ebuild
+++ b/x11-misc/dzen/dzen-0.9.5-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
@@ -24,8 +24,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto
-       xinerama? ( x11-proto/xineramaproto )
+       x11-base/xorg-proto
 "
 
 DOCS=( README )

diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 2fac809fbe2fb00846e154f078aed443362d76e6..6f6b0d17eab129016d188ed8d8b5c4b0ebbeff30 100644 (file)
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.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
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
        media-libs/imlib2[X]
        png? ( media-libs/libpng:0= )"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 PATCHES=(
        "${FILESDIR}/${P}-gcc-4.3.patch"

diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild
index 8a3a05f7abd3f1d11ed6eea7551349adc37569f5..60b62d30aa6fc660741347c992a86d17eacac3b6 100644 (file)
--- a/x11-misc/fbpanel/fbpanel-7.0.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.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
@@ -26,7 +26,7 @@ DEPEND="
        ${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
index b2ee97f05ca588eafc539f55b368e81824ab7486..d834582a08e064a286b837a0f1795d5d6da300af 100644 (file)
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-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
@@ -9,4 +9,4 @@ DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="x11-proto/xproto"
+DEPEND="x11-base/xorg-proto"

diff --git a/x11-misc/grabc/grabc-1.1-r2.ebuild b/x11-misc/grabc/grabc-1.1-r2.ebuild
index fc963dc09905cfa94752e62d00cddeb3b42beb15..236e8510f8149bf86f18647204fd2b93139b6142 100644 (file)
--- a/x11-misc/grabc/grabc-1.1-r2.ebuild
+++ b/x11-misc/grabc/grabc-1.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=6
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 S="${WORKDIR}/${PN}${PV}"
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )

diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index 31cb75d3256d5077e029e9eb431b0a42dd86e928..d7fbf4a80f4f22f9a49717de59c6cdfe4be17731 100644 (file)
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.5-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
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="media-libs/imlib2[X]
        x11-libs/libX11"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 # Skip into the src directory so we avoid a recursive make call that
 # is going to break parallel make.

diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
index d6a05f1442fa5fdc2283946d41726ffb93f9674f..b5f7777a34b9960e625b9633746e26bea0e684df 100644 (file)
--- a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.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=5
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
        >=media-libs/imlib2-1.0.6.2003[X]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 

diff --git a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild
index 0879e20f060bf36b0b6a217d2e06734e8eaa5512..691121fea2e50ba1fdd2a45c1693b386b1acd3c3 100644 (file)
--- a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.2_p5.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,7 +22,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 DOCS="AUTHORS ChangeLog NEWS README"

diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
index 7c067f92b0ae9f6eafa721faabfa1fd67f837b94..3c873f2e98cb49d3056b94852327fee23e3d2370 100644 (file)
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ b/x11-misc/imake/imake-1.0.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=5
@@ -12,7 +12,7 @@ IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 src_prepare() {
        # don't use Sun compilers on Solaris, we want GCC from prefix

diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
index b6f4e06ea8601bfa8414aac74956dbf271bd01d8..116f0bcb67a4af97420030f91c55ed8ce2529cb8 100644 (file)
--- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
@@ -21,9 +21,7 @@ RDEPEND="x11-libs/libXtst
        x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        >=sys-apps/sed-4"
 
 S=${WORKDIR}/${P/_/}

diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
index 001734201dfbd1294344872308c6b77e7dc38418..bef62cd2ef7156c2ea2814b44a6b7a95467d2c10 100644 (file)
--- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -21,9 +21,7 @@ RDEPEND="x11-libs/libXtst
        x11-libs/libXext"
 
 DEPEND="${RDEPEND}
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        >=sys-apps/sed-4"
 
 src_prepare() {

diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
index 20dfb499c5a47ffb7c2e6df575252fcb6ead800e..454c50ad61e598b7cfe89c2793d2355d83aec278 100644 (file)
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-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=5
@@ -20,7 +20,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/inputproto
+       x11-base/xorg-proto
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
index 45b5b54d2ab132997ee23b391a4f4116392c3744..a2967bdf38c24c541d7d67e47aaf59aac7fb71c6 100644 (file)
--- a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-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
@@ -20,11 +20,9 @@ RDEPEND="x11-libs/libICE
        x11-libs/libX11
        x11-libs/libXext"
 DEPEND="${RDEPEND}
+       x11-base/xorg-proto
        x11-libs/libxkbfile
        x11-libs/libXt
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
        x11-libs/libXtst"
 
 S=${WORKDIR}/${MY_P}

diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
index 2d09ca5193728dd8b72590549a74a9121ba5685d..2ff6da09dbc16cb96cf6d69e8c443b2c4ef2f8b1 100644 (file)
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
+       x11-base/xorg-proto
        x11-libs/libxkbfile
        x11-libs/libXt
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
        x11-libs/libXtst
 "
 

diff --git a/x11-misc/lndir/lndir-1.0.3-r1.ebuild b/x11-misc/lndir/lndir-1.0.3-r1.ebuild
index cb471e37cfe82fc7b221d6178f2190ef59cc7f52..074102cb4eb05cc91118436b4ebf5899bf2c95dc 100644 (file)
--- a/x11-misc/lndir/lndir-1.0.3-r1.ebuild
+++ b/x11-misc/lndir/lndir-1.0.3-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,4 +12,4 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"

diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild
index 09db83b1ff03774a59e128c7e7f4f0aaa90cdcaf..8d3f626030162eb3d2d4f8027948cf8f59abad38 100644 (file)
--- a/x11-misc/lsw/lsw-0.3.ebuild
+++ b/x11-misc/lsw/lsw-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
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 src_prepare() {
        sed -i config.mk \

diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild
index c0d6990d325ffd93f7363754c21a8d7de2325ee8..de8260303eaa09f351597628ef5f6d3908bc7649 100644 (file)
--- a/x11-misc/makedepend/makedepend-1.0.5.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5.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-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 293a46855a05fff658dde95ff5af9399586e3d3f..76b25db57a185e28c388c203e8652d4aecab0823 100644 (file)
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.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=4
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
        virtual/os-headers
-       x11-proto/xextproto"
+       x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 

diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild
index db30db2314e1cc9ea5ce61673ccab2990a7505eb..88a563c5bce6fe44bd32e10bcf0828acb66ed1e2 100644 (file)
--- a/x11-misc/netwmpager/netwmpager-2.05.ebuild
+++ b/x11-misc/netwmpager/netwmpager-2.05.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="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_configure() {

diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
index 39089968c1c3a217c49b2a7042c51e879ffe748d..90955390f26af2dd9e054e837b769a3e0773d2fe 100644 (file)
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
        nls? ( sys-devel/gettext )
-       xinerama? ( x11-proto/xineramaproto )
+       xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
index 95bd82cc07208a9be8041ece3747354db4bf74a3..d94dd9b86c08c8141ab03a19ff2f9e6b2b8a65a8 100644 (file)
--- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
+++ b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        gnome-base/gnome-common
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules

diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild
index d2799cdefcc8e1a58f98096175ae2f6a6d5cb28d..68050e42c96353a54e15f1e052a65d3eceae31bd 100644 (file)
--- a/x11-misc/numlockx/numlockx-1.2.ebuild
+++ b/x11-misc/numlockx/numlockx-1.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=5
@@ -20,8 +20,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
index 50c09addf91f443326bdf84e8b363345e6bf5a3e..9196ecbc57cb0137bd0f7a0482897320097dbe54 100644 (file)
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.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
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        dev-qt/linguist-tools:5
        dev-qt/qthelp:5
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 DOCS=( README.rst RELEASE_NOTES TODO )

diff --git a/x11-misc/rofi/rofi-1.3.1.ebuild b/x11-misc/rofi/rofi-1.3.1.ebuild
index 510e5d7b52f29d1ca620b61b8e754c66cdab0812..6d2181a39178f2543ed7995eb39c3600e4264aa2 100644 (file)
--- a/x11-misc/rofi/rofi-1.3.1.ebuild
+++ b/x11-misc/rofi/rofi-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=6
@@ -31,8 +31,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-0.15.12-Werror.patch

diff --git a/x11-misc/rofi/rofi-1.5.0.ebuild b/x11-misc/rofi/rofi-1.5.0.ebuild
index b0ce40db61f140663ad9498bbdddc798acd95350..dc85085b31482db918d79d96a1b53eb4327a9d54 100644 (file)
--- a/x11-misc/rofi/rofi-1.5.0.ebuild
+++ b/x11-misc/rofi/rofi-1.5.0.ebuild
@@ -31,8 +31,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        test? ( >=dev-libs/check-0.11 )
 "
 PATCHES=(

diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index b0ce40db61f140663ad9498bbdddc798acd95350..dc85085b31482db918d79d96a1b53eb4327a9d54 100644 (file)
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -31,8 +31,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        test? ( >=dev-libs/check-0.11 )
 "
 PATCHES=(

diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
index 4c1fd136e3d4920773687607b07e27dc01a9fa27..f9ae27770ea48ddcb5d230af0bdf672947d4f45f 100644 (file)
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xextproto
+       x11-base/xorg-proto
        virtual/pkgconfig
        sys-apps/sed
 "

diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
index 59f0d1afaf1996246adfd86cc58f28b0fb3ae548..33678d15e886ebe10da0978ebe3ecf10f89f3a24 100644 (file)
--- a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.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
@@ -25,7 +25,7 @@ RDEPEND="x11-libs/libX11
        openal? ( >=media-libs/freealut-1.1.0-r1 )
        quesoglc? ( media-libs/quesoglc )"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
+       x11-base/xorg-proto
        virtual/pkgconfig
        sys-apps/sed"
 

diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
index 8382ae2c209464654874a3960eaf5709157150e4..c6a8cc5049653bc2fc6700da3e015a69224e4172 100644 (file)
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202.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
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/glib:2
         x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xf86vidmodeproto"
+       x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 

diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
index e2823f2dfb16b1511d22a746a3836d3296b4a683..1b63a8fe60e7fe0e1fedab5e23856ce45b1955fa 100644 (file)
--- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild
+++ b/x11-misc/skippy/skippy-0.5.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=6
@@ -20,8 +20,7 @@ RDEPEND="media-libs/imlib2[X]
        x11-libs/libXmu
        x11-libs/libXft"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xineramaproto
+       x11-base/xorg-proto
        virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch

diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 3a0c714df65d5e6b46416bc0ac729d5e0697dfc1..79f4540da207bd24dbce57dcbca690ce1d6623a6 100644 (file)
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.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
@@ -29,7 +29,7 @@ RDEPEND="x11-libs/libXmu
                !x11-misc/slimlock )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 PATCHES=(

diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 7b08d5e831de14b216642c7c3ff1d1c31fe8af18..263d58016abbd9d99e920ed2d7652b97d4526bf2 100644 (file)
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-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="x11-libs/libXmu
                !x11-misc/slimlock )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 PATCHES=(

diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index b6a698a98bc6d75113af205a5d69cce4e8dff360..8f6a2d972ac34f5c3ac718bf69ee6812b5f20297 100644 (file)
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.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
@@ -19,8 +19,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/randrproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/sprop/sprop-0.1-r1.ebuild b/x11-misc/sprop/sprop-0.1-r1.ebuild
index 7c0084b7b4e93d03995b825a664e54c3c4df50ee..c0cee8850f7d22456dff1a20a0c7f452409d338d 100644 (file)
--- a/x11-misc/sprop/sprop-0.1-r1.ebuild
+++ b/x11-misc/sprop/sprop-0.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
@@ -17,7 +17,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 src_prepare() {
        sed -i \

diff --git a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
index c415409cc44771d7958ebb12d7522400bb2754ef..2cff1037b9f01af40d9f01a8d7024a7df5cbe761 100644 (file)
--- a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
+++ b/x11-misc/stalonetray/stalonetray-0.8.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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libSM
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf $(use_enable debug) \

diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index dda9e9c3a8d18ee8bc882516f06bb35c8a93354f..0484cd37832ec2b1f63a476dcda7157e2c5fbdf9 100644 (file)
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.ebuild
@@ -42,11 +42,7 @@ COMMON_DEPEND="
 "
 DEPEND="
        ${COMMON_DEPEND}
-       x11-proto/kbproto
-       x11-proto/randrproto
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 RDEPEND="
        ${COMMON_DEPEND}

diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index e39361604e426f1bcc8cbd3d635b075c10ef4c94..c6741a4ca9d87864e2a0ed56f8966078dec94eee 100644 (file)
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -32,11 +32,7 @@ COMMON_DEPEND="
 "
 DEPEND="
        ${COMMON_DEPEND}
-       x11-proto/kbproto
-       x11-proto/randrproto
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 RDEPEND="
        ${COMMON_DEPEND}

diff --git a/x11-misc/tabbed/tabbed-0.6.ebuild b/x11-misc/tabbed/tabbed-0.6.ebuild
index 62c0515359859dc33269cb056a4e219caa3ab5b9..2848e538dacbe6bd0fe86ec75ea25fd71bf5181b 100644 (file)
--- a/x11-misc/tabbed/tabbed-0.6.ebuild
+++ b/x11-misc/tabbed/tabbed-0.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=5
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="
-       x11-proto/xproto
+       x11-base/xorg-proto
        ${RDEPEND}
 "
 

diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild
index d73744fa9e89977ed7d4f652e46d35362c595c95..55f953d0b10ce206ada04c559b2d34a41652b6d1 100644 (file)
--- a/x11-misc/unclutter/unclutter-8-r4.ebuild
+++ b/x11-misc/unclutter/unclutter-8-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
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}
 

diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
index d3dbaaac30c28cbd9fc7c9c15d10c336800004ac..eec56d67179c00b00b5a7a79fdd5be2e181be2f9 100644 (file)
--- a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-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
@@ -18,5 +18,5 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
 "

diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 66b55e5185081550a91ffed62c54028ec505f5c4..8f9e37b5c918c07225ece107882275e023959b49 100644 (file)
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -20,8 +20,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXmu
        x11-libs/libXt"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        sys-apps/sed
        sys-libs/zlib
        x11vnc? ( x11-misc/x11vnc )"

diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild
index dd82e5259727331161bec6fb9e6f7f612d157052..b7763a8fdc810fc1cc8011addf06da2193af377b 100644 (file)
--- a/x11-misc/wayv/wayv-0.3-r2.ebuild
+++ b/x11-misc/wayv/wayv-0.3-r2.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
@@ -17,8 +17,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/inputproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
index a34c0ed1edf052267d0daefbbae30ebeee16bf37..a4def6b97b6aef86a84ea62253daa70c4d5b3059 100644 (file)
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-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
@@ -21,7 +21,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
 

diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
index 820d6f6ac5e60c620fd4a5d23ea6d54fd8da1a52..34d249366e1a96f1bda92475bacb0084b0fec725 100644 (file)
--- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.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,13 +28,8 @@ RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
        zeroconf? ( >=net-dns/avahi-0.6.4 )
 "
 DEPEND="${RDEPEND}
-       x11-libs/libXt
-       x11-proto/inputproto
-       x11-proto/trapproto
-       x11-proto/recordproto
-       x11-proto/xproto
-       x11-proto/xextproto
-       xinerama? ( x11-proto/xineramaproto )"
+       x11-base/xorg-proto
+       x11-libs/libXt"
 
 src_prepare() {
        default

diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
index b4062821bbd2042f3119c6fa5d3a32be1842bac9..7a41c7b368d70e58c4aa3305d3848795a56fbca8 100644 (file)
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -19,9 +19,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXinerama"
 DEPEND="${RDEPEND}
-       x11-proto/scrnsaverproto
-       x11-proto/xproto
-       x11-proto/xineramaproto
+       x11-base/xorg-proto
        tk? ( dev-tcltk/expect )"
 
 src_unpack() {

diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index c0c4f247d980714a4b65ce463db54322c9bf03a4..a353108f7c60264de3b5ba5f49dad151d21a8c48 100644 (file)
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -21,10 +21,9 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXtst
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/inputproto
        app-text/rman
-       x11-misc/imake
-       x11-proto/xproto"
+       x11-base/xorg-proto
+       x11-misc/imake"
 
 src_unpack() {
        unpack ${A}

diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index f6eee716fe678e8df99e08768dfe1bae5b34b4b5..8f8963c98d1b8cca96bfe5a170040e6835c66640 100644 (file)
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.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=5
@@ -32,10 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? ( virtual/texi2dvi )
-       X? (
-               x11-proto/xf86vidmodeproto
-               x11-proto/xextproto
-               x11-proto/xproto )"
+       X? ( x11-base/xorg-proto )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.4-png.patch

diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
index 7192ed11358a831eedbcee10c8bff69cbdcb0b01..4367a147b013fd180f07ec63882a8b8fe63e1577 100644 (file)
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1.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
@@ -32,8 +32,8 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        app-text/rman
+       x11-base/xorg-proto
        x11-misc/imake
-       x11-proto/scrnsaverproto
 "
 
 S=${WORKDIR}/${P/_p*}

diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
index 7d90eaa218a8e521b9bbc3018c9d122be35b08cc..d78715f36b680becea01507aa6c20684ca8a0f4e 100644 (file)
--- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild
+++ b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
@@ -19,7 +19,5 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "

diff --git a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
index 2030809b773394fe0a4943b8e5dbd4d50932837c..49c4acc7577b20f0f1e9a47137395af15557ee26 100644 (file)
--- a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.2.1-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=2
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libxkbfile
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
+       x11-base/xorg-proto
        x11-misc/imake"
 
 src_prepare(){

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index f291714e25c9c225ac8fc0500c7760cfc0956786..c7c8c3949274d2370869d08c257f5e8bd0dde9c4 100644 (file)
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xextproto
+       x11-base/xorg-proto
        x11-misc/imake
 "
 PATCHES=(

diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
index b1814ef74740d9333cd173f0e640de376bfd6a59..4283d2e664b0b284745215945ae8765a0c4c2a29 100644 (file)
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.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"
@@ -16,7 +16,7 @@ RDEPEND="x11-libs/libX11
        guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
        tk? ( dev-lang/tk )"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf \

diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index 13ec7c00d2c3ad218f7a56a533199b29606ce144..cce03ac2a410a9e517bfee23327a99cf02e649ff 100644 (file)
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-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
@@ -19,8 +19,8 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXaw
        x11-libs/libXext"
 DEPEND="${RDEPEND}
+       x11-base/xorg-proto
        x11-misc/imake
-       x11-proto/xproto
        x11-misc/gccmakedep
        motif? ( >=x11-libs/motif-2.3:0 )"
 

diff --git a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
index 52da368b475d6aa5bc5652c1909ff01afbc4aa72..3a3511979e2abc8bffa05d0387ca80cf64c86bf7 100644 (file)
--- a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
+++ b/x11-misc/xcalib/xcalib-0.9.0_p20161210.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
@@ -21,8 +21,8 @@ RDEPEND="
        x11-libs/libXxf86vm
 "
 DEPEND="${RDEPEND}
+       x11-base/xorg-proto
        x11-libs/libXext
-       x11-proto/xf86vidmodeproto
 "
 
 S="${WORKDIR}/${PN}-${COMMIT}"

diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
index f6d054fdf6be2df80a06a8fc76b499085e9cae35..5813bf01dd29978bea30ca50eba7eafb39176fd4 100644 (file)
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild
+++ b/x11-misc/xcb/xcb-2.4-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=6
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
        motif? ( >=x11-libs/motif-2.3:0 )
 "
 

diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
index 634b4c586c7e2dc1689f16271be30168f2328eb5..b10623d13aa6ff51da944cb17d6f18c1c5c38003 100644 (file)
--- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.43.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
@@ -19,8 +19,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 S=${WORKDIR}/${P}/X11

diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
index cf84faf3f8023cb2b774601dc55a4e5c6580ae49..2104e57383daf7c711c268d56d318284d8b12c68 100644 (file)
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-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=6
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto"
+       x11-base/xorg-proto"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 

diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 5fbc2ab8e123b464c2f4591d0dfb6e159425f1cc..5a726ac8063bfe4d9168b5e898027c510f8b53c6 100644 (file)
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -22,8 +22,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 # The test wants to manualy start Xvfb, wont use VirtualX and it tries

diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index 97ec7ce03faab42daad7bcc54e0ca5b9858ff018..be7b038c09feecb5d2d5898500437d93ec114b8e 100644 (file)
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.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
@@ -21,9 +21,9 @@ RDEPEND="
        x11-libs/libXt
 "
 DEPEND="${RDEPEND}
+       x11-base/xorg-proto
        x11-misc/imake
        app-text/rman
-       x11-proto/xproto
 "
 
 src_prepare() {

diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
index dbd26fe73cc3466ca49d5ef3bc2b4528ac139512..3e5fbb14c7ea15d23edc9368714977b97f020932 100644 (file)
--- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.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=6
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXt
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
        x11-misc/imake"
 
 S=${WORKDIR}/${MY_P}

diff --git a/x11-misc/xgestures/xgestures-0.4.ebuild b/x11-misc/xgestures/xgestures-0.4.ebuild
index a9921db7a5d5d93489544b80477e06233348435c..4e72115627dbf367def70cf4be572a44f3d19056 100644 (file)
--- a/x11-misc/xgestures/xgestures-0.4.ebuild
+++ b/x11-misc/xgestures/xgestures-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=6
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXmu
        x11-libs/libXtst
        x11-libs/libXt"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 

diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
index e4c4db3ec3a47029d65cd0f1bbd64ed94dd4451f..8aa761d9e7da7c15a16479da97a2e10a859b30af 100644 (file)
--- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
+++ b/x11-misc/xhkeys/xhkeys-2.2.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
@@ -19,8 +19,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
index 986dae594ba3571de4f9d0bbc5cc6340e14dad7e..d3c9125a799e577c9ae7854858c2f6569f520ced 100644 (file)
--- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.16-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
@@ -21,8 +21,7 @@ RDEPEND="x11-libs/libXrender
        dev-libs/expat
        sys-libs/zlib"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto"
+       x11-base/xorg-proto"
 
 DOCS=( AUTHORS )
 PATCHES=(

diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index 504fde9935bc420bd73a754e457606da37b9249e..9031ec51246dbea62d615e7bc021c51edafcdcf2 100644 (file)
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-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
@@ -21,7 +21,7 @@ RDEPEND="x11-misc/xbitmaps
        x11-libs/libXaw
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
        x11-misc/imake
        >=sys-apps/sed-4"
 

diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index 529559f8723024d54e8abb5cc001e2bc2fbe62f9..39ac85126845e857d7f18c771efa4422ba8867c6 100644 (file)
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.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
@@ -40,7 +40,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/x11-misc/xlockmore/xlockmore-5.54.ebuild b/x11-misc/xlockmore/xlockmore-5.54.ebuild
index c5181b227ac2b096bebc2d20683e35e749d6622d..f0e831cad9c00409d1b4e713fbf7f2a95cd24586 100644 (file)
--- a/x11-misc/xlockmore/xlockmore-5.54.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.54.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
@@ -40,7 +40,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/x11-misc/xlockmore/xlockmore-5.55.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild
index 8277ee4c2f0049f84c1d956ee470f68d911e55a2..71f04c0a70fdb449f55a423c15421324d1adbad0 100644 (file)
--- a/x11-misc/xlockmore/xlockmore-5.55.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.55.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
@@ -40,7 +40,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index b3e18f2cd2bb735eee950eaf8f4648fc9cd111f6..a77dfe86d27877b92681b28bf6856eb7f6527f01 100644 (file)
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-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
@@ -20,7 +20,7 @@ RDEPEND="
        x11-libs/libX11
        x11-misc/xbitmaps"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 S=${WORKDIR}
 

diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild
index c4eab6452b7feb4b3df78a4c1b77e35fd1289868..9e2f128b15f345548d844b0e6be45b1a9d1928a8 100644 (file)
--- a/x11-misc/xnee/xnee-3.19-r1.ebuild
+++ b/x11-misc/xnee/xnee-3.19-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
@@ -28,7 +28,7 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       x11-proto/inputproto
+       x11-base/xorg-proto
        virtual/pkgconfig
        sys-devel/gettext
        gnome? ( virtual/imagemagick-tools[jpeg,png] )

diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
index 0438e287b2d9b1fac17819b4a4143bb2b153502a..f177612e4c75ece19cf56c7d069c26040a1e7e12 100644 (file)
--- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
+++ b/x11-misc/xnots/xnots-0.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,9 +24,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/renderproto
-       x11-proto/xextproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index 15752d3477879a13a63905c22869c337764e6e79..c92abc690cd7da8f3f89a067d7daca0c49107c53 100644 (file)
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.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=6
@@ -24,9 +24,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/renderproto
-       x11-proto/xextproto
+       x11-base/xorg-proto
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-0.2.1-gcc6.patch

diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild
index 4574a53d43aa496a54168c6eb5e698d847f023ab..3f81446e468c65d99e949a1b627004022f1dd4cf 100644 (file)
--- a/x11-misc/xnots/xnots-9999.ebuild
+++ b/x11-misc/xnots/xnots-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=6
@@ -23,9 +23,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/renderproto
-       x11-proto/xextproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild
index 5cc53ca93dbeeb48ea0f20a1c1429046b3410241..e06a58bfd2c23623851e5c9f10d2acf4f5676eb2 100644 (file)
--- a/x11-misc/xosview/xosview-1.20-r1.ebuild
+++ b/x11-misc/xosview/xosview-1.20-r1.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPS="x11-libs/libX11
 RDEPEND="${COMMON_DEPS}
        media-fonts/font-misc-misc"
 DEPEND="${COMMON_DEPS}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS=( CHANGES README.linux TODO )
 

diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index c469ef0208a88b30a9524cb73889428c945a59d9..7fd20ea87c28279a57ef48379626e07b2589aac1 100644 (file)
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.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
@@ -35,10 +35,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        truetype? ( virtual/pkgconfig )
-       X? (
-               x11-proto/scrnsaverproto
-               x11-proto/xproto
-       )
+       X? ( x11-base/xorg-proto )
 "
 
 PATCHES=(

diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 4ddbab73daf215002f54da4bd706c91c33d7da95..3cf2f929a6e23271970b584079b716c6178fb839 100644 (file)
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.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
@@ -19,8 +19,8 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto
        virtual/pkgconfig
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
index 111832c3752d9e89f325b41dd699b33f3bc343bf..58f43f33c854255ae6cafce63c4c0c11064ddd06 100644 (file)
--- a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
+++ b/x11-misc/xrootconsole/xrootconsole-0.6-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
@@ -18,7 +18,7 @@ RDEPEND="
 
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 PATCHES=(
        "${FILESDIR}/${P}.noversion.patch"

diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
index 0cb1d531963e42a58d7025c2ee3692a592594c4d..a4de3213fff7ea6bb4957a19cf89347533079d81 100644 (file)
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.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,8 +22,8 @@ CDEPEND="
 "
 DEPEND="
        ${CDEPEND}
-       x11-proto/xproto
        virtual/pkgconfig
+       x11-base/xorg-proto
 "
 RDEPEND="
        ${CDEPEND}

diff --git a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
index 7b5b69a88e329e58045a81c49ab63aa670a7cb20..1e5f9a6da93594e19c9f747d9e8068f91783e152 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.36.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
@@ -59,12 +59,7 @@ DEPEND="
        sys-devel/bc
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/recordproto
-       x11-proto/scrnsaverproto
-       x11-proto/xextproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86vidmodeproto
-       xinerama? ( x11-proto/xineramaproto )
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild b/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
index 6c8fa54ec6f258a3e98d744ea47baad1216bd639..27ea9efb104a5f9706922ef2e1de0db5d7b39df8 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.37.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
@@ -59,12 +59,7 @@ DEPEND="
        sys-devel/bc
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/recordproto
-       x11-proto/scrnsaverproto
-       x11-proto/xextproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86vidmodeproto
-       xinerama? ( x11-proto/xineramaproto )
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index aa05146673b74872c603ba1fe035a51075bf6ef1..7217682cba6306f0486783cb7c2335f1ff7cda06 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -60,12 +60,7 @@ DEPEND="
        sys-devel/bc
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/recordproto
-       x11-proto/scrnsaverproto
-       x11-proto/xextproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86vidmodeproto
-       xinerama? ( x11-proto/xineramaproto )
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
index 53d05029957a7df3f21b35bdfff51dffd59723a7..cc36c3d5c819440cfdb60815683fb776267eb777 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
@@ -60,12 +60,7 @@ DEPEND="
        sys-devel/bc
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/recordproto
-       x11-proto/scrnsaverproto
-       x11-proto/xextproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86vidmodeproto
-       xinerama? ( x11-proto/xineramaproto )
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild
index bfc59a723622292ea259f813bdca4012afc993a7..cdf297508f713362a69b94d8e2c489cdfb088356 100644 (file)
--- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild
+++ b/x11-misc/xsel/xsel-1.2.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=6
@@ -15,7 +15,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
        x11-libs/libXt"
 
 src_compile() {

diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild
index b2971adb4fedccf9f49cbd7c42c0d98860481832..d3edca7a9f74e0a9aa28f55de4b7efd6d82946ee 100644 (file)
--- a/x11-misc/xsel/xsel-9999.ebuild
+++ b/x11-misc/xsel/xsel-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=6
@@ -18,7 +18,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
        x11-libs/libXt
 "
 

diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
index d9d5530b4c5daecfd080104ebd9aa7a375f5b70d..d0105b2c7f9f85b2d5617a6d8a8f1a36d91ba679 100644 (file)
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-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
@@ -18,9 +18,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
index a7fea73b665d2fb1ba0ccce7e0c7dfe4203f1039..cd140527393c1b618716613e92517caee384f39f 100644 (file)
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.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=6
@@ -21,9 +21,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 PATCHES=(
        "${FILESDIR}"/${P}-assignment.patch

diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
index 98310014da85355fdce03cebedd61289c78c96ca..f8f3dd11c40411f8e17b6b3e3d071ef7fac357f3 100644 (file)
--- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-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
@@ -28,8 +28,8 @@ DEPEND="
        ${COMMON_DEPEND}
        app-text/rman
        dev-lang/perl
+       x11-base/xorg-proto
        x11-misc/imake
-       x11-proto/xproto
 "
 
 DOCS=( AUTHORS Changelog README )

diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
index 993c4e5a5bd55807c89c87975510449dd64e4084..e9d9084f1313f73fe101437b8ccc4bfcf03ab44a 100644 (file)
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-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
@@ -21,10 +21,9 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        app-text/rman
+       x11-base/xorg-proto
        x11-misc/imake
        x11-misc/gccmakedep
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 
 src_compile() {

diff --git a/x11-misc/xssstate/xssstate-1.1.ebuild b/x11-misc/xssstate/xssstate-1.1.ebuild
index cda0b3adfc2b328c983dceb138d4be5f18277f10..311c55ab00f72aad795f69594f452c0ce1ece34b 100644 (file)
--- a/x11-misc/xssstate/xssstate-1.1.ebuild
+++ b/x11-misc/xssstate/xssstate-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
@@ -19,8 +19,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/scrnsaverproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
index 8d03a8cf83ebbefe1d672f7a7e63f1472a4f53bd..c797405cf80245f58d9a3fb604ae0c2c41cb25e6 100644 (file)
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ b/x11-misc/xstroke/xstroke-0.6-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
@@ -28,9 +28,7 @@ DEPEND="
        sys-devel/flex
        virtual/pkgconfig
        virtual/yacc
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )

diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index 574b3c3e28b9c8575b676562916dfce6ea6bb08c..b1878e8d3e44bdc931698e17ed77a3e6e5dda342 100644 (file)
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.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,8 +17,8 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXext"
 DEPEND="${RDEPEND}
        app-text/rman
-       x11-misc/imake
-       x11-proto/xproto"
+       x11-base/xorg-proto
+       x11-misc/imake"
 
 src_prepare() {
        xmkmf || die

diff --git a/x11-misc/xtrlock/xtrlock-2.8.ebuild b/x11-misc/xtrlock/xtrlock-2.8.ebuild
index 50e34becf41a6c081ea9fab3b3c5ccdce0d74874..b84dce881f7be18a9333ec3fe688c02c654a24c0 100644 (file)
--- a/x11-misc/xtrlock/xtrlock-2.8.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.8.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
@@ -17,7 +17,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       x11-proto/xproto
+       x11-base/xorg-proto
        x11-misc/imake
 "
 

diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
index 1277bf4b7f601eae0d930424efe88854d3060a7b..777c7043cb89964aaa30cfb33f2b38ad6b46abe2 100644 (file)
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        app-text/rman
+       x11-base/xorg-proto
        x11-misc/gccmakedep
        x11-misc/imake
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 
 src_prepare() {

diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
index 04a518b1085080a14c1d718f74d5e6688c1bca90..3033ea4d6dd8c8abc13520a4797e2710f0c82698 100644 (file)
--- a/x11-misc/xvkbd/xvkbd-3.8.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.8.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        app-text/rman
+       x11-base/xorg-proto
        x11-misc/gccmakedep
        x11-misc/imake
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch

diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild
index 04a518b1085080a14c1d718f74d5e6688c1bca90..3033ea4d6dd8c8abc13520a4797e2710f0c82698 100644 (file)
--- a/x11-misc/xvkbd/xvkbd-3.9.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.9.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        app-text/rman
+       x11-base/xorg-proto
        x11-misc/gccmakedep
        x11-misc/imake
-       x11-proto/inputproto
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch

diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild
index 94f68ee554000d2eaa09fdd6f23f30d32f7cb29e..6f20325979dd4f59bb823a11fd2be57934378df9 100644 (file)
--- a/x11-misc/xwit/xwit-3.4_p15.ebuild
+++ b/x11-misc/xwit/xwit-3.4_p15.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,7 +18,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 S=${WORKDIR}/${P/_p*/}.orig
 

diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
index 2dc0baa2074a26cc5b19a7d8c1fe3877be6351e8..d25703bca7fd06897d01e39f9cf50f14296f9f7d 100644 (file)
--- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild
+++ b/x11-misc/xwrits/xwrits-2.26-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
@@ -16,7 +16,6 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXinerama"
 DEPEND="${RDEPEND}
-       x11-proto/xineramaproto
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS=( GESTURES NEWS README TODO )