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

diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
index 601677e367b8870a5c9c4be60f679e5765ba093f..be82ae9aeef9df1330258741cfe84faa5b1960fd 100644 (file)
--- a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
+++ b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
@@ -16,8 +16,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 PATCHES=(
        "${FILESDIR}"/${P}-gcc43.patch

diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
index 12e9f0fb572742cdfda52213032252e73c3f043b..4bc663d65e6c29c7b1961939879be0ed98f343e4 100644 (file)
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12.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
@@ -22,8 +22,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
index 3bfc2da9701dc4a337ecf96610808dc7eabaa360..522dd4266352d9e6d53bf0740df6d0abd9544e59 100644 (file)
--- a/x11-wm/afterstep/afterstep-2.2.12.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -37,10 +37,8 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
+       x11-base/xorg-proto
        !!media-libs/libafterimage
-       x11-proto/xextproto
-       x11-proto/xproto
-       xinerama? ( x11-proto/xineramaproto )
 "
 
 S="${WORKDIR}/${PN}-devel-${PV}"

diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
index 3e5a3cf8bacd53f1c76a9ea456e75708ac51064f..0fba9046d07dcf91547101504b8d1e07b716b71c 100644 (file)
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
+++ b/x11-wm/amiwm/amiwm-0.21_p2.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
@@ -25,8 +25,7 @@ RDEPEND="${COMMON_DEPEND}
        x11-apps/xsetroot
        x11-terms/xterm"
 DEPEND="${COMMON_DEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto"
+       x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 

diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 19db570fd47903dbd6a6ae963770cf78f03ca464..6c0ad6ff15c83fc14d3ccd0b4cde387fad5fc961 100644 (file)
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        media-gfx/imagemagick[png]
        >=x11-base/xcb-proto-1.5
-       >=x11-proto/xproto-7.0.15
+       x11-base/xorg-proto
        doc? (
                app-doc/doxygen
                media-gfx/graphviz

diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 2ed75628ce4a7ae85270de1a045abaf08310d176..3642f6c5a127617a72a8e07cd43449c1f31451c2 100644 (file)
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        media-gfx/imagemagick[png]
        >=x11-base/xcb-proto-1.5
-       >=x11-proto/xproto-7.0.15
+       x11-base/xorg-proto
        doc? ( dev-lua/ldoc )
        test? (
                app-shells/zsh

diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 72cb2ec826229105b58517e8fc4ceb00369061b3..d3e88b54440d8ae4ee7c12757087c90ec7454167 100644 (file)
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        media-gfx/imagemagick[png]
        >=x11-base/xcb-proto-1.5
-       >=x11-proto/xproto-7.0.15
+       x11-base/xorg-proto
        doc? ( dev-lua/ldoc )
        test? (
                app-shells/zsh

diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 112d8fcb051b4226b95a93cd114ebe3a899b479a..773ef0d41a877aefcd24d93974cf5c37cf129686 100644 (file)
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-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
@@ -20,8 +20,7 @@ RDEPEND="x11-libs/libXft
        truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       >=sys-apps/sed-4
-       x11-proto/xextproto"
+       x11-base/xorg-proto"
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-gcc-4.3.patch \

diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index ecd97a4a914c00ec9c8443ed7462078d83395065..c509b28861a7a3f76ca2c216ae816d73595c6bee 100644 (file)
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -27,8 +27,7 @@ DEPEND="
        app-arch/xz-utils
        app-text/rman
        virtual/jpeg
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/dwm/dwm-6.1-r1.ebuild b/x11-wm/dwm/dwm-6.1-r1.ebuild
index 84a3658dd36465436a1eabb95776322907753ff9..a641e17a6bc3cbc8939c83136ba7758d9b5062f8 100644 (file)
--- a/x11-wm/dwm/dwm-6.1-r1.ebuild
+++ b/x11-wm/dwm/dwm-6.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
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       xinerama? ( x11-proto/xineramaproto )
+       xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
index 305a792c1dd16ab942245bf430cd31fe9c200102..d8a03b2546df22b769a3374ec518c8c3b3b1d7ec 100644 (file)
--- a/x11-wm/dwm/dwm-6.1.ebuild
+++ b/x11-wm/dwm/dwm-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       xinerama? ( x11-proto/xineramaproto )
+       xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 4783f3e641b7d1bdca02304156d547cf42132b5c..27c5d18fe7ae109c4241b48183b60a06f9039c0a 100644 (file)
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-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
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       xinerama? ( x11-proto/xineramaproto )
+       xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
index 3796314e1e900fe2cbf9cf4a28efa639bbc7823d..8c16c95bbad68956e73b3fe5796de673c75d62b1 100644 (file)
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -44,11 +44,7 @@ RDEPEND="pulseaudio? ( media-sound/pulseaudio )
        virtual/libiconv"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
-       xinerama? ( x11-proto/xineramaproto )
-       xcomposite? ( x11-proto/compositeproto )
-       x11-proto/xproto
+       x11-base/xorg-proto
        nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 

diff --git a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
index 91f2d348f9d03bb6f58e4b1b52af07f2a785e57f..418b0bc450d8a293832fb008222df7a3de91a8e3 100644 (file)
--- a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
+++ b/x11-wm/enlightenment/enlightenment-1.0.17.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"
@@ -44,11 +44,7 @@ RDEPEND="pulseaudio? ( media-sound/pulseaudio )
        virtual/libiconv"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
-       xinerama? ( x11-proto/xineramaproto )
-       xcomposite? ( x11-proto/compositeproto )
-       x11-proto/xproto
+       x11-base/xorg-proto
        nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 

diff --git a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
index 82001e5c2a6c560b157dd65ea36544b41f6022a0..24472c3a050a5e2c025d558ccdadeb29504c408b 100644 (file)
--- a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXext
        x11-libs/libXrandr"
 
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 src_prepare() {
        default

diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
index e1ae05372ef68cca0c73ac25292da731bb54f6c7..78d001de8a735fc85eac54f1c68ad3a7b454b61c 100644 (file)
--- a/x11-wm/evilwm/evilwm-1.1.1.ebuild
+++ b/x11-wm/evilwm/evilwm-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=6
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
        x11-libs/libXrandr
        x11-libs/libX11"
 DEPEND="${RDEPEND}
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 src_prepare() {
        default

diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
index c2443384420cb96aca333fa24ea9a7de80785300..e77bc234f23ad46c0be7278de89b652c67c8dd7e 100644 (file)
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
@@ -36,7 +36,7 @@ DEPEND="
        ${RDEPEND}
        bidi? ( virtual/pkgconfig )
        nls? ( sys-devel/gettext )
-       x11-proto/xextproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index 404b247f012620fb6e26c32b54763ccd8612336e..9b32e3c6335c8086126f44ea2878ae4b8fd6228a 100644 (file)
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -36,7 +36,7 @@ DEPEND="
        ${RDEPEND}
        bidi? ( virtual/pkgconfig )
        nls? ( sys-devel/gettext )
-       x11-proto/xextproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index 399a7ee66f9cf860716f8b629031cc9cc6f149f5..70aa430320160520ccdd1c5f2b00782613419f45 100644 (file)
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
        ${RDEPEND}
        bidi? ( virtual/pkgconfig )
        nls? ( sys-devel/gettext )
-       x11-proto/xextproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
index c25e8794bf6ceeae03d694313e67cbe8559b3b0d..9f65b7d8842381311b8ce758af5788f66d27c68f 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.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=5
@@ -57,9 +57,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
+       x11-base/xorg-proto
        doc? ( dev-libs/libxslt )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 
 src_prepare() {

diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
index 8e769cfdc2c4a06d1c7ece428010b6426cc5c6cf..4286eabe8d4a60ed1ea4bda0bf27307c1c9bfc31 100644 (file)
--- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.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
@@ -21,8 +21,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
index 27d7d564db6815b67d81ad26182c9b70152c73c8..99f5e273752a7e150a2bfab9de945f561e4a9b4c 100644 (file)
--- a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0.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
@@ -21,8 +21,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
index 92024280f4e85a1d47c8c43b3a798e180e4d40d9..99de6578f721af6e0e2a756f631698913bf99fd4 100644 (file)
--- a/x11-wm/goomwwm/goomwwm-9999.ebuild
+++ b/x11-wm/goomwwm/goomwwm-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
@@ -21,8 +21,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {

diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
index 1a51819f42a0e902645333daeeccd99235c09661..328bcf3ab891f31f93a67d770f23b3fbdce5aa70 100644 (file)
--- a/x11-wm/icewm/icewm-1.4.2.ebuild
+++ b/x11-wm/icewm/icewm-1.4.2.ebuild
@@ -36,13 +36,10 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       >=sys-apps/sed-4
-       x11-proto/xextproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        doc? ( app-text/linuxdoc-tools )
        nls? ( >=sys-devel/gettext-0.19.6 )
        truetype? ( >=media-libs/freetype-2.0.9 )
-       xinerama? ( x11-proto/xineramaproto )
 "
 
 pkg_setup() {

diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
index 006a0ebc1aaba51d3a7eb625598119ebe946beb0..b1ada2e713ec089f2f191f00d4ac77ff309adb36 100644 (file)
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,9 +25,7 @@ RDEPEND="xpm? ( x11-libs/libXpm )
        bidi? ( dev-libs/fribidi )
        dev-libs/expat"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto
-       xinerama? ( x11-proto/xineramaproto )"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf \

diff --git a/x11-wm/jwm/jwm-2.3.4-r1.ebuild b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
index f1d7d763d72a75901657156badba9e0267df2f1d..1cc308d043e83e1f4c5ece95c5e0df1bb7b77a67 100644 (file)
--- a/x11-wm/jwm/jwm-2.3.4-r1.ebuild
+++ b/x11-wm/jwm/jwm-2.3.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=5
@@ -25,9 +25,7 @@ RDEPEND="xpm? ( x11-libs/libXpm )
        bidi? ( dev-libs/fribidi )
        dev-libs/expat"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto
-       xinerama? ( x11-proto/xineramaproto )"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf \

diff --git a/x11-wm/jwm/jwm-2.3.5.ebuild b/x11-wm/jwm/jwm-2.3.5.ebuild
index 105297f295f11cb9929409dfb7ae312b7f5bba83..8607775ee2782d804cf2c84a0553e4faaabacdf0 100644 (file)
--- a/x11-wm/jwm/jwm-2.3.5.ebuild
+++ b/x11-wm/jwm/jwm-2.3.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=6
@@ -33,9 +33,7 @@ RDEPEND="dev-libs/expat
        xinerama? ( x11-libs/libXinerama )
        xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto
-       xinerama? ( x11-proto/xineramaproto )"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf \

diff --git a/x11-wm/jwm/jwm-2.3.6.ebuild b/x11-wm/jwm/jwm-2.3.6.ebuild
index 3f5fcc05da2eebb8e23dbfb340dd788be522f8c3..44d5478bb9efa85e408a3b7e848d14f01c9c377a 100644 (file)
--- a/x11-wm/jwm/jwm-2.3.6.ebuild
+++ b/x11-wm/jwm/jwm-2.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,9 +33,7 @@ RDEPEND="dev-libs/expat
        xinerama? ( x11-libs/libXinerama )
        xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto
-       xinerama? ( x11-proto/xineramaproto )"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf \

diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
index 891ecda192e7cc070fc7325907b2785009cdca82..44d5478bb9efa85e408a3b7e848d14f01c9c377a 100644 (file)
--- a/x11-wm/jwm/jwm-2.3.7.ebuild
+++ b/x11-wm/jwm/jwm-2.3.7.ebuild
@@ -33,9 +33,7 @@ RDEPEND="dev-libs/expat
        xinerama? ( x11-libs/libXinerama )
        xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto
-       xinerama? ( x11-proto/xineramaproto )"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf \

diff --git a/x11-wm/larswm/larswm-7.5.3-r1.ebuild b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
index 98f7f805a72522108c0c4eb7d85a000c1a6aadf8..6c4d029b86c5c81726ebe58d8622eb1812189284 100644 (file)
--- a/x11-wm/larswm/larswm-7.5.3-r1.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-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="2"
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXt
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xextproto
+       x11-base/xorg-proto
        x11-misc/imake
        x11-misc/gccmakedep
        app-text/rman"

diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index 01496199fc7e6d1f40991325d173289a2ed8fa21..7301a62bd4d5d25747231efe2b236be6b2a1977c 100644 (file)
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -22,9 +22,8 @@ RDEPEND="
 
 DEPEND="
        ${RDEPEND}
+       x11-base/xorg-proto
        x11-misc/imake
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 
 DOCS=( AUTHORS BUGS ChangeLog )

diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
index beb7936f32b6a1de0cacfe7f44381512d77d08e9..72471cfeadd68a0e6bb08e16f8da57a86f6928e3 100644 (file)
--- a/x11-wm/marco/marco-1.12.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.12.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
@@ -54,10 +54,8 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.34.90:*
        sys-devel/gettext:*
        virtual/pkgconfig:*
-       x11-proto/xextproto:0
-       x11-proto/xproto:0
-       test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto:0 )"
+       x11-base/xorg-proto
+       test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
        mate_src_configure \

diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
index 5de2688902df57aa120ca14abed878e692cd0339..81301b782686bb476ccf001b4719ee04189d2fdf 100644 (file)
--- a/x11-wm/marco/marco-1.12.1.ebuild
+++ b/x11-wm/marco/marco-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.34.90:*
        sys-devel/gettext:*
        virtual/pkgconfig:*
-       x11-proto/xextproto:0
-       x11-proto/xproto:0
-       test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto:0 )"
+       x11-base/xorg-proto
+       test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
        mate_src_configure \

diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
index 5cdf56cdaaf69ed12ad10321d731de8f89f106b3..33a7096f18cdf39d214a0bbd4b7586b3ffaa8577 100644 (file)
--- a/x11-wm/marco/marco-1.14.2-r1.ebuild
+++ b/x11-wm/marco/marco-1.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,10 +57,8 @@ DEPEND="${COMMON_DEPEND}
        >=dev-util/intltool-0.34.90:*
        sys-devel/gettext:*
        virtual/pkgconfig:*
-       x11-proto/xextproto:0
-       x11-proto/xproto:0
-       test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto:0 )"
+       x11-base/xorg-proto
+       test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
        mate_src_configure \

diff --git a/x11-wm/marco/marco-1.16.1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
index 5cdf56cdaaf69ed12ad10321d731de8f89f106b3..33a7096f18cdf39d214a0bbd4b7586b3ffaa8577 100644 (file)
--- a/x11-wm/marco/marco-1.16.1.ebuild
+++ b/x11-wm/marco/marco-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,10 +57,8 @@ DEPEND="${COMMON_DEPEND}
        >=dev-util/intltool-0.34.90:*
        sys-devel/gettext:*
        virtual/pkgconfig:*
-       x11-proto/xextproto:0
-       x11-proto/xproto:0
-       test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto:0 )"
+       x11-base/xorg-proto
+       test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
        mate_src_configure \

diff --git a/x11-wm/marco/marco-1.18.2.ebuild b/x11-wm/marco/marco-1.18.2.ebuild
index 3ee2fa3540d1f4b23c564c52e825ce2f110063f0..2c7b83c978d08a7cecf22ee4c1c6f604fe2a716e 100644 (file)
--- a/x11-wm/marco/marco-1.18.2.ebuild
+++ b/x11-wm/marco/marco-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,10 +50,8 @@ DEPEND="${COMMON_DEPEND}
        >=dev-util/intltool-0.34.90:*
        sys-devel/gettext:*
        virtual/pkgconfig:*
-       x11-proto/xextproto:0
-       x11-proto/xproto:0
-       test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto:0 )"
+       x11-base/xorg-proto
+       test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
        mate_src_configure \

diff --git a/x11-wm/muffin/muffin-2.8.5.ebuild b/x11-wm/muffin/muffin-2.8.5.ebuild
index ec923203378db019bba95e4b55b3aa8cc6b56ab8..c8ed0ba12a9b330c1b00c3ed7cd1dbf472e003ad 100644 (file)
--- a/x11-wm/muffin/muffin-2.8.5.ebuild
+++ b/x11-wm/muffin/muffin-2.8.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=6
@@ -55,10 +55,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/muffin/muffin-3.0.5.ebuild b/x11-wm/muffin/muffin-3.0.5.ebuild
index 67813feeeb3bfc2451ca73911ff67195677d2036..489e8ebb0541e03da779488434aa380c8f6d7d2a 100644 (file)
--- a/x11-wm/muffin/muffin-3.0.5.ebuild
+++ b/x11-wm/muffin/muffin-3.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=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/muffin/muffin-3.2.0-r1.ebuild b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
index 54cfd8ecf95d56bb7e421083da259464c117a5e5..691da9e9652a68a62b897936ca7e023568ffeb5b 100644 (file)
--- a/x11-wm/muffin/muffin-3.2.0-r1.ebuild
+++ b/x11-wm/muffin/muffin-3.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
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/muffin/muffin-3.2.0.ebuild b/x11-wm/muffin/muffin-3.2.0.ebuild
index afdf5b916e46264d5b546f5d14865df0757839ec..4f0194061da01389e0cb992d00e96424f623be6b 100644 (file)
--- a/x11-wm/muffin/muffin-3.2.0.ebuild
+++ b/x11-wm/muffin/muffin-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/muffin/muffin-3.4.0.ebuild b/x11-wm/muffin/muffin-3.4.0.ebuild
index 54cfd8ecf95d56bb7e421083da259464c117a5e5..691da9e9652a68a62b897936ca7e023568ffeb5b 100644 (file)
--- a/x11-wm/muffin/muffin-3.4.0.ebuild
+++ b/x11-wm/muffin/muffin-3.4.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
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/muffin/muffin-3.4.1.ebuild b/x11-wm/muffin/muffin-3.4.1.ebuild
index 54cfd8ecf95d56bb7e421083da259464c117a5e5..691da9e9652a68a62b897936ca7e023568ffeb5b 100644 (file)
--- a/x11-wm/muffin/muffin-3.4.1.ebuild
+++ b/x11-wm/muffin/muffin-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 843e993737d2c01237d4fe39b0b11c56889197b8..5b0e9e55033abe616baba8e2df1a16079f275ae2 100644 (file)
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gtk-doc-am
        >=dev-util/intltool-0.35
        virtual/pkgconfig
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
-       xinerama? ( x11-proto/xineramaproto )
-       x11-proto/xextproto
-       x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
        !x11-misc/expocity

diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
index 997051bb842beff2c080b49def15d24aa55e471d..8868471403f7a36298a4ad54d20a6ef2af41dfa5 100644 (file)
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.22.4-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
@@ -70,9 +70,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
        >=sys-devel/gettext-0.19.6
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
        wayland? ( >=sys-kernel/linux-headers-4.4 )
 "

diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 8f31f1764842351fc12ea3934e3c1b7cc2c499fe..7307af626908d14761e7c9e8c0c32b1025b93d50 100644 (file)
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -70,9 +70,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
        >=sys-devel/gettext-0.19.6
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
        test? ( app-text/docbook-xml-dtd:4.5 )
        wayland? ( >=sys-kernel/linux-headers-4.4 )
 "

diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
index 3f45b41ad72c673c83ee84e58da7f90fd142e973..433a8a577125b13a75d0e15a19f83a7e89896d49 100644 (file)
--- a/x11-wm/openbox/openbox-3.5.2-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.5.2-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"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xineramaproto"
+       x11-base/xorg-proto"
 
 src_unpack() {
        if [[ ${PV} == *9999* ]]; then

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 555caa92ec339c0651223850716fa70fd9d58b31..d06a776bab08bb8023149b28f6fd9f110d2dc1b7 100644 (file)
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.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="5"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xineramaproto"
+       x11-base/xorg-proto"
 
 src_unpack() {
        if [[ ${PV} == *9999* ]]; then

diff --git a/x11-wm/openbox/openbox-3.6.ebuild b/x11-wm/openbox/openbox-3.6.ebuild
index 1311371aa8819919ea00a23160aaa62b1242bb98..8412487ff4fa6f493cda5c090f40b225d1e3c595 100644 (file)
--- a/x11-wm/openbox/openbox-3.6.ebuild
+++ b/x11-wm/openbox/openbox-3.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"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xineramaproto"
+       x11-base/xorg-proto"
 
 src_unpack() {
        if [[ ${PV} == *9999* ]]; then

diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 150b3ce0a56d931ab3df0716c03de0f876bf0167..a2cb088ec10b653f2d8aefeb8c116bd3ce5821f4 100644 (file)
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xineramaproto"
+       x11-base/xorg-proto"
 
 src_unpack() {
        if [[ ${PV} == *9999* ]]; then

diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
index 1f0a4840a57dc538dec81a51300e09558803a117..1c51ba7f9b18e5f211d1ea6a28556b6bd7cca608 100644 (file)
--- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -19,7 +19,6 @@ RDEPEND="
        x11-libs/libXext
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog example.${PN}rc README TODO )

diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index f0c2e4dc948dc415e477f2d9dec0526eb45c8547..6bb0cbb4c799097b712a7a20d33b7a48f19f77b2 100644 (file)
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,8 +24,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 SITEFILE=50ratpoison-gentoo.el

diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 568ee3d06f2116d792baaef6bdd21a68e294637d..7bdbb46304d0c1f3f39c91170082164746e818d6 100644 (file)
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-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
@@ -24,8 +24,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 SITEFILE=50ratpoison-gentoo.el

diff --git a/x11-wm/treewm/treewm-0.4.5-r1.ebuild b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
index 118cd3b8d39cfc157ea57059c128ce1bc2964db3..7c71b8f47a2f8f0839316143e5803a83319c61cd 100644 (file)
--- a/x11-wm/treewm/treewm-0.4.5-r1.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5-r1.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"
@@ -19,8 +19,8 @@ RDEPEND="
        x11-libs/libXxf86vm
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       x11-misc/imake
-       x11-proto/xf86vidmodeproto"
+       x11-base/xorg-proto
+       x11-misc/imake"
 
 src_prepare() {
        # bug 251845

diff --git a/x11-wm/treewm/treewm-0.4.5.ebuild b/x11-wm/treewm/treewm-0.4.5.ebuild
index b1b6de25e7dfba75bb5baeb7903c6925329c9fb4..0351757d1ac3058cdee5567eccf3e92d6f3efa46 100644 (file)
--- a/x11-wm/treewm/treewm-0.4.5.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5.ebuild
@@ -20,8 +20,8 @@ RDEPEND="x11-libs/libXau
        x11-libs/libXdmcp
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       x11-misc/imake
-       x11-proto/xf86vidmodeproto"
+       x11-base/xorg-proto
+       x11-misc/imake"
 
 src_unpack() {
        unpack ${A}

diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
index 600133e8fc827ce28c4889794b98024284f28249..db49006317ff911e5719f9910f3fa5518492a6b0 100644 (file)
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
@@ -18,10 +18,9 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       x11-misc/imake
        app-text/rman
-       x11-proto/xproto
-       x11-proto/xextproto"
+       x11-base/xorg-proto
+       x11-misc/imake"
 
 src_compile() {
        xmkmf || die "xmkmf failed"

diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
index 2b781fab571ad14262946862de143f8ea1323c72..4fb624a7bec487200686780884c6048284b3b420 100644 (file)
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r1.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,12 +21,11 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXpm
        rplay? ( media-sound/rplay )"
 DEPEND="${RDEPEND}
+       app-text/rman
        sys-devel/bison
        sys-devel/flex
-       x11-misc/imake
-       app-text/rman
-       x11-proto/xproto
-       x11-proto/xextproto"
+       x11-base/xorg-proto
+       x11-misc/imake"
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-do-not-rm.patch

diff --git a/x11-wm/windowlab/windowlab-1.34.ebuild b/x11-wm/windowlab/windowlab-1.34.ebuild
index ffaea2ecaf510a6b7d6ba2dc0b410516ea2ef845..56ce2b4b3c071aaa09d1ac7f5344cd344ab54559 100644 (file)
--- a/x11-wm/windowlab/windowlab-1.34.ebuild
+++ b/x11-wm/windowlab/windowlab-1.34.ebuild
@@ -17,8 +17,8 @@ IUSE="truetype"
 RDEPEND="truetype? ( x11-libs/libXft )
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       virtual/pkgconfig"
+       virtual/pkgconfig
+       x11-base/xorg-proto"
 
 src_unpack() {
        unpack ${A}

diff --git a/x11-wm/windowlab/windowlab-1.40-r1.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
index 28f22b9e18acec57e416bfa23940b46d9305b4a2..45087d82b6c449afb8db2032ccaabab6a42701a9 100644 (file)
--- a/x11-wm/windowlab/windowlab-1.40-r1.ebuild
+++ b/x11-wm/windowlab/windowlab-1.40-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,8 +17,8 @@ IUSE="truetype"
 RDEPEND="truetype? ( x11-libs/libXft )
        x11-libs/libXext"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       virtual/pkgconfig"
+       virtual/pkgconfig
+       x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch"
          "${FILESDIR}/${P}-gentoo.diff" )

diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
index 1d023d08d20a47abc9cd3cdc7555b1690c03b898..ea872773ae6f51a1a405c7a09d48bf4cb55b807f 100644 (file)
--- a/x11-wm/wm2/wm2-4-r1.ebuild
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libXmu"
 DEPEND="${RDEPEND}
-       x11-proto/xextproto"
+       x11-base/xorg-proto"
 
 src_prepare() {
        epatch "${FILESDIR}/${P}-gentoo.patch"

diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index 1c7709cb6fc588ca11ee2bbae7b03e588456a4ac..ffa5e17c56fb0a5036f8eadf27f35b5a91fd1253 100644 (file)
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.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
@@ -23,9 +23,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index accc125060ba12a8b27b3d4101eb72b2935b46b1..cbcb210e0993d3b0984f211d32baff0ee9235093 100644 (file)
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.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
@@ -24,9 +24,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig
-       x11-proto/randrproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 
 src_prepare() {