[gentoo-commits] repo/gentoo:master commit in: media-sound/synaesthesia/, media-sound/pulseaudio/, media-sound/mup/, ...

[Matt Turner]

commit:     f6e5e53ed96a8fc4f4fc6887170d2f66e9ceeb31
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri May 11 23:23:39 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 12 00:32:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e5e53e

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

 media-sound/alsamixer-app/alsamixer-app-0.1.ebuild           | 2 +-
 media-sound/bristol/bristol-0.60.11.ebuild                   | 6 +++---
 media-sound/bristol/bristol-0.60.9.ebuild                    | 6 +++---
 media-sound/mup/mup-6.6.ebuild                               | 2 +-
 media-sound/playmidi/playmidi-2.5-r2.ebuild                  | 2 +-
 media-sound/pulseaudio/pulseaudio-11.1.ebuild                | 2 +-
 media-sound/schismtracker/schismtracker-20120105.ebuild      | 6 ++----
 media-sound/synaesthesia/synaesthesia-2.4.ebuild             | 4 ++--
 media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild | 4 ++--
 media-sound/vkeybd/vkeybd-0.1.18d.ebuild                     | 7 ++-----
 10 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
index cb7082f7b1e..47b54c20984 100644
--- a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
+++ b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	media-libs/alsa-lib"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 

diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11.ebuild
index 70e8fdeb0cd..a5df5a18240 100644
--- a/media-sound/bristol/bristol-0.60.11.ebuild
+++ b/media-sound/bristol/bristol-0.60.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,8 +22,8 @@ RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
 	x11-libs/libX11"
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
 

diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild
index 84cc501d036..1b2744c0bfc 100644
--- a/media-sound/bristol/bristol-0.60.9.ebuild
+++ b/media-sound/bristol/bristol-0.60.9.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"
@@ -21,8 +21,8 @@ RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
 	x11-libs/libX11"
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
 

diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
index 19665203aa8..2647e954d2c 100644
--- a/media-sound/mup/mup-6.6.ebuild
+++ b/media-sound/mup/mup-6.6.ebuild
@@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11
 	virtual/jpeg:0
 	media-libs/libpng:0="
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 

diff --git a/media-sound/playmidi/playmidi-2.5-r2.ebuild b/media-sound/playmidi/playmidi-2.5-r2.ebuild
index a0ed1dae451..a1bcd8e8f0c 100644
--- a/media-sound/playmidi/playmidi-2.5-r2.ebuild
+++ b/media-sound/playmidi/playmidi-2.5-r2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libSM
 		x11-libs/libXaw )"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 S="${WORKDIR}/${P/2.5/2.4}"
 

diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
index 718125ed583..05a7ad3d178 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
@@ -90,7 +90,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( >=dev-libs/check-0.9.10 )
 	X? (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
 		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
 	)
 	dev-libs/libatomic_ops

diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
index b64ae46f367..14de37e0dfb 100644
--- a/media-sound/schismtracker/schismtracker-20120105.ebuild
+++ b/media-sound/schismtracker/schismtracker-20120105.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=4
@@ -21,9 +21,7 @@ RDEPEND="media-libs/alsa-lib
 	x11-libs/libXxf86misc"
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	x11-proto/kbproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS="AUTHORS NEWS README TODO"
 

diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
index d5c52c114d1..ade33b06d5b 100644
--- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-2.4.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=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	sdl? ( >=media-libs/libsdl-1.2 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \

diff --git a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
index 8723f7c1e47..4a36941b17d 100644
--- a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
+++ b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.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
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="media-libs/alsa-lib
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	tc-export CXX

diff --git a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
index cdf69d35b90..56fd2ccbeca 100644
--- a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.18d.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,10 +18,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	lash? ( media-sound/lash )
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}