commit: 91c04d8df17a12ec4016d0d3f6e25d4dfc4232a3
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon May 21 20:26:44 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 22 01:05:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c04d8d
x11-plugins/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
x11-plugins/allin1/allin1-0.5.0-r2.ebuild | 4 ++--
x11-plugins/asapm/asapm-3.1-r1.ebuild | 4 ++--
x11-plugins/ascpu/ascpu-1.11-r1.ebuild | 4 ++--
x11-plugins/asmem/asmem-1.12-r1.ebuild | 4 ++--
x11-plugins/asmon/asmon-0.71-r1.ebuild | 4 ++--
x11-plugins/asmon/asmon-0.71.ebuild | 2 +-
x11-plugins/astime/astime-2.8-r2.ebuild | 4 ++--
x11-plugins/cputnik/cputnik-0.2.0.ebuild | 2 +-
x11-plugins/epplets/epplets-0.12.ebuild | 3 +--
x11-plugins/epplets/epplets-0.14.ebuild | 5 ++---
x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild | 4 ++--
x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild | 2 +-
x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild | 3 +--
x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild | 3 +--
x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild | 2 +-
x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild | 3 +--
x11-plugins/wmSun/wmSun-1.05.ebuild | 2 +-
x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild | 4 ++--
x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild | 2 +-
x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild | 5 ++---
x11-plugins/wmamixer/wmamixer-0.2.ebuild | 4 ++--
x11-plugins/wmapm/wmapm-3.1-r1.ebuild | 3 +--
x11-plugins/wmappl/wmappl-0.71.ebuild | 2 +-
x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild | 2 +-
x11-plugins/wmbiff/wmbiff-0.4.28.ebuild | 3 +--
x11-plugins/wmbiff/wmbiff-0.4.30.ebuild | 3 +--
x11-plugins/wmbiff/wmbiff-0.4.31.ebuild | 3 +--
x11-plugins/wmbinclock/wmbinclock-0.5.ebuild | 2 +-
x11-plugins/wmbio/wmbio-1.02.ebuild | 4 ++--
x11-plugins/wmblob/wmblob-1.0.3.ebuild | 4 ++--
x11-plugins/wmbutton/wmbutton-0.7.0.ebuild | 3 +--
x11-plugins/wmbutton/wmbutton-0.7.1.ebuild | 2 +-
x11-plugins/wmcalc/wmcalc-0.6.ebuild | 2 +-
x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild | 3 +--
x11-plugins/wmcdplay/wmcdplay-1.1.ebuild | 2 +-
x11-plugins/wmclock/wmclock-1.0.16.ebuild | 2 +-
x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild | 4 ++--
x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild | 10 ++++------
x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild | 10 ++++------
x11-plugins/wmcp/wmcp-1.2.8.ebuild | 3 +--
x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild | 2 +-
x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild | 4 ++--
x11-plugins/wmfortune/wmfortune-0.241.ebuild | 3 +--
x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild | 4 ++--
x11-plugins/wmfrog/wmfrog-0.3.1.ebuild | 4 ++--
x11-plugins/wmfsm/wmfsm-0.36.ebuild | 2 +-
x11-plugins/wmget/wmget-0.6.1.ebuild | 2 +-
x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild | 4 +---
x11-plugins/wmifinfo/wmifinfo-0.10.ebuild | 2 +-
x11-plugins/wminet/wminet-3.0.0-r1.ebuild | 4 ++--
x11-plugins/wmix/wmix-3.2.ebuild | 2 +-
x11-plugins/wmix/wmix-3.3.ebuild | 2 +-
x11-plugins/wmlaptop/wmlaptop-1.4.ebuild | 3 +--
x11-plugins/wmload/wmload-0.9.7.ebuild | 2 +-
x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild | 5 ++---
x11-plugins/wmmemload/wmmemload-0.1.8.ebuild | 2 +-
x11-plugins/wmmisc/wmmisc-1.1.ebuild | 2 +-
x11-plugins/wmmixer/wmmixer-1.8.ebuild | 2 +-
x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild | 4 ++--
x11-plugins/wmmon/wmmon-1.2_beta1.ebuild | 4 ++--
x11-plugins/wmmon/wmmon-1.3.ebuild | 4 ++--
x11-plugins/wmmon/wmmon-1.4.ebuild | 2 +-
x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild | 3 +--
x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild | 3 +--
x11-plugins/wmmp3/wmmp3-0.12.ebuild | 4 ++--
x11-plugins/wmnd/wmnd-0.4.16.ebuild | 4 ++--
x11-plugins/wmnd/wmnd-0.4.17.ebuild | 4 ++--
x11-plugins/wmnet/wmnet-1.06-r1.ebuild | 3 +--
x11-plugins/wmpeople/wmpeople-1.3.ebuild | 3 +--
x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild | 4 ++--
x11-plugins/wmpinboard/wmpinboard-1.0.ebuild | 3 +--
x11-plugins/wmping/wmping-0.2.1.ebuild | 5 ++---
x11-plugins/wmpower/wmpower-0.4.3.ebuild | 3 +--
x11-plugins/wmrack/wmrack-1.3.ebuild | 2 +-
x11-plugins/wmrack/wmrack-1.4.ebuild | 4 ++--
x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild | 3 +--
x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild | 3 +--
x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild | 2 +-
x11-plugins/wmtime/wmtime-1.4.ebuild | 2 +-
x11-plugins/wmtop/wmtop-0.85.ebuild | 2 +-
x11-plugins/wmweather/wmweather-2.4.4.ebuild | 2 +-
x11-plugins/wmweather/wmweather-2.4.5.ebuild | 4 ++--
x11-plugins/wmweather/wmweather-2.4.6.ebuild | 4 ++--
x11-plugins/wmwifi/wmwifi-0.6.ebuild | 3 +--
x11-plugins/wmwork/wmwork-0.2.5.ebuild | 2 +-
x11-plugins/wmxkb/wmxkb-1.2.2.ebuild | 6 ++----
x11-plugins/wmxres/wmxres-1.2.ebuild | 7 +++----
87 files changed, 126 insertions(+), 161 deletions(-)
diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
index 3777c34d6a0..8fbbd58b567 100644
--- 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" )
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild
b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index 91e71f33349..8d6ea14a235 100644
--- 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
diff --git a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
b/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
index ab325222b55..3fd3792e775 100644
--- 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" )
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild
b/x11-plugins/asmem/asmem-1.12-r1.ebuild
index e0f39bf7ed5..2eb08c18251 100644
--- 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" )
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild
b/x11-plugins/asmon/asmon-0.71-r1.ebuild
index f6be82776b1..74d7319ab55 100644
--- 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}
diff --git a/x11-plugins/asmon/asmon-0.71.ebuild
b/x11-plugins/asmon/asmon-0.71.ebuild
index 27a25f7cda5..6bea68eeba7 100644
--- 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}
diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild
b/x11-plugins/astime/astime-2.8-r2.ebuild
index ea8e6a19f84..c50c9190ab7 100644
--- 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" )
diff --git a/x11-plugins/cputnik/cputnik-0.2.0.ebuild
b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
index ee3e78fa893..439645be1b3 100644
--- 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
diff --git a/x11-plugins/epplets/epplets-0.12.ebuild
b/x11-plugins/epplets/epplets-0.12.ebuild
index 1d62439e68d..1b147792f12 100644
--- 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
diff --git a/x11-plugins/epplets/epplets-0.14.ebuild
b/x11-plugins/epplets/epplets-0.14.ebuild
index b8abc8e5a2e..416ba6a70a6 100644
--- 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)
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
index 3e682aad1fd..83bc210ced4 100644
--- 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}
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
index 253934df329..8e75f7effaf 100644
--- 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}"
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
index 235af24fee8..f9f05bc1496 100644
--- 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"
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
index 1a6b5e27c40..2fb50977e0e 100644
--- 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"
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
index 206382d667a..7994fea1f0d 100644
--- 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}"
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
index 8b9fd175cd6..bb9f25ab7bc 100644
--- 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"
diff --git a/x11-plugins/wmSun/wmSun-1.05.ebuild
b/x11-plugins/wmSun/wmSun-1.05.ebuild
index 4926d450599..a7701df3ebb 100644
--- 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}"
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 564f104c855..5336ef10ddd 100644
--- 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}"
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
index 8af070e1e11..ca8e850f9a5 100644
--- 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}"
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index 30262c7d812..d902e3de4a3 100644
--- 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
diff --git a/x11-plugins/wmamixer/wmamixer-0.2.ebuild
b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
index a684fbdad79..47ea86948d7 100644
--- 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() {
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index d463cae956e..6825e6d6a68 100644
--- 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}
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild
b/x11-plugins/wmappl/wmappl-0.71.ebuild
index 07b149ea170..797a891879d 100644
--- 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"
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
index 8c74061700f..534f09d4db2 100644
--- 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"
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
index 96a725b2eaa..8e73b022cf3 100644
--- 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
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
b/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
index 1185a4b13af..58c48049945 100644
--- 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"
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
b/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
index 1185a4b13af..58c48049945 100644
--- 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"
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
index 28d23517f4d..91e02681402 100644
--- 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}" \
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild
b/x11-plugins/wmbio/wmbio-1.02.ebuild
index 7c9d8fdf860..b6fcce6d415 100644
--- 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
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
index 188ec7aa803..177155ed0a7 100644
--- 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"
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
index 353094287d0..4a5bc61a5db 100644
--- 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
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index 5de26b6bd1e..a681773c8a4 100644
--- 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"
diff --git a/x11-plugins/wmcalc/wmcalc-0.6.ebuild
b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
index e71e445a3ce..a10e1ac605d 100644
--- 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
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index 7827b4a7dbf..a5309acde84 100644
--- 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"
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
index d3b33734988..f0a1d39b633 100644
--- 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
diff --git a/x11-plugins/wmclock/wmclock-1.0.16.ebuild
b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
index b3697311454..8a6ac6cd192 100644
--- 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
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
b/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
index bb657bedb11..15c05d3ee3b 100644
--- 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() {
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
index b0a61a2aa8a..a8546bdbafa 100644
--- 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
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 3c3c5701375..6b23f379b40 100644
--- 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"
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index fbd061cbaa0..eda159623e3 100644
--- 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}
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
b/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
index 74a0ed57417..47eeeabe835 100644
--- 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/_/}
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
index a85d7e55763..86e2770cfb0 100644
--- 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() {
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index b355001833d..4165e7e95b9 100644
--- 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}
diff --git a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
b/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
index ad134fe8a64..ec123100e9b 100644
--- 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
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
index 9bbe9bda51b..74ad1e17968 100644
--- 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
diff --git a/x11-plugins/wmfsm/wmfsm-0.36.ebuild
b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
index 62f0eb72ea0..43937a34e43 100644
--- 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"
diff --git a/x11-plugins/wmget/wmget-0.6.1.ebuild
b/x11-plugins/wmget/wmget-0.6.1.ebuild
index 17190d7c7a8..7c6f99f0c6d 100644
--- 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
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
index 6586c9fd143..b64e3a685bf 100644
--- 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}
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
index 45b51b59524..6d796359dc8 100644
--- 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
diff --git a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
index aa8802b5c5b..31fcd6df066 100644
--- 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
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
index 84b87b79bfa..6164f74253c 100644
--- 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
diff --git a/x11-plugins/wmix/wmix-3.3.ebuild b/x11-plugins/wmix/wmix-3.3.ebuild
index a82978ca7e5..c5b23a95a59 100644
--- 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"
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
index 8a1f8644c5a..da724eecc00 100644
--- 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"
diff --git a/x11-plugins/wmload/wmload-0.9.7.ebuild
b/x11-plugins/wmload/wmload-0.9.7.ebuild
index 9d170235dac..424fa397b0f 100644
--- 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
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
index ca06b0cbe56..95d39065164 100644
--- 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
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
b/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
index 4dcb8d04e28..27e6684bf27 100644
--- 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"
diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
index 342162e0f65..5b4d2a91fae 100644
--- 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}
diff --git a/x11-plugins/wmmixer/wmmixer-1.8.ebuild
b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
index 72b8ef660d7..e557c839133 100644
--- 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"
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 9dc5da61324..3da3e885fae 100644
--- 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
diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index 54f0ae422f8..94e8f0cbdbc 100644
--- 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}
diff --git a/x11-plugins/wmmon/wmmon-1.3.ebuild
b/x11-plugins/wmmon/wmmon-1.3.ebuild
index 7705ab2e705..ed8ccc7f24b 100644
--- 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"
diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild
b/x11-plugins/wmmon/wmmon-1.4.ebuild
index 9b4d238fc25..ed8ccc7f24b 100644
--- 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"
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
b/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
index 702588106f7..d7fbf53d802 100644
--- 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"
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
index 3daf78facc8..3eae322ded2 100644
--- 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"
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index e4b39917b7a..9b9d18396b0 100644
--- 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}
diff --git a/x11-plugins/wmnd/wmnd-0.4.16.ebuild
b/x11-plugins/wmnd/wmnd-0.4.16.ebuild
index 0e607154895..b33c06f4868 100644
--- 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
diff --git a/x11-plugins/wmnd/wmnd-0.4.17.ebuild
b/x11-plugins/wmnd/wmnd-0.4.17.ebuild
index 516ebf9f1ff..5f888de90ca 100644
--- 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
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index 9dfb8a9c75a..8c28d8b06e1 100644
--- 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"
diff --git a/x11-plugins/wmpeople/wmpeople-1.3.ebuild
b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
index 0498d568e41..1b9773539ea 100644
--- 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() {
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
index 884ccdd4b4c..9e6f56ea7cb 100644
--- 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"
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index 8354198a3b4..f7fbc6a43a8 100644
--- 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"
diff --git a/x11-plugins/wmping/wmping-0.2.1.ebuild
b/x11-plugins/wmping/wmping-0.2.1.ebuild
index 4b44c98b124..3c7b7a00ead 100644
--- 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"
diff --git a/x11-plugins/wmpower/wmpower-0.4.3.ebuild
b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
index b5e73a0ae6c..3235f25cf63 100644
--- 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
diff --git a/x11-plugins/wmrack/wmrack-1.3.ebuild
b/x11-plugins/wmrack/wmrack-1.3.ebuild
index d167626d134..52fa77442a2 100644
--- 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}
diff --git a/x11-plugins/wmrack/wmrack-1.4.ebuild
b/x11-plugins/wmrack/wmrack-1.4.ebuild
index b1b4763a9da..2b0d6930da5 100644
--- 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
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
index b0ac99ee948..7323122856a 100644
--- 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"
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 043175cd149..7e01b194131 100644
--- 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
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
index e4cc74eca71..d5ab7c82a72 100644
--- 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
diff --git a/x11-plugins/wmtime/wmtime-1.4.ebuild
b/x11-plugins/wmtime/wmtime-1.4.ebuild
index 2da6f1f1bfc..54dbafbab8c 100644
--- 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}"
diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild
b/x11-plugins/wmtop/wmtop-0.85.ebuild
index 43f1dbde59c..63b85df2a30 100644
--- 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
diff --git a/x11-plugins/wmweather/wmweather-2.4.4.ebuild
b/x11-plugins/wmweather/wmweather-2.4.4.ebuild
index 413d431c5fc..dd51b110b97 100644
--- 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
diff --git a/x11-plugins/wmweather/wmweather-2.4.5.ebuild
b/x11-plugins/wmweather/wmweather-2.4.5.ebuild
index 672b5595b97..44c2c24cfab 100644
--- 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
diff --git a/x11-plugins/wmweather/wmweather-2.4.6.ebuild
b/x11-plugins/wmweather/wmweather-2.4.6.ebuild
index 451ba034bb9..125790de111 100644
--- 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
diff --git a/x11-plugins/wmwifi/wmwifi-0.6.ebuild
b/x11-plugins/wmwifi/wmwifi-0.6.ebuild
index 0c2e17e0086..45fc88ee8be 100644
--- 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()
{
diff --git a/x11-plugins/wmwork/wmwork-0.2.5.ebuild
b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
index c9dd6314ab1..3b4840f0b94 100644
--- 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
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index af99220d04e..37bfd003969 100644
--- 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
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild
b/x11-plugins/wmxres/wmxres-1.2.ebuild
index bc0f29ab314..79322945836 100644
--- 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
