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

2026-08-05 12:38:09 -07:00 · 2018-05-21 22:26:44 +02:00
parent 8b3b12c361
commit 91c04d8df1
87 changed files with 126 additions and 161 deletions
--- a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
+++ b/x11-plugins/allin1/allin1-0.5.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 PATCHES=( "${FILESDIR}/makefile-r2.patch" )

--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"

 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
--- a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
+++ b/x11-plugins/ascpu/ascpu-1.11-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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXpm
 	jpeg? ( virtual/jpeg:0 )"

 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch" )

--- a/x11-plugins/asmem/asmem-1.12-r1.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-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="x11-libs/libX11
 	x11-libs/libXext
 	jpeg? ( virtual/jpeg:0 )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 PATCHES=( "${FILESDIR}/respect-ldflags.patch" )

--- a/x11-plugins/asmon/asmon-0.71-r1.ebuild
+++ b/x11-plugins/asmon/asmon-0.71-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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/${PN}

--- a/x11-plugins/asmon/asmon-0.71.ebuild
+++ b/x11-plugins/asmon/asmon-0.71.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/${PN}

--- a/x11-plugins/astime/astime-2.8-r2.ebuild
+++ b/x11-plugins/astime/astime-2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXpm
 	jpeg? ( virtual/jpeg:0 )"

 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 PATCHES=( "${FILESDIR}/respect-ldflags.patch" )

--- a/x11-plugins/cputnik/cputnik-0.2.0.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/src

--- a/x11-plugins/epplets/epplets-0.12.ebuild
+++ b/x11-plugins/epplets/epplets-0.12.ebuild
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	>=x11-wm/enlightenment-0.16.4"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_install() {
 	emake DESTDIR="${D}" install || die
--- a/x11-plugins/epplets/epplets-0.14.ebuild
+++ b/x11-plugins/epplets/epplets-0.14.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="4"
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	>=x11-wm/enlightenment-0.16.4"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_configure() {
 	econf $(use_enable static-libs static)
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND=">=x11-wm/windowmaker-0.95.2
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
+	x11-base/xorg-proto
 	nls? ( sys-devel/gettext )"

 S=${WORKDIR}/${MY_P}
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	app-admin/gkrellm:2[X]
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto"
+	x11-base/xorg-proto"

 S="${WORKDIR}/${MY_P}"

--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 SLOT="0"
 LICENSE="GPL-2"
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
@@ -13,8 +13,7 @@ CDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${CDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 RDEPEND="${CDEPEND}
 	x11-misc/xscreensaver"

--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S="${WORKDIR}/${P}/${PN}"

--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
@@ -25,8 +25,7 @@ CDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${CDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 RDEPEND="${CDEPEND}
 	net-misc/curl
 	dev-lang/perl"
--- a/x11-plugins/wmSun/wmSun-1.05.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.05.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S="${WORKDIR}/${MY_P}"

--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.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="2"
@@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"

 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S="${WORKDIR}/${MY_P}"

--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S="${WORKDIR}/${MY_P}"

--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=2
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	# patch wmacpimon.c file to set default path for
--- a/x11-plugins/wmamixer/wmamixer-0.2.ebuild
+++ b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXpm
 	x11-libs/libXext
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 DOCS=( README.rst )
 src_compile() {
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
@@ -16,8 +16,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/${PN}

--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71.ebuild
@@ -13,7 +13,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 LICENSE="GPL-2"
 SLOT="0"
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
--- a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
 		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/dockapps

--- a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
 		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"

--- a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
 		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"

--- a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/src

--- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
+++ b/x11-plugins/wmblob/wmblob-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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libXt"

 DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
--- a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/dockapps

--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmcalc/wmcalc-0.6.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 # Specific to this tarball
 S=${WORKDIR}/dockapps-43ddcdf
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-misc/imake"

 SLOT="0"
--- a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/dockapps

--- a/x11-plugins/wmclock/wmclock-1.0.16.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 # Specific path for this version
 S=${WORKDIR}/dockapps-daaf3aa
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libICE"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libXt"

 src_prepare() {
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@@ -22,12 +22,10 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXft
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXt
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )"

 S=${WORKDIR}/${PN}-debian-${PV/_p/-}-1

--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -20,12 +20,10 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXft
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXt
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )"

 DOCS="AUTHORS ChangeLog NEWS README"

--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 src_unpack() {
 	unpack ${A}
--- a/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
+++ b/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
@@ -16,7 +16,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libICE"

 S=${WORKDIR}/${P/_/}
--- a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
+++ b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.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=4
@@ -15,7 +15,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libXt"

 src_install() {
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
@@ -19,8 +19,7 @@ RDEPEND="games-misc/fortune-mod
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_unpack() {
 	unpack ${A}
--- a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.2.0-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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/Src

--- a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/Src

--- a/x11-plugins/wmfsm/wmfsm-0.36.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
--- a/x11-plugins/wmget/wmget-0.6.1.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	>=net-misc/curl-7.9.7"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 # Specific to this tarball
 S=${WORKDIR}/dockapps-5aaf842
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
@@ -22,9 +22,7 @@ RDEPEND=">=net-misc/wget-1.9-r2
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN}

--- a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/dockapps

--- a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
+++ b/x11-plugins/wminet/wminet-3.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=5
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	epatch "${FILESDIR}"/${P}-list.patch
--- a/x11-plugins/wmix/wmix-3.2.ebuild
+++ b/x11-plugins/wmix/wmix-3.2.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/dockapps

--- a/x11-plugins/wmix/wmix-3.3.ebuild
+++ b/x11-plugins/wmix/wmix-3.3.ebuild
@@ -17,4 +17,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
+	x11-base/xorg-proto"

 SLOT="0"
 LICENSE="GPL-2"
--- a/x11-plugins/wmload/wmload-0.9.7.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.6-solaris.patch
--- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
+++ b/x11-plugins/wmmand/wmmand-1.3.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
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${MY_P}/wmMand

--- a/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libICE
 	x11-libs/libXt"

--- a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_unpack() {
 	unpack ${A}
--- a/x11-plugins/wmmixer/wmmixer-1.8.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.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=5
@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/wmmon.app/wmmon

--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P/_beta/b}

--- a/x11-plugins/wmmon/wmmon-1.3.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -16,4 +16,4 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -16,4 +16,4 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 LICENSE="GPL-2"
 SLOT="0"
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
@@ -16,5 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
@@ -18,8 +18,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	media-sound/mpg123"
+	media-sound/mpg123
+	x11-base/xorg-proto"

 src_unpack() {
 	unpack ${A}
--- a/x11-plugins/wmnd/wmnd-0.4.16.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.16.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_install() {
 	emake DESTDIR="${D}" install
--- a/x11-plugins/wmnd/wmnd-0.4.17.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.17.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_install() {
 	emake DESTDIR="${D}" install
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
@@ -14,8 +14,7 @@ HOMEPAGE="http://www.dockapps.net/wmnet"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-misc/imake
 	app-text/rman"

--- a/x11-plugins/wmpeople/wmpeople-1.3.ebuild
+++ b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	>=net-mail/peephole-1.2"

 src_install() {
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -14,8 +14,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 SLOT="0"
 LICENSE="GPL-2"
--- a/x11-plugins/wmping/wmping-0.2.1.ebuild
+++ b/x11-plugins/wmping/wmping-0.2.1.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
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	x11-libs/libICE
 	x11-libs/libXt"

--- a/x11-plugins/wmpower/wmpower-0.4.3.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_compile() {
 	# override wmpower self-calculated cflags
--- a/x11-plugins/wmrack/wmrack-1.3.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_unpack() {
 	unpack ${A}
--- a/x11-plugins/wmrack/wmrack-1.4.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=4
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	sed -i -e 's:gcc:$(CC):' "${S}"/Makefile.in
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
@@ -14,8 +14,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
+	x11-base/xorg-proto"

 SLOT="0"
 LICENSE="GPL-2"
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXpm
 	x11-libs/libXext
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 src_compile() {
 	g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/wmswallow

--- a/x11-plugins/wmtime/wmtime-1.4.ebuild
+++ b/x11-plugins/wmtime/wmtime-1.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXdmcp
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
--- a/x11-plugins/wmtop/wmtop-0.85.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 # Incorrect path in this tarball version
 S=${WORKDIR}/dockapps-be3f170
--- a/x11-plugins/wmweather/wmweather-2.4.4.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.4.ebuild
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-apps/xmessage
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/src

--- a/x11-plugins/wmweather/wmweather-2.4.5.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=4
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-apps/xmessage
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/src

--- a/x11-plugins/wmweather/wmweather-2.4.6.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-apps/xmessage
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/src

--- a/x11-plugins/wmwifi/wmwifi-0.6.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.6.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"

 src_compile()
 {
--- a/x11-plugins/wmwork/wmwork-0.2.5.ebuild
+++ b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
@@ -16,7 +16,7 @@ RDEPEND=">=x11-libs/libXext-1.0.3
 	>=x11-libs/libX11-1.1.1-r1
 	>=x11-libs/libXpm-3.5.6"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"

 S=${WORKDIR}/${P}/src

--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=2
@@ -18,9 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	x11-proto/inputproto"
+	x11-base/xorg-proto"

 src_prepare() {
 	sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2.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
@@ -18,9 +18,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	x11-libs/libXxf86dga
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto
+	x11-libs/libXxf86dga"

 S=${WORKDIR}/${PN}.app