diff options
40 files changed, 90 insertions, 153 deletions
diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild index 91b4a855d733..c9b66ed53477 100644 --- 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 fca6534c9223..33b7a1fe0432 100644 --- 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 ed1597ebd57f..240f763610ca 100644 --- 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 5b8e1b43dc4d..0cb5aac9bf36 100644 --- 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 1dd3002441e6..f54c046fec53 100644 --- 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 147ec0c3800e..3c7f941a6632 100644 --- 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 da490ba09d21..815c8aa67e80 100644 --- 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 9c833edd6833..4d74269bfece 100644 --- 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 5999aa059199..e82008028a8d 100644 --- 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 e1adbfa5560e..c3ee6fb9dd2b 100644 --- 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 8c4a9717025f..cc4b3786ef67 100644 --- 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 1ce200c72f2e..e730aa775712 100644 --- 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 16339238ba98..e2424730804f 100644 --- 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 7d3e5f7618e5..e3e797dd39e4 100644 --- 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 01bf754dc87c..c6cf6140491b 100644 --- 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 9205b5741a33..5f43a4f2b01d 100644 --- 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 b9c2d44d1bce..20c6dc888539 100644 --- 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 dccea068d84c..d615b8dd8ead 100644 --- 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 e6e47afe01ea..a07d828b9ebc 100644 --- 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 cd3d3486d625..9cc1630a341a 100644 --- 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 1ffafce9a399..d39e3f05a318 100644 --- 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 f2ef350c2460..c811abb6f5d7 100644 --- 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 3bf50416b5cf..49ee65b7e717 100644 --- 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 0404b4793fc8..a894b9e8eea8 100644 --- 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 f52066263bb0..ddb69d4245d5 100644 --- 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 9adcccf9a4b9..f5679f595b96 100644 --- 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 64d505347c66..e3a0c12691c3 100644 --- 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 8ee6ce877f35..dc0b149e259b 100644 --- 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 0690eaf5b399..e94f3842e77f 100644 --- 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 2b029f159483..6be02060bb7c 100644 --- 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 59f335c92f54..b86f9ade9547 100644 --- 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 c1821f5ec1b9..378c8541a722 100644 --- 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 6cdc82a5cc3e..874ec0c25836 100644 --- 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 61931b3908bd..b32a29ee5f5a 100644 --- 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 dd390c7ea581..f1d536a4f7b9 100644 --- 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 a25f104c28aa..b4d725430ae5 100644 --- 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 d25337bcbd08..710fd2e1797e 100644 --- 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 46fdc6533c60..085547073ef7 100644 --- 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 b3fd25d6f7a1..8b7764e24710 100644 --- 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 7938ae7f0b18..053e16e28383 100644 --- 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 )" |