commit: 68066b2a61adffb40ffe9ae4d01671640bda0d6e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon May 21 20:28:42 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 22 01:05:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68066b2a
x11-wm/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
x11-wm/aewm++/aewm++-1.1.5-r2.ebuild | 3 +--
x11-wm/aewm/aewm-1.3.12.ebuild | 5 ++---
x11-wm/afterstep/afterstep-2.2.12.ebuild | 4 +---
x11-wm/amiwm/amiwm-0.21_p2.ebuild | 5 ++---
x11-wm/awesome/awesome-3.5.9-r2.ebuild | 2 +-
x11-wm/awesome/awesome-4.2-r2.ebuild | 2 +-
x11-wm/awesome/awesome-9999.ebuild | 2 +-
x11-wm/blackbox/blackbox-0.70.1-r1.ebuild | 5 ++---
x11-wm/ctwm/ctwm-4.0.1.ebuild | 3 +--
x11-wm/dwm/dwm-6.1-r1.ebuild | 4 ++--
x11-wm/dwm/dwm-6.1.ebuild | 4 ++--
x11-wm/dwm/dwm-9999.ebuild | 4 ++--
x11-wm/enlightenment/enlightenment-0.16.9999.ebuild | 8 ++------
x11-wm/enlightenment/enlightenment-1.0.17.ebuild | 8 ++------
x11-wm/evilwm/evilwm-1.0.1-r1.ebuild | 3 +--
x11-wm/evilwm/evilwm-1.1.1.ebuild | 4 ++--
x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild | 2 +-
x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild | 2 +-
x11-wm/fluxbox/fluxbox-9999.ebuild | 2 +-
x11-wm/fvwm/fvwm-2.6.5-r2.ebuild | 5 ++---
x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild | 5 ++---
x11-wm/goomwwm/goomwwm-1.0.0.ebuild | 5 ++---
x11-wm/goomwwm/goomwwm-9999.ebuild | 5 ++---
x11-wm/icewm/icewm-1.4.2.ebuild | 5 +----
x11-wm/jwm/jwm-2.3.2.ebuild | 6 ++----
x11-wm/jwm/jwm-2.3.4-r1.ebuild | 6 ++----
x11-wm/jwm/jwm-2.3.5.ebuild | 6 ++----
x11-wm/jwm/jwm-2.3.6.ebuild | 6 ++----
x11-wm/jwm/jwm-2.3.7.ebuild | 4 +---
x11-wm/larswm/larswm-7.5.3-r1.ebuild | 5 ++---
x11-wm/lwm/lwm-1.2.4.ebuild | 3 +--
x11-wm/marco/marco-1.12.1-r1.ebuild | 8 +++-----
x11-wm/marco/marco-1.12.1.ebuild | 8 +++-----
x11-wm/marco/marco-1.14.2-r1.ebuild | 8 +++-----
x11-wm/marco/marco-1.16.1.ebuild | 8 +++-----
x11-wm/marco/marco-1.18.2.ebuild | 8 +++-----
x11-wm/muffin/muffin-2.8.5.ebuild | 6 ++----
x11-wm/muffin/muffin-3.0.5.ebuild | 6 ++----
x11-wm/muffin/muffin-3.2.0-r1.ebuild | 6 ++----
x11-wm/muffin/muffin-3.2.0.ebuild | 6 ++----
x11-wm/muffin/muffin-3.4.0.ebuild | 6 ++----
x11-wm/muffin/muffin-3.4.1.ebuild | 6 ++----
x11-wm/muffin/muffin-3.6.0.ebuild | 4 +---
x11-wm/mutter/mutter-3.22.4-r1.ebuild | 6 ++----
x11-wm/mutter/mutter-3.24.4.ebuild | 4 +---
x11-wm/openbox/openbox-3.5.2-r1.ebuild | 6 ++----
x11-wm/openbox/openbox-3.6.1.ebuild | 6 ++----
x11-wm/openbox/openbox-3.6.ebuild | 6 ++----
x11-wm/openbox/openbox-9999.ebuild | 6 ++----
x11-wm/oroborus/oroborus-2.0.20-r1.ebuild | 3 +--
x11-wm/ratpoison/ratpoison-1.4.9.ebuild | 5 ++---
x11-wm/ratpoison/ratpoison-9999.ebuild | 5 ++---
x11-wm/treewm/treewm-0.4.5-r1.ebuild | 6 +++---
x11-wm/treewm/treewm-0.4.5.ebuild | 4 ++--
x11-wm/vtwm/vtwm-5.4.6a.ebuild | 5 ++---
x11-wm/vtwm/vtwm-5.4.7-r1.ebuild | 9 ++++-----
x11-wm/windowlab/windowlab-1.34.ebuild | 4 ++--
x11-wm/windowlab/windowlab-1.40-r1.ebuild | 6 +++---
x11-wm/wm2/wm2-4-r1.ebuild | 4 ++--
x11-wm/wmfs/wmfs-201003.ebuild | 6 ++----
x11-wm/wmfs/wmfs-99999999.ebuild | 6 ++----
61 files changed, 115 insertions(+), 195 deletions(-)
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
index 601677e367b..be82ae9aeef 100644
--- 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 12e9f0fb572..4bc663d65e6 100644
--- 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 3bfc2da9701..522dd426635 100644
--- 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 3e5a3cf8bac..0fba9046d07 100644
--- 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 19db570fd47..6c0ad6ff15c 100644
--- 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 2ed75628ce4..3642f6c5a12 100644
--- 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 72cb2ec8262..d3e88b54440 100644
--- 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 112d8fcb051..773ef0d41a8 100644
--- 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 ecd97a4a914..c509b28861a 100644
--- 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 84a3658dd36..a641e17a6bc 100644
--- 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 305a792c1dd..d8a03b2546d 100644
--- 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 4783f3e641b..27c5d18fe7a 100644
--- 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 3796314e1e9..8c16c95bbad 100644
--- 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 91f2d348f9d..418b0bc450d 100644
--- 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 82001e5c2a6..24472c3a050 100644
--- 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 e1ae05372ef..78d001de8a7 100644
--- 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 c2443384420..e77bc234f23 100644
--- 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 404b247f012..9b32e3c6335 100644
--- 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 399a7ee66f9..70aa4303201 100644
--- 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 c25e8794bf6..9f65b7d8842 100644
--- 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 8e769cfdc2c..4286eabe8d4 100644
--- 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 27d7d564db6..99f5e273752 100644
--- 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 92024280f4e..99de6578f72 100644
--- 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 1a51819f42a..328bcf3ab89 100644
--- 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 006a0ebc1aa..b1ada2e713e 100644
--- 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 f1d7d763d72..1cc308d043e 100644
--- 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 105297f295f..8607775ee27 100644
--- 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 3f5fcc05da2..44d5478bb9e 100644
--- 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 891ecda192e..44d5478bb9e 100644
--- 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 98f7f805a72..6c4d029b86c 100644
--- 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 01496199fc7..7301a62bd4d 100644
--- 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 beb7936f32b..72471cfeadd 100644
--- 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 5de2688902d..81301b78268 100644
--- 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 5cdf56cdaaf..33a7096f18c 100644
--- 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 5cdf56cdaaf..33a7096f18c 100644
--- 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 3ee2fa3540d..2c7b83c978d 100644
--- 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 ec923203378..c8ed0ba12a9 100644
--- 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 67813feeeb3..489e8ebb054 100644
--- 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 54cfd8ecf95..691da9e9652 100644
--- 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 afdf5b916e4..4f0194061da 100644
--- 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 54cfd8ecf95..691da9e9652 100644
--- 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 54cfd8ecf95..691da9e9652 100644
--- 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 843e993737d..5b0e9e55033 100644
--- 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 997051bb842..8868471403f 100644
--- 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 8f31f176484..7307af62690 100644
--- 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 3f45b41ad72..433a8a57712 100644
--- 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 555caa92ec3..d06a776bab0 100644
--- 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 1311371aa88..8412487ff4f 100644
--- 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 150b3ce0a56..a2cb088ec10 100644
--- 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 1f0a4840a57..1c51ba7f9b1 100644
--- 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 f0c2e4dc948..6bb0cbb4c79 100644
--- 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 568ee3d06f2..7bdbb46304d 100644
--- 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 118cd3b8d39..7c71b8f47a2 100644
--- 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 b1b6de25e7d..0351757d1ac 100644
--- 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 600133e8fc8..db49006317f 100644
--- 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 2b781fab571..4fb624a7bec 100644
--- 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 ffaea2ecaf5..56ce2b4b3c0 100644
--- 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 28f22b9e18a..45087d82b6c 100644
--- 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 1d023d08d20..ea872773ae6 100644
--- 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 1c7709cb6fc..ffa5e17c56f 100644
--- 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 accc125060b..cbcb210e099 100644
--- 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() {
