[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/, dev-qt/qtmultimedia/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/, dev-qt/qtmultimedia/

[Matt Turner]

commit:     8cb3aa13ac7ac5657ab80e8bfef7fed5048df57f
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 26 19:34:51 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 01:04:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb3aa13

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

 dev-qt/qtgui/qtgui-4.8.7.ebuild                      | 9 ++-------
 dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild        | 4 ++--
 dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild     | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild        | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild        | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index cb2eede7312..8a347270222 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.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
@@ -53,12 +53,7 @@ RDEPEND="
 	!<dev-qt/qthelp-4.8.5:4
 "
 DEPEND="${RDEPEND}
-	!aqua? (
-		>=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
-		xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )
-	)
+	!aqua? ( x11-base/xorg-proto )
 "
 PDEPEND="
 	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
index 598421b6701..04cc34da1d1 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	gstreamer? ( x11-proto/videoproto )
+	gstreamer? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
index 255a5e8a152..5c2c8c28042 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.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
@@ -35,7 +35,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	gstreamer? ( x11-proto/videoproto )
+	gstreamer? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
index b026b99070d..07c0609fcc7 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	gstreamer? ( x11-proto/videoproto )
+	gstreamer? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
index a3c48dc046a..ccc57e3e45a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	gstreamer? ( x11-proto/videoproto )
+	gstreamer? ( x11-base/xorg-proto )
 "
 
 src_prepare() {

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild
index 598421b6701..04cc34da1d1 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	gstreamer? ( x11-proto/videoproto )
+	gstreamer? ( x11-base/xorg-proto )
 "
 
 src_prepare() {