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

23 files changed, 48 insertions, 70 deletions

diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
index 5e65dbcd0b4b..d93fd6f0ccb3 100644
--- a/media-video/alevt/alevt-1.6.2.ebuild
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	>=media-libs/libpng-1.4"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 RESTRICT="strip"
 
diff --git a/media-video/cheese/cheese-3.24.0.ebuild b/media-video/cheese/cheese-3.24.0.ebuild
index c4355c816aa4..b9978f7735b1 100644
--- a/media-video/cheese/cheese-3.24.0.ebuild
+++ b/media-video/cheese/cheese-3.24.0.ebuild
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	dev-util/itstool
 	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
+	x11-base/xorg-proto
 	test? ( dev-libs/glib:2[utils] )
 "
 
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index db84aec79d57..c52e83c38b30 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -130,17 +130,13 @@ RDEPEND+="
 	xvmc? ( x11-libs/libXvMC )
 "
 
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
+	dga? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+	xscreensaver? ( x11-base/xorg-proto )
 	amd64? ( ${ASM_DEP} )
 	doc? (
 		dev-libs/libxslt app-text/docbook-xml-dtd
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 7f4d347dd713..1e14de1f1ea4 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -129,17 +129,13 @@ RDEPEND+="
 	xvmc? ( x11-libs/libXvMC )
 "
 
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
+	dga? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+	xscreensaver? ( x11-base/xorg-proto )
 	amd64? ( ${ASM_DEP} )
 	doc? (
 		dev-libs/libxslt app-text/docbook-xml-dtd
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 0ca08a83c5c3..252dcec7163c 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -129,17 +129,13 @@ RDEPEND+="
 	xvmc? ( x11-libs/libXvMC )
 "
 
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
+	dga? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+	xscreensaver? ( x11-base/xorg-proto )
 	amd64? ( ${ASM_DEP} )
 	doc? (
 		dev-libs/libxslt app-text/docbook-xml-dtd
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
index 5062a31c59b6..10851bb2c8f2 100644
--- a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-340.58-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
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/libvdpau"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	einfo "Building libXNVCtrl..."
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
index c20dca0ad414..5e890a832b15 100644
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-340.58.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
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/libvdpau"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	einfo "Building libXNVCtrl..."
diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
index 373cf95cc307..8225afc77a3e 100644
--- a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-355.11.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
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-drivers/nvidia-drivers:0/355"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	einfo "Building libXNVCtrl..."
diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
index c2b74e3d2af7..1ef8e7edc4b8 100644
--- a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-358.16.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
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-drivers/nvidia-drivers:0/358"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	einfo "Building libXNVCtrl..."
diff --git a/media-video/parole/parole-0.8.1.ebuild b/media-video/parole/parole-0.8.1.ebuild
index a8dd869c52d7..dda831291c0d 100644
--- a/media-video/parole/parole-0.8.1.ebuild
+++ b/media-video/parole/parole-0.8.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
@@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	XFCONF=(
diff --git a/media-video/parole/parole-1.0.0.ebuild b/media-video/parole/parole-1.0.0.ebuild
index 377232165ea8..ba3fa0b882ea 100644
--- a/media-video/parole/parole-1.0.0.ebuild
+++ b/media-video/parole/parole-1.0.0.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog README THANKS TODO )
 
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
index 3fe9a536f39c..c67039828941 100644
--- a/media-video/parole/parole-1.0.1.ebuild
+++ b/media-video/parole/parole-1.0.1.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog README THANKS TODO )
 
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
index 51d0a0b43c44..fba38e965e18 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -26,14 +26,12 @@ RDEPEND="sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
-	if has_version ">=x11-proto/xextproto-7.1.1"; then
-		sed -i \
-			-e 's:shmstr.h:shmproto.h:g' \
-			src/rmd_{getzpixmap.c,update_image.c} || die
-	fi
+	sed -i \
+		-e 's:shmstr.h:shmproto.h:g' \
+		src/rmd_{getzpixmap.c,update_image.c} || die
 
 	# fix weird Framerates with new libtheora
 	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
index 8fd17ae7e35f..5247e79de061 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
@@ -26,14 +26,12 @@ RDEPEND="sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
-	if has_version ">=x11-proto/xextproto-7.1.1"; then
-		sed -i \
-			-e 's:shmstr.h:shmproto.h:g' \
-			src/rmd_{getzpixmap.c,update_image.c} || die
-	fi
+	sed -i \
+		-e 's:shmstr.h:shmproto.h:g' \
+		src/rmd_{getzpixmap.c,update_image.c} || die
 
 	# fix weird Framerates with new libtheora
 	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
diff --git a/media-video/totem/totem-3.24.0.ebuild b/media-video/totem/totem-3.24.0.ebuild
index e0494408ed43..127a2007f2e6 100644
--- a/media-video/totem/totem-3.24.0.ebuild
+++ b/media-video/totem/totem-3.24.0.ebuild
@@ -71,8 +71,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-libs/gobject-introspection-common
 	gnome-base/gnome-common
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index 39a113518713..df48927b371c 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -184,7 +184,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
+	xcb? ( x11-base/xorg-proto )
 "
 
 PATCHES=(
diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild
index f4d4543afd5e..1ac9c9a5b143 100644
--- a/media-video/vlc/vlc-3.0.1-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.1-r1.ebuild
@@ -219,7 +219,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
 	x86? ( dev-lang/yasm:* )
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 PATCHES=(
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
index 2c2154219fe5..212e34f012a3 100644
--- a/media-video/vlc/vlc-3.0.2.ebuild
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -219,7 +219,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
 	x86? ( dev-lang/yasm:* )
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 PATCHES=(
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 2c2154219fe5..212e34f012a3 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -219,7 +219,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
 	x86? ( dev-lang/yasm:* )
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 PATCHES=(
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 030488234700..f09e4c9d6e9b 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -220,7 +220,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
 	x86? ( dev-lang/yasm:* )
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 PATCHES=(
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
index 3b7acf11a3c8..f07331fb724b 100644
--- a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1-r5.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
 
 inherit flag-o-matic eutils toolchain-funcs
@@ -68,9 +68,8 @@ RDEPEND="virtual/jpeg
 	media-libs/libquicktime"
 DEPEND="${RDEPEND}
 	app-arch/ncompress
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index e030de84625a..a01737dad30d 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -39,10 +39,8 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.18.3 )
 	X? (
+		x11-base/xorg-proto
 		x11-libs/libXt
-		x11-proto/inputproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
 		)
 	virtual/pkgconfig"
 
diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild b/media-video/xine-ui/xine-ui-0.99.9.ebuild
index 3bed5b2be508..1740be0f676c 100644
--- a/media-video/xine-ui/xine-ui-0.99.9.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.9.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
@@ -39,10 +39,8 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.18.3 )
 	X? (
+		x11-base/xorg-proto
 		x11-libs/libXt
-		x11-proto/inputproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
 		)
 	virtual/pkgconfig"