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

diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
index 91b4a855d733041f68e4a33a6367ba2faf5e0db1..c9b66ed53477aeee9ae1ff72f127008410606285 100644 (file)
--- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r6.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
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       X? ( x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"

diff --git a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
index fca6534c9223e471cf8d9c6a163c64cba7ab1ce0..33b7a1fe04321fd0c0c8b1a9e04c4a4d65b2abdc 100644 (file)
--- a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r7.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
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       X? ( x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"

diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
index ed1597ebd57f64ce7ac5d8c4a55db4409f20c1f0..240f763610ca39ecc3e9c71b0a6d3d70d1e6e893 100644 (file)
--- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.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
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       X? ( x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"

diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index 5b8e1b43dc4dfa2fef225bcf6b0b9dce2f501efa..0cb5aac9bf36008292c571017439599cdc53ed4a 100644 (file)
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.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=5
@@ -35,12 +35,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
        )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       X? (
-               x11-proto/xextproto
-               x11-proto/xf86dgaproto
-               x11-proto/xf86vidmodeproto
-               x11-proto/xproto
-       )"
+       X? ( x11-base/xorg-proto )"
 
 PATCHES=(
        "${FILESDIR}"/${P}-shared.patch

diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index 1dd3002441e6fb62f77782033317ea4f9b503aa9..f54c046fec531ffe1859b64ee6efe2fd8622aad1 100644 (file)
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.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
@@ -34,9 +34,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
-       >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+       x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
 

diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
index 147ec0c3800ecd50158372d74a821a7778029877..3c7f941a66322427d670d1ccf1277216d33f6623 100644 (file)
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ b/media-libs/coin/coin-3.1.3-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
@@ -35,7 +35,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xextproto
+       x11-base/xorg-proto
        doc? ( app-doc/doxygen )
 "
 S="${WORKDIR}/${MY_P}"

diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
index da490ba09d2104a01c4a72bcc0d622543a772b3c..815c8aa67e801a79ed4f7104123dafcc9e5819b5 100644 (file)
--- a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
+++ b/media-libs/coin/coin-4.0.0a_pre20180416.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
@@ -33,7 +33,7 @@ RDEPEND="
        simage? ( media-libs/simage )
 "
 DEPEND="${RDEPEND}
-       x11-proto/xextproto
+       x11-base/xorg-proto
        doc? (
                app-doc/doxygen
                qthelp? ( dev-qt/qthelp:5 )

diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 9c833edd6833f19bd85613e0520ad3b32e81c9e9..4d74269bfece6ceaec80f1f8ce21fbd1cdafbfce 100644 (file)
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.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
@@ -36,7 +36,7 @@ RDEPEND="
        xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 PATCHES=(
        "${FILESDIR}/${P}"-CVE-2009-3994.patch

diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
index 5999aa059199facc9a2c030c0b3c8a2c3f72d6a6..e82008028a8d9bf68bc72b7b282b83bcfc06f7ff 100644 (file)
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.8.1-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
@@ -22,8 +22,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
        >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-       >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+       x11-base/xorg-proto"
 
 PATCHES=(
        # Please read the comments in the patch before thinking about dropping it

diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index e1adbfa5560e33917c2cdba3c53ca578f7213050..c3ee6fb9dd2b826389c4a9fe4c16b849a460642b 100644 (file)
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.0.0.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
@@ -24,8 +24,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 # gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-       >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+       x11-base/xorg-proto"
 
 HTML_DOCS=( doc/. )
 

diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index 8c4a9717025f244fc572940c6df336face82a7c8..cc4b3786ef67c65cf0d735abf863528153083a88 100644 (file)
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r100.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,8 +16,8 @@ RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
        !=media-libs/glew-1.10*:0"
 
 DEPEND="${RDEPEND}
-       x11-libs/libX11
-       x11-proto/xproto"
+       x11-base/xorg-proto
+       x11-libs/libX11"
 
 DOCS=""
 

diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild
index 1ce200c72f2e21f896e9908972fd2f1cc6f81fd9..e730aa7757124593ad362cee7b5ef3dc73cfcea0 100644 (file)
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r100.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
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 
 DEPEND="${RDEPEND}
-       x11-libs/libX11
-       x11-proto/xproto"
+       x11-base/xorg-proto
+       x11-libs/libX11"
 
 DOCS=""
 

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
index 16339238ba982d5670fd8ab0b99ed8cda0150a9f..e2424730804f29b14c5cf2093c7043bd6bec4e69 100644 (file)
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.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
@@ -41,10 +41,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        >=dev-util/gtk-doc-am-1.12
-       X? (
-               >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+       X? ( x11-base/xorg-proto )
 "
 
 multilib_src_configure() {

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
index 7d3e5f7618e58fc456f5000f7d8691457fbeb64a..e3e797dd39e4cc5f0ed71474e35ef2fc186e7e73 100644 (file)
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
@@ -41,10 +41,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        >=dev-util/gtk-doc-am-1.12
-       X? (
-               >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+       X? ( x11-base/xorg-proto )
 "
 
 multilib_src_configure() {

diff --git a/media-libs/imlib2/imlib2-1.4.10.ebuild b/media-libs/imlib2/imlib2-1.4.10.ebuild
index 01bf754dc87cf9daa4faab90bc7cda7ff69fa5f3..c6cf6140491ba233e41226be54d3641c4259ed6c 100644 (file)
--- a/media-libs/imlib2/imlib2-1.4.10.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.10.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"
@@ -33,10 +33,7 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
        mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )"
+       X? ( x11-base/xorg-proto )"
 
 multilib_src_configure() {
        # imlib2 has diff configure options for x86/amd64 assembly

diff --git a/media-libs/imlib2/imlib2-1.4.9.ebuild b/media-libs/imlib2/imlib2-1.4.9.ebuild
index 9205b5741a334c1954dcedd32bd922ac0f568b75..5f43a4f2b01d84e3deb82254c83c27427fd84df7 100644 (file)
--- a/media-libs/imlib2/imlib2-1.4.9.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.9.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"
@@ -33,10 +33,7 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
        mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )"
+       X? ( x11-base/xorg-proto )"
 
 multilib_src_configure() {
        # imlib2 has diff configure options for x86/amd64 assembly

diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index b9c2d44d1bce57e328e4f45505f82f2a0084e67f..20c6dc8885390887bf512a674a2b34756c1ace76 100644 (file)
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -32,10 +32,7 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]
-       X? (
-               x11-proto/xextproto[${MULTILIB_USEDEP}]
-               x11-proto/xproto[${MULTILIB_USEDEP}]
-       )
+       X? ( x11-base/xorg-proto )
 "
 
 multilib_src_configure() {

diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index dccea068d84c22aec6af5dc656a14da07f6816b2..d615b8dd8eadf7a2ec6cbbb053f1d97c5d4659b4 100644 (file)
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.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"
@@ -31,10 +31,8 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
        mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )"
+       X? ( x11-base/xorg-proto )
+"
 
 multilib_src_configure() {
        # imlib2 has diff configure options for x86/amd64 assembly

diff --git a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
index e6e47afe01ea2f133caa4701ef127f567ec2e83c..a07d828b9ebc72f1b67eb29c02c3f5314b7b404a 100644 (file)
--- a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
+++ b/media-libs/libXcm/libXcm-0.5.2-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
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X static-libs"
 
-RDEPEND="X? ( >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+RDEPEND="X? (
+               >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
                >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
+               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto"
 
 src_configure() {
        local myeconfargs=(

diff --git a/media-libs/libXcm/libXcm-0.5.4.ebuild b/media-libs/libXcm/libXcm-0.5.4.ebuild
index cd3d3486d62520513c5ff7ff47467a69e745c6d4..9cc1630a341a56ded2b02308676f954c7c73a516 100644 (file)
--- a/media-libs/libXcm/libXcm-0.5.4.ebuild
+++ b/media-libs/libXcm/libXcm-0.5.4.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
@@ -25,10 +25,10 @@ RDEPEND="
                x11-libs/libX11[${MULTILIB_USEDEP}]
                x11-libs/libXfixes[${MULTILIB_USEDEP}]
                x11-libs/libXmu[${MULTILIB_USEDEP}]
-               x11-proto/xproto[${MULTILIB_USEDEP}]
        )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto"
 
 [[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
 

diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild
index 1ffafce9a399864cd3de19f46084b4b6ed93dc39..d39e3f05a318144812e6c8f54b9bcc9989788af9 100644 (file)
--- a/media-libs/libXcm/libXcm-9999.ebuild
+++ b/media-libs/libXcm/libXcm-9999.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
@@ -25,10 +25,10 @@ RDEPEND="
                x11-libs/libX11[${MULTILIB_USEDEP}]
                x11-libs/libXfixes[${MULTILIB_USEDEP}]
                x11-libs/libXmu[${MULTILIB_USEDEP}]
-               x11-proto/xproto[${MULTILIB_USEDEP}]
        )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto"
 
 [[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
 

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index f2ef350c246049d53708fb08b0d0c8f99aac203c..c811abb6f5d7903e76859e733e2b1051b9599fb0 100644 (file)
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-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
@@ -27,7 +27,7 @@ RDEPEND="
        tiff?   ( media-libs/tiff:0 )
        truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
-       X?              ( x11-proto/xextproto )
+       X?              ( x11-base/xorg-proto )
        virtual/pkgconfig
        !!x11-wm/afterstep"
 REQUIRED_USE="

diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild
index 3bf50416b5cffff1e7e3550f3d57b5e511a80553..49ee65b7e717773d5e44d86ca34f95bc2b7ff092 100644 (file)
--- a/media-libs/libggi/libggi-2.2.2.ebuild
+++ b/media-libs/libggi/libggi-2.2.2.ebuild
@@ -20,9 +20,7 @@ RDEPEND=">=media-libs/libgii-1.0.2
        svga? ( >=media-libs/svgalib-1.4.2 )
        aalib? ( >=media-libs/aalib-1.2-r1 )"
 DEPEND="${RDEPEND}
-       X? ( x11-proto/xf86dgaproto
-               x11-proto/xf86vidmodeproto
-               x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 src_compile() {
        local myconf=""

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index 0404b4793fc8dac662e33a46054d1f0576e6d19b..a894b9e8eea887c4e9400b7304f87d25b67d41f3 100644 (file)
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-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
@@ -22,7 +22,7 @@ RDEPEND="sdl? ( media-libs/libsdl )
                x11-libs/libXt
        )"
 DEPEND="${RDEPEND}
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 

diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index f52066263bb01f89c214994a6dafb177eeee4397..ddb69d4245d5a23ec30c9271d2bf7f8e8dd175d3 100644 (file)
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
        sys-devel/gettext
        doc? ( app-doc/doxygen )
-       X? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )"
+       X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="opengl? ( X )"
 

diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index 9adcccf9a4b94b95a4f538d25d0d6269c174c2b0..f5679f595b96a582eeeeb5c7a1f706ab0d7babd8 100644 (file)
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.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
@@ -39,14 +39,8 @@ RDEPEND="
        tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-       nas? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )
+       nas? ( x11-base/xorg-proto )
+       X? ( x11-base/xorg-proto )
        x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
 
 S=${WORKDIR}/SDL-${PV}

diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
index 64d505347c663d2f38e7617e50c714165354988f..e3a0c12691c32eccbb655e337c4fc49f6c209bd4 100644 (file)
--- a/media-libs/libsdl2/libsdl2-2.0.4.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
@@ -57,10 +57,7 @@ RDEPEND="
                xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
        )"
 DEPEND="${RDEPEND}
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )
+       X? ( x11-base/xorg-proto )
        virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}

diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index 8ee6ce877f353b7f8adaddb082fd786af5e035af..dc0b149e259bfc02a9d653f5ed04129e958e5637 100644 (file)
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -55,10 +55,7 @@ RDEPEND="
                xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
        )"
 DEPEND="${RDEPEND}
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )
+       X? ( x11-base/xorg-proto )
        virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index 0690eaf5b39924676e4c376361c12edfb4547402..e94f3842e77ff5ee696b5991dda1ba222951e41e 100644 (file)
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -55,10 +55,7 @@ RDEPEND="
                xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
        )"
 DEPEND="${RDEPEND}
-       X? (
-               >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-               >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-       )
+       X? ( x11-base/xorg-proto )
        virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
index 2b029f159483bcbacc43001185dadeeee2ab58f4..6be02060bb7cfd0d8f9534d3adec3de74f106a50 100644 (file)
--- a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.8.2.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="4"
@@ -43,7 +43,7 @@ RDEPEND=">=net-libs/ortp-0.17[ipv6?]
 DEPEND="${RDEPEND}
        dev-util/intltool
        virtual/pkgconfig
-       x11-proto/videoproto
+       x11-base/xorg-proto
        doc? ( app-doc/doxygen )"
 
 PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )

diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index 59f335c92f5424bb9a5a90ac9bf7b4dc21a59c0d..b86f9ade954750000b34d4e6e4ba1cf77decb023 100644 (file)
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )
        test? ( >=dev-util/cunit-2.1_p2[ncurses] )
        video? ( dev-util/xxdi )
-       X? ( x11-proto/videoproto )
+       X? ( x11-base/xorg-proto )
 "
 PDEPEND="
        amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )

diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index c1821f5ec1b920fb0f4a9373b79380b41e97c6c6..378c8541a7220924c5cc74f036ab676eaa91b092 100644 (file)
--- a/media-libs/mesa/mesa-17.3.9.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -76,7 +76,6 @@ REQUIRED_USE="
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-# keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
        !<x11-base/xorg-server-1.7
@@ -222,15 +221,7 @@ DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
        valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+       x11-base/xorg-proto
        vulkan? (
                $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
        )

diff --git a/media-libs/mesa/mesa-18.0.2.ebuild b/media-libs/mesa/mesa-18.0.2.ebuild
index 6cdc82a5cc3e5d99c85df23bc17871cd934ac4fe..874ec0c25836643256c0c3dfeb94e3d50d294224 100644 (file)
--- a/media-libs/mesa/mesa-18.0.2.ebuild
+++ b/media-libs/mesa/mesa-18.0.2.ebuild
@@ -76,7 +76,6 @@ REQUIRED_USE="
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-# keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
        !<x11-base/xorg-server-1.7
@@ -222,15 +221,7 @@ DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
        valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+       x11-base/xorg-proto
        vulkan? (
                $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
        )

diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild
index 61931b3908bd8498797d12bce178ed6a43188ce1..b32a29ee5f5a0fe640e06adea4e5db66bf1cea89 100644 (file)
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-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
@@ -26,9 +26,9 @@ DEPEND="${RDEPEND}
        app-text/rman
        sys-devel/bison
        sys-devel/flex
+       x11-base/xorg-proto
        x11-misc/gccmakedep
-       x11-misc/imake
-       >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+       x11-misc/imake"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index dd390c7ea5819fa58aa329d2e1a75a8ca0315a68..f1d536a4f7b994f06403882d0282a543b6f62204 100644 (file)
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-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
@@ -26,9 +26,9 @@ DEPEND="${RDEPEND}
        app-text/rman
        sys-devel/bison
        sys-devel/flex
+       x11-base/xorg-proto
        x11-misc/gccmakedep
-       x11-misc/imake
-       >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+       x11-misc/imake"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 

diff --git a/media-libs/nas/nas-1.9.4.ebuild b/media-libs/nas/nas-1.9.4.ebuild
index a25f104c28aaa74b4e992c1bc9f0851d99b9c4f9..b4d725430ae52ea8f96eadd7956f3e893b96ff20 100644 (file)
--- a/media-libs/nas/nas-1.9.4.ebuild
+++ b/media-libs/nas/nas-1.9.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=5
@@ -26,9 +26,9 @@ DEPEND="${RDEPEND}
        app-text/rman
        sys-devel/bison
        sys-devel/flex
+       x11-base/xorg-proto
        x11-misc/gccmakedep
-       x11-misc/imake
-       >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+       x11-misc/imake"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 

diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index d25337bcbd08d9274897e361a3d772a0c7c0107e..710fd2e1797e88258286f217c610842ca551ca53 100644 (file)
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-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"
@@ -19,7 +19,7 @@ RDEPEND="X? ( x11-libs/libXext )
        tiff? ( media-libs/tiff )
        postscript? ( app-text/ghostscript-gpl )"
 DEPEND="${RDEPEND}
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 S=${WORKDIR}
 

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild
index 46fdc6533c607cc5d39e2bd2996db7c65a465033..085547073ef7bf089c35d3faf074e92b2444737c 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.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
@@ -104,13 +104,12 @@ DEPEND="${RDEPEND}
        oss? ( virtual/os-headers )
        v4l? ( virtual/os-headers )
        X? (
+               x11-base/xorg-proto
                x11-libs/libXt
-               x11-proto/xf86vidmodeproto
-               x11-proto/xproto
                )
-       xv? ( x11-proto/videoproto )
-       xvmc? ( x11-proto/videoproto )
-       xinerama? ( x11-proto/xineramaproto )"
+       xv? ( x11-base/xorg-proto )
+       xvmc? ( x11-base/xorg-proto )
+       xinerama? ( x11-base/xorg-proto )"
 REQUIRED_USE="vidix? ( || ( X fbcon ) )
        xv? ( X )
        xinerama? ( X )"

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index b3fd25d6f7a1c13518f64468ebfe1be42fd24dee..8b7764e247104acd3ae37baa1b25e26d3066e20f 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -103,13 +103,12 @@ DEPEND="${RDEPEND}
        oss? ( virtual/os-headers )
        v4l? ( virtual/os-headers )
        X? (
+               x11-base/xorg-proto
                x11-libs/libXt
-               x11-proto/xf86vidmodeproto
-               x11-proto/xproto
                )
-       xv? ( x11-proto/videoproto )
-       xvmc? ( x11-proto/videoproto )
-       xinerama? ( x11-proto/xineramaproto )"
+       xv? ( x11-base/xorg-proto )
+       xvmc? ( x11-base/xorg-proto )
+       xinerama? ( x11-base/xorg-proto )"
 REQUIRED_USE="vidix? ( || ( X fbcon ) )
        xv? ( X )
        xinerama? ( X )"

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 7938ae7f0b18284e6a8338988d4d093b8408fae1..053e16e283831245221f4282cddfad97936b431e 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -103,13 +103,12 @@ DEPEND="${RDEPEND}
        oss? ( virtual/os-headers )
        v4l? ( virtual/os-headers )
        X? (
+               x11-base/xorg-proto
                x11-libs/libXt
-               x11-proto/xf86vidmodeproto
-               x11-proto/xproto
                )
-       xv? ( x11-proto/videoproto )
-       xvmc? ( x11-proto/videoproto )
-       xinerama? ( x11-proto/xineramaproto )"
+       xv? ( x11-base/xorg-proto )
+       xvmc? ( x11-base/xorg-proto )
+       xinerama? ( x11-base/xorg-proto )"
 REQUIRED_USE="vidix? ( || ( X fbcon ) )
        xv? ( X )
        xinerama? ( X )"