From 83f82c477f328cfbd174ce89c535b825ab103b19 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Fri, 20 Apr 2018 10:04:08 +0200 Subject: */*: Remove emul-linux-x86-* blockers Closes: https://github.com/gentoo/gentoo/pull/8073 --- media-libs/a52dec/a52dec-0.7.4-r7.ebuild | 4 +--- media-libs/alsa-lib/alsa-lib-1.1.2.ebuild | 6 +----- media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild | 6 +----- media-libs/alsa-lib/alsa-lib-1.1.5.ebuild | 6 +----- media-libs/alsa-oss/alsa-oss-1.0.28.ebuild | 15 ++++++--------- media-libs/faac/faac-1.28-r4.ebuild | 4 +--- media-libs/faad2/faad2-2.7-r3.ebuild | 3 +-- media-libs/fontconfig/fontconfig-2.12.4.ebuild | 3 +-- media-libs/fontconfig/fontconfig-2.12.6.ebuild | 3 +-- media-libs/freealut/freealut-1.1.0-r3.ebuild | 4 ---- media-libs/freeglut/freeglut-2.8.1-r1.ebuild | 3 +-- media-libs/freeglut/freeglut-3.0.0.ebuild | 3 +-- media-libs/freetype/freetype-2.8.1.ebuild | 6 ++---- media-libs/freetype/freetype-2.8.ebuild | 6 ++---- media-libs/freetype/freetype-2.9.ebuild | 6 ++---- media-libs/freetype/freetype-9999.ebuild | 5 ++--- media-libs/giflib/giflib-4.1.6-r2.ebuild | 3 ++- media-libs/giflib/giflib-4.1.6-r3.ebuild | 6 +----- media-libs/giflib/giflib-5.0.6.ebuild | 7 ------- media-libs/giflib/giflib-5.1.4-r2.ebuild | 8 +------- media-libs/giflib/giflib-5.1.4.ebuild | 8 +------- media-libs/glew/glew-1.10.0-r2.ebuild | 5 ++--- media-libs/glew/glew-1.13.0.ebuild | 4 +--- media-libs/glew/glew-2.0.0.ebuild | 4 +--- media-libs/glu/glu-9.0.0-r1.ebuild | 3 +-- media-libs/glu/glu-9999.ebuild | 3 +-- .../gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild | 8 +------- .../gst-plugins-base/gst-plugins-base-1.12.3.ebuild | 5 +++-- .../gst-plugins-base/gst-plugins-base-1.12.4.ebuild | 5 +++-- media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild | 4 ---- media-libs/jpeg/jpeg-6b-r12.ebuild | 4 +--- media-libs/jpeg/jpeg-8d-r1.ebuild | 4 +--- media-libs/jpeg/jpeg-8d-r2.ebuild | 4 +--- media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild | 5 +---- media-libs/lcms/lcms-2.8-r1.ebuild | 6 +----- media-libs/libao/libao-1.2.0.ebuild | 4 +--- media-libs/libcuefile/libcuefile-477-r1.ebuild | 2 -- media-libs/libdca/libdca-0.0.5-r3.ebuild | 4 +--- media-libs/libdv/libdv-1.0.0-r3.ebuild | 4 +--- media-libs/libdvdnav/libdvdnav-5.0.3.ebuild | 4 +--- media-libs/libdvdread/libdvdread-5.0.3.ebuild | 4 +--- media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild | 4 +--- media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild | 4 +--- media-libs/libmad/libmad-0.15.1b-r8.ebuild | 3 +-- media-libs/libmikmod/libmikmod-3.3.10.ebuild | 4 +--- media-libs/libmikmod/libmikmod-3.3.11.1.ebuild | 4 +--- media-libs/libmikmod/libmikmod-3.3.11.ebuild | 4 +--- media-libs/libmikmod/libmikmod-3.3.8.ebuild | 4 +--- media-libs/libmms/libmms-0.6.4.ebuild | 5 +---- media-libs/libmng/libmng-2.0.2-r1.ebuild | 4 +--- media-libs/libmng/libmng-2.0.3.ebuild | 4 +--- media-libs/libmodplug/libmodplug-0.8.8.5.ebuild | 2 +- media-libs/libmodplug/libmodplug-0.8.9.0.ebuild | 2 +- media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild | 8 ++++---- media-libs/libofa/libofa-0.9.3-r1.ebuild | 3 --- media-libs/libogg/libogg-1.3.2.ebuild | 3 +-- media-libs/libpng/libpng-1.2.57.ebuild | 4 +--- media-libs/libpng/libpng-1.5.28.ebuild | 4 +--- media-libs/libpng/libpng-1.6.29.ebuild | 4 +--- media-libs/libpng/libpng-1.6.34.ebuild | 4 +--- media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild | 5 +---- media-libs/libpostproc/libpostproc-9999.ebuild | 5 +---- media-libs/libreplaygain/libreplaygain-477-r1.ebuild | 2 -- media-libs/libsamplerate/libsamplerate-0.1.9.ebuild | 4 +--- media-libs/libsdl/libsdl-1.2.15-r9.ebuild | 4 ---- media-libs/libshout/libshout-2.3.1-r1.ebuild | 4 +--- media-libs/libshout/libshout-2.4.1.ebuild | 4 +--- media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild | 2 -- media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild | 2 -- media-libs/libtheora/libtheora-1.1.1-r1.ebuild | 4 +--- media-libs/libv4l/libv4l-1.6.2.ebuild | 6 +----- media-libs/libvisual/libvisual-0.4.0-r3.ebuild | 4 +--- media-libs/libvorbis/libvorbis-1.3.5.ebuild | 3 +-- media-libs/libvorbis/libvorbis-1.3.6.ebuild | 3 +-- media-libs/libvpx/libvpx-1.5.0.ebuild | 2 +- media-libs/libvpx/libvpx-1.6.0-r1.ebuild | 2 +- media-libs/libvpx/libvpx-1.6.1.ebuild | 2 +- media-libs/libvpx/libvpx-1.7.0.ebuild | 2 +- media-libs/mesa/mesa-17.1.10.ebuild | 1 - media-libs/mesa/mesa-17.2.8.ebuild | 1 - media-libs/mesa/mesa-17.3.7.ebuild | 1 - media-libs/mesa/mesa-17.3.8.ebuild | 1 - media-libs/mesa/mesa-18.0.0.ebuild | 1 - media-libs/mesa/mesa-9999.ebuild | 1 - media-libs/openal/openal-1.15.1-r2.ebuild | 6 +----- media-libs/portaudio/portaudio-19.06.00.ebuild | 4 +--- media-libs/portaudio/portaudio-19_pre20140130.ebuild | 4 +--- media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild | 4 ---- media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 5 +---- media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild | 4 ---- media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild | 4 ---- media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 4 ---- media-libs/smpeg/smpeg-0.4.4-r10.ebuild | 4 ---- media-libs/speex/speex-1.2_rc1-r2.ebuild | 4 +--- media-libs/tiff/tiff-3.9.7-r1.ebuild | 6 +----- media-libs/tiff/tiff-4.0.8.ebuild | 6 +----- media-libs/tiff/tiff-4.0.9-r1.ebuild | 6 +----- media-libs/tiff/tiff-4.0.9-r2.ebuild | 6 +----- media-libs/tiff/tiff-4.0.9-r3.ebuild | 6 +----- .../webrtc-audio-processing-0.1-r1.ebuild | 3 +-- media-libs/x264/x264-0.0.20160712.ebuild | 4 +--- media-libs/xvid/xvid-1.3.3.ebuild | 2 +- media-libs/xvid/xvid-1.3.4.ebuild | 2 +- media-libs/xvid/xvid-1.3.5.ebuild | 2 +- 104 files changed, 102 insertions(+), 325 deletions(-) (limited to 'media-libs') diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild index 66e18ef381df..121fa7a0e6ce 100644 --- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild +++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild @@ -14,9 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="djbfft oss static-libs" -RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt ) diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild index 31132aaef773..abe8e719be71 100644 --- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild @@ -17,11 +17,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="alisp debug doc elibc_uclibc python" -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - )" +RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} doc? ( >=app-doc/doxygen-1.2.6 )" diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild index 7116e25d8966..3cfe8ecf8ff9 100644 --- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild @@ -17,11 +17,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="alisp debug doc elibc_uclibc python" -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - )" +RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} doc? ( >=app-doc/doxygen-1.2.6 )" diff --git a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild index 7116e25d8966..3cfe8ecf8ff9 100644 --- a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild @@ -17,11 +17,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="alisp debug doc elibc_uclibc python" -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - )" +RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} doc? ( >=app-doc/doxygen-1.2.6 )" diff --git a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild index 49417959c206..17d4aa3aa1aa 100644 --- a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild +++ b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild @@ -17,23 +17,20 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86" IUSE="static-libs" -RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}] - abi_x86_32? ( - !=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild index 2ead8d98ff7b..f912eab68233 100644 --- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild +++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild @@ -17,8 +17,7 @@ IUSE="doc static-libs" # Purposefully dropped the xml USE flag and libxml2 support. Expat is the # default and used by every distro. See bug #283191. RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}] - abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" + >=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* diff --git a/media-libs/freealut/freealut-1.1.0-r3.ebuild b/media-libs/freealut/freealut-1.1.0-r3.ebuild index dd3f5d75d8e2..87113136ec0c 100644 --- a/media-libs/freealut/freealut-1.1.0-r3.ebuild +++ b/media-libs/freealut/freealut-1.1.0-r3.ebuild @@ -14,10 +14,6 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux IUSE="static-libs" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild index be1c13cc8e30..5999aa059199 100644 --- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild +++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild @@ -19,8 +19,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild index bec2908b1a83..e1adbfa5560e 100644 --- a/media-libs/freeglut/freeglut-3.0.0.ebuild +++ b/media-libs/freeglut/freeglut-3.0.0.ebuild @@ -20,8 +20,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]" # gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild index baa5cd66018c..03294bc1c4ef 100644 --- a/media-libs/freetype/freetype-2.8.1.ebuild +++ b/media-libs/freetype/freetype-2.8.1.ebuild @@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils" RESTRICT="!bindist? ( bindist )" # bug 541408 -CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) @@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" -RDEPEND="${CDEPEND} - abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild index 20b26eccba27..4dfd2a7b4962 100644 --- a/media-libs/freetype/freetype-2.8.ebuild +++ b/media-libs/freetype/freetype-2.8.ebuild @@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils" RESTRICT="!bindist? ( bindist )" # bug 541408 -CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) @@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" -RDEPEND="${CDEPEND} - abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild index cd02458948fa..4d9867d2f4f4 100644 --- a/media-libs/freetype/freetype-2.9.ebuild +++ b/media-libs/freetype/freetype-2.9.ebuild @@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils" RESTRICT="!bindist? ( bindist )" # bug 541408 -CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) @@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" -RDEPEND="${CDEPEND} - abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 4288d7cd6397..4fa091f67693 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -30,7 +30,7 @@ LICENSE="|| ( FTL GPL-2+ )" SLOT="2" RESTRICT="!bindist? ( bindist )" # bug 541408 -CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) @@ -41,9 +41,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" -RDEPEND="${CDEPEND}" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( diff --git a/media-libs/giflib/giflib-4.1.6-r2.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild index 5886c855d548..e6dd91121a28 100644 --- a/media-libs/giflib/giflib-4.1.6-r2.ebuild +++ b/media-libs/giflib/giflib-4.1.6-r2.ebuild @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="rle static-libs X" -DEPEND="X? ( +DEPEND=" + X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libICE diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild index 4376d54abfba..0d7822692362 100644 --- a/media-libs/giflib/giflib-4.1.6-r3.ebuild +++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild @@ -16,11 +16,7 @@ IUSE="rle static-libs X" RDEPEND=" rle? ( media-libs/urt ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" + X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild index e666ee52225b..604b886a47a4 100644 --- a/media-libs/giflib/giflib-5.0.6.ebuild +++ b/media-libs/giflib/giflib-5.0.6.ebuild @@ -15,13 +15,6 @@ SLOT="0/6" #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND}" - src_prepare() { elibtoolize } diff --git a/media-libs/giflib/giflib-5.1.4-r2.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild index a5fce8fa5fee..d18bb1590833 100644 --- a/media-libs/giflib/giflib-5.1.4-r2.ebuild +++ b/media-libs/giflib/giflib-5.1.4-r2.ebuild @@ -14,13 +14,7 @@ SLOT="0/7" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs" -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto )" +DEPEND="doc? ( app-text/xmlto )" PATCHES=( "${FILESDIR}"/${P}-reallocarray-export.patch diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild index e19d5ef53089..b92da179a4f9 100644 --- a/media-libs/giflib/giflib-5.1.4.ebuild +++ b/media-libs/giflib/giflib-5.1.4.ebuild @@ -14,13 +14,7 @@ SLOT="0/7" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs" -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto )" +DEPEND="doc? ( app-text/xmlto )" src_prepare() { default diff --git a/media-libs/glew/glew-1.10.0-r2.ebuild b/media-libs/glew/glew-1.10.0-r2.ebuild index 65172a985830..187ff99392be 100644 --- a/media-libs/glew/glew-1.10.0-r2.ebuild +++ b/media-libs/glew/glew-1.10.0-r2.ebuild @@ -18,9 +18,8 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" -DEPEND=${RDEPEND} + >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" src_prepare() { sed -i \ diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild index 4725492f80f2..ef65901cb773 100644 --- a/media-libs/glew/glew-1.13.0.ebuild +++ b/media-libs/glew/glew-1.13.0.ebuild @@ -22,9 +22,7 @@ DEPEND=" >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] " -RDEPEND="${DEPEND} - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) -" +RDEPEND="${DEPEND}" src_prepare() { sed -i \ diff --git a/media-libs/glew/glew-2.0.0.ebuild b/media-libs/glew/glew-2.0.0.ebuild index 173817c6fa2c..cff2091e2d37 100644 --- a/media-libs/glew/glew-2.0.0.ebuild +++ b/media-libs/glew/glew-2.0.0.ebuild @@ -22,9 +22,7 @@ DEPEND=" >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] " -RDEPEND="${DEPEND} - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) -" +RDEPEND="${DEPEND}" src_prepare() { local PATCHES=( "${FILESDIR}"/${P}-install-headers.patch ) diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild index 9069395176c6..3f4f63eaf043 100644 --- a/media-libs/glu/glu-9.0.0-r1.ebuild +++ b/media-libs/glu/glu-9.0.0-r1.ebuild @@ -29,8 +29,7 @@ IUSE="static-libs" DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND} - !=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) " -RDEPEND+="!=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) " -RDEPEND+="! "${ED}/etc/env.d/60ladspa" } diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild index 02f88a95ee16..2e1fd225c4e1 100644 --- a/media-libs/lcms/lcms-2.8-r1.ebuild +++ b/media-libs/lcms/lcms-2.8-r1.ebuild @@ -16,11 +16,7 @@ IUSE="doc jpeg static-libs +threads test tiff zlib" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" S=${WORKDIR}/lcms2-${PV} diff --git a/media-libs/libao/libao-1.2.0.ebuild b/media-libs/libao/libao-1.2.0.ebuild index 9895efed9faa..8997776bba3e 100644 --- a/media-libs/libao/libao-1.2.0.ebuild +++ b/media-libs/libao/libao-1.2.0.ebuild @@ -16,9 +16,7 @@ IUSE="alsa nas mmap pulseaudio static-libs" RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild index 645c6d45c62c..a9a885574d6c 100644 --- a/media-libs/libcuefile/libcuefile-477-r1.ebuild +++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild @@ -15,8 +15,6 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" src_install() { cmake-multilib_src_install diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild index 6b2282f8e196..6b12d373c533 100644 --- a/media-libs/libdca/libdca-0.0.5-r3.ebuild +++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild @@ -14,9 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="debug oss static-libs" -RDEPEND="!media-libs/libdts - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="!media-libs/libdts" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt ) diff --git a/media-libs/libdv/libdv-1.0.0-r3.ebuild b/media-libs/libdv/libdv-1.0.0-r3.ebuild index 719e93034b4a..4aaa15a9ac6c 100644 --- a/media-libs/libdv/libdv-1.0.0-r3.ebuild +++ b/media-libs/libdv/libdv-1.0.0-r3.ebuild @@ -15,9 +15,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="static-libs" -RDEPEND="dev-libs/popt - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r12 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="dev-libs/popt" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild index 6a62a003f8f4..b4625bee7aba 100644 --- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild +++ b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild @@ -20,9 +20,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="static-libs" -RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391 diff --git a/media-libs/libdvdread/libdvdread-5.0.3.ebuild b/media-libs/libdvdread/libdvdread-5.0.3.ebuild index 5eb402370ab0..6834364ffda4 100644 --- a/media-libs/libdvdread/libdvdread-5.0.3.ebuild +++ b/media-libs/libdvdread/libdvdread-5.0.3.ebuild @@ -20,9 +20,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+css static-libs" -RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog NEWS TODO README ) diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild index f5b1ca4ed578..bd9dcaea9e31 100644 --- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild +++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild @@ -14,9 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="debug static-libs" -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} dev-util/gperf" diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild index b1e22f1ee61a..7fd3cfc32eef 100644 --- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild +++ b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild @@ -14,9 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86" IUSE="examples static-libs" -RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libmad/libmad-0.15.1b-r8.ebuild b/media-libs/libmad/libmad-0.15.1b-r8.ebuild index 50520a655d24..910beb3d63cd 100644 --- a/media-libs/libmad/libmad-0.15.1b-r8.ebuild +++ b/media-libs/libmad/libmad-0.15.1b-r8.ebuild @@ -15,8 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-ai IUSE="debug static-libs" DEPEND="" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="" DOCS=( CHANGES CREDITS README TODO VERSION ) diff --git a/media-libs/libmikmod/libmikmod-3.3.10.ebuild b/media-libs/libmikmod/libmikmod-3.3.10.ebuild index 2d3cc0eb8d64..232cef07afbb 100644 --- a/media-libs/libmikmod/libmikmod-3.3.10.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.10.ebuild @@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] ) - !${CATEGORY}/${PN}:2 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + !${CATEGORY}/${PN}:2" DEPEND="${RDEPEND} sys-apps/texinfo oss? ( virtual/os-headers )" diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild index 51da30fe747a..930d2f289601 100644 --- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild @@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] ) - !${CATEGORY}/${PN}:2 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + !${CATEGORY}/${PN}:2" DEPEND="${RDEPEND} sys-apps/texinfo oss? ( virtual/os-headers )" diff --git a/media-libs/libmikmod/libmikmod-3.3.11.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.ebuild index 7ab9e60a597e..1e5e9284220d 100644 --- a/media-libs/libmikmod/libmikmod-3.3.11.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.11.ebuild @@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] ) - !${CATEGORY}/${PN}:2 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + !${CATEGORY}/${PN}:2" DEPEND="${RDEPEND} sys-apps/texinfo oss? ( virtual/os-headers )" diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild index 8311552d4fda..59cf8cf14b14 100644 --- a/media-libs/libmikmod/libmikmod-3.3.8.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.8.ebuild @@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] ) - !${CATEGORY}/${PN}:2 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + !${CATEGORY}/${PN}:2" DEPEND="${RDEPEND} sys-apps/texinfo oss? ( virtual/os-headers )" diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild index ee64dd118cea..b06b1fc08425 100644 --- a/media-libs/libmms/libmms-0.6.4.ebuild +++ b/media-libs/libmms/libmms-0.6.4.ebuild @@ -16,10 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="static-libs" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-medialibs-20130224-r8 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - )" +RDEPEND="" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild index 424dfc5b6140..d387f4f4e7e1 100644 --- a/media-libs/libmng/libmng-2.0.2-r1.ebuild +++ b/media-libs/libmng/libmng-2.0.2-r1.ebuild @@ -15,9 +15,7 @@ IUSE="lcms static-libs" RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild index 10b866b04fb7..5f34855de15d 100644 --- a/media-libs/libmng/libmng-2.0.3.ebuild +++ b/media-libs/libmng/libmng-2.0.3.ebuild @@ -15,9 +15,7 @@ IUSE="lcms static-libs" RDEPEND=">=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild index 99f6dc5b198e..b1f05b8655d3 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild +++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="static-libs" -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +RDEPEND="" DEPEND="virtual/pkgconfig" DOCS=( AUTHORS ChangeLog NEWS README TODO ) diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild index bd1229984a9b..b372dbc205b2 100644 --- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild +++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="static-libs" -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +RDEPEND="" DEPEND="virtual/pkgconfig" DOCS=( AUTHORS ChangeLog NEWS README TODO ) diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild index b38864838feb..0404b4793fc8 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild +++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild @@ -15,12 +15,12 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64- IUSE="sdl static-libs X" RDEPEND="sdl? ( media-libs/libsdl ) - X? ( x11-libs/libXv + X? ( + x11-libs/libXv x11-libs/libICE x11-libs/libSM - x11-libs/libXt ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + x11-libs/libXt + )" DEPEND="${RDEPEND} X? ( x11-proto/xextproto )" diff --git a/media-libs/libofa/libofa-0.9.3-r1.ebuild b/media-libs/libofa/libofa-0.9.3-r1.ebuild index c02fa8c43d00..e85125f172c6 100644 --- a/media-libs/libofa/libofa-0.9.3-r1.ebuild +++ b/media-libs/libofa/libofa-0.9.3-r1.ebuild @@ -19,9 +19,6 @@ RDEPEND="dev-libs/expat >=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" -RDEPEND="${RDEPEND} - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" PATCHES=( "${FILESDIR}"/${P}-gcc-4.patch diff --git a/media-libs/libogg/libogg-1.3.2.ebuild b/media-libs/libogg/libogg-1.3.2.ebuild index 354f18f65a75..90ded904e115 100644 --- a/media-libs/libogg/libogg-1.3.2.ebuild +++ b/media-libs/libogg/libogg-1.3.2.ebuild @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" -RDEPEND=" - abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +RDEPEND="" AUTOTOOLS_PRUNE_LIBTOOL_FILES=all DOCS=( AUTHORS CHANGES ) diff --git a/media-libs/libpng/libpng-1.2.57.ebuild b/media-libs/libpng/libpng-1.2.57.ebuild index e94ff6442c3e..e14eecd581db 100644 --- a/media-libs/libpng/libpng-1.2.57.ebuild +++ b/media-libs/libpng/libpng-1.2.57.ebuild @@ -17,9 +17,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~spa IUSE="" RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - !=media-libs/libpng-1.2*:0 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + !=media-libs/libpng-1.2*:0" DEPEND="${RDEPEND} app-arch/xz-utils" diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild index 4845cc7dca5f..3253bd3c65b5 100644 --- a/media-libs/libpng/libpng-1.5.28.ebuild +++ b/media-libs/libpng/libpng-1.5.28.ebuild @@ -18,9 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh IUSE="apng neon" RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] - !=media-libs/libpng-1.5*:0 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + !=media-libs/libpng-1.5*:0" DEPEND="${RDEPEND} app-arch/xz-utils" diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.29.ebuild index 1f2f0316889c..af03888d719f 100644 --- a/media-libs/libpng/libpng-1.6.29.ebuild +++ b/media-libs/libpng/libpng-1.6.29.ebuild @@ -15,9 +15,7 @@ SLOT="0/16" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng cpu_flags_x86_sse neon static-libs" -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} app-arch/xz-utils" diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild index a4923665e4ad..75f93df96b81 100644 --- a/media-libs/libpng/libpng-1.6.34.ebuild +++ b/media-libs/libpng/libpng-1.6.34.ebuild @@ -15,9 +15,7 @@ SLOT="0/16" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng cpu_flags_x86_sse neon static-libs" -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} app-arch/xz-utils" diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild index 41dbc9c99acc..2327601f0746 100644 --- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild +++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild @@ -37,10 +37,7 @@ done RDEPEND=" >=media-video/libav-0.8.2-r2:0= - !media-video/ffmpeg:0 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) -" + !media-video/ffmpeg:0" DEPEND="${RDEPEND}" src_prepare() { diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild index 92c4722f80b5..23a7caeab9fb 100644 --- a/media-libs/libpostproc/libpostproc-9999.ebuild +++ b/media-libs/libpostproc/libpostproc-9999.ebuild @@ -37,10 +37,7 @@ done RDEPEND=" >=media-video/libav-0.8.2-r2:0= - !media-video/ffmpeg:0 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) -" + !media-video/ffmpeg:0" DEPEND="${RDEPEND}" multilib_src_configure() { diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild index 1eb6a7b305a1..800279b7b37b 100644 --- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild +++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild @@ -15,8 +15,6 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" src_prepare() { cmake-utils_src_prepare diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild index b69d708bec88..ec95a697c759 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild +++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild @@ -16,9 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="sndfile static-libs" -RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild index a387ccac9f87..9adcccf9a4b9 100644 --- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild +++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild @@ -17,10 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64- IUSE="oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) nas? ( diff --git a/media-libs/libshout/libshout-2.3.1-r1.ebuild b/media-libs/libshout/libshout-2.3.1-r1.ebuild index 0e79e4b9732a..0824142aa4a8 100644 --- a/media-libs/libshout/libshout-2.3.1-r1.ebuild +++ b/media-libs/libshout/libshout-2.3.1-r1.ebuild @@ -16,9 +16,7 @@ IUSE="speex static-libs theora" RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libshout/libshout-2.4.1.ebuild b/media-libs/libshout/libshout-2.4.1.ebuild index d91491a7d46f..05d218d13638 100644 --- a/media-libs/libshout/libshout-2.4.1.ebuild +++ b/media-libs/libshout/libshout-2.4.1.ebuild @@ -18,9 +18,7 @@ RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild index ed384559ae11..0ef1eeaf0373 100644 --- a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild +++ b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild @@ -12,8 +12,6 @@ LICENSE="GPL-2" SLOT="1" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="static-libs" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" DOCS=( AUTHORS DEVELOPER ) diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild index 202222f47504..2bb0d5a474fd 100644 --- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild +++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild @@ -14,8 +14,6 @@ LICENSE="GPL-2" SLOT="2" KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="static-libs" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" S=${WORKDIR}/${MY_P} diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild index 5a1eaab83065..431bf0cc0545 100644 --- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild +++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild @@ -19,9 +19,7 @@ RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}] media-libs/libpng:0= >=media-libs/libsdl-0.11.0 media-libs/libvorbis:= - ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) virtual/pkgconfig" diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild index c58d02811537..0b1dc2d6f1bc 100644 --- a/media-libs/libv4l/libv4l-1.6.2.ebuild +++ b/media-libs/libv4l/libv4l-1.6.2.ebuild @@ -18,11 +18,7 @@ IUSE="jpeg" # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg. RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) !media-tv/v4l2-ctl - !=x11-libs/libdrm-2.4.77" RDEPEND=" !=app-eselect/eselect-opengl-1.3.0 diff --git a/media-libs/mesa/mesa-17.2.8.ebuild b/media-libs/mesa/mesa-17.2.8.ebuild index 448fc06f3f8f..b009828a1ad2 100644 --- a/media-libs/mesa/mesa-17.2.8.ebuild +++ b/media-libs/mesa/mesa-17.2.8.ebuild @@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82" RDEPEND=" !=app-eselect/eselect-opengl-1.3.0 diff --git a/media-libs/mesa/mesa-17.3.7.ebuild b/media-libs/mesa/mesa-17.3.7.ebuild index 71590c387fcc..f35082d0d6bf 100644 --- a/media-libs/mesa/mesa-17.3.7.ebuild +++ b/media-libs/mesa/mesa-17.3.7.ebuild @@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89" RDEPEND=" !=app-eselect/eselect-opengl-1.3.0 diff --git a/media-libs/mesa/mesa-17.3.8.ebuild b/media-libs/mesa/mesa-17.3.8.ebuild index 242caedf58d2..6b9e44398fcf 100644 --- a/media-libs/mesa/mesa-17.3.8.ebuild +++ b/media-libs/mesa/mesa-17.3.8.ebuild @@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89" RDEPEND=" !=app-eselect/eselect-opengl-1.3.0 diff --git a/media-libs/mesa/mesa-18.0.0.ebuild b/media-libs/mesa/mesa-18.0.0.ebuild index 4fb4344b03a6..6cdc82a5cc3e 100644 --- a/media-libs/mesa/mesa-18.0.0.ebuild +++ b/media-libs/mesa/mesa-18.0.0.ebuild @@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89" RDEPEND=" !=app-eselect/eselect-opengl-1.3.0 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 8c2973875bbf..161933dd9309 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" RDEPEND=" !=app-eselect/eselect-opengl-1.3.0 diff --git a/media-libs/openal/openal-1.15.1-r2.ebuild b/media-libs/openal/openal-1.15.1-r2.ebuild index 8a13e6ee93a7..62795074b203 100644 --- a/media-libs/openal/openal-1.15.1-r2.ebuild +++ b/media-libs/openal/openal-1.15.1-r2.ebuild @@ -17,11 +17,7 @@ IUSE="alsa coreaudio debug neon oss portaudio pulseaudio cpu_flags_x86_sse" RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} oss? ( virtual/os-headers )" diff --git a/media-libs/portaudio/portaudio-19.06.00.ebuild b/media-libs/portaudio/portaudio-19.06.00.ebuild index 816e5e2e390a..7030a2c59e2c 100644 --- a/media-libs/portaudio/portaudio-19.06.00.ebuild +++ b/media-libs/portaudio/portaudio-19.06.00.ebuild @@ -15,9 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8 IUSE="alsa +cxx debug jack oss static-libs" RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + jack? ( virtual/jack[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/portaudio/portaudio-19_pre20140130.ebuild b/media-libs/portaudio/portaudio-19_pre20140130.ebuild index ee2c287d9dbb..15fe80c459f2 100644 --- a/media-libs/portaudio/portaudio-19_pre20140130.ebuild +++ b/media-libs/portaudio/portaudio-19_pre20140130.ebuild @@ -17,9 +17,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~a IUSE="alsa +cxx debug jack oss static-libs" RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" + jack? ( virtual/jack[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild index fac4a3ed7d38..540b0e286e8a 100644 --- a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild +++ b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild @@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd IUSE="gif jpeg png static-libs tiff webp" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] ) diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild index b92e2977d366..722f378c122a 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild @@ -41,10 +41,7 @@ RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-sdl-20140406-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )" DEPEND=${RDEPEND} diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild index e921907da071..126aa18d9a2a 100644 --- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild +++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild @@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ IUSE="static-libs" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild index a4f350cfee9a..ac7df0c6202b 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild +++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild @@ -15,10 +15,6 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos" IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] ) mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] ) diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild index 6099641223d3..2f74af334950 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild @@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ IUSE="static-libs X" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]" diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild index 3a969315b252..b564a43ad5f9 100644 --- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild +++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild @@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbs IUSE="X debug cpu_flags_x86_mmx opengl static-libs" RDEPEND=" - abi_x86_32? ( - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-sdl-20140406 - ) >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] opengl? ( >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] diff --git a/media-libs/speex/speex-1.2_rc1-r2.ebuild b/media-libs/speex/speex-1.2_rc1-r2.ebuild index b142744da55e..17a135656516 100644 --- a/media-libs/speex/speex-1.2_rc1-r2.ebuild +++ b/media-libs/speex/speex-1.2_rc1-r2.ebuild @@ -15,9 +15,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="ogg cpu_flags_x86_sse static-libs" -RDEPEND="ogg? ( media-libs/libogg:= ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="ogg? ( media-libs/libogg:= )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild index a691fbf8fd05..467c3bb64906 100644 --- a/media-libs/tiff/tiff-3.9.7-r1.ebuild +++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild @@ -20,11 +20,7 @@ RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) jbig? ( >=media-libs/jbigkit-2.1[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) !media-libs/tiff-compat - !=media-libs/tiff-3*:0 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + !=media-libs/tiff-3*:0" DEPEND="${RDEPEND}" src_prepare() { diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild index f184c546851f..23aa7a1c6be3 100644 --- a/media-libs/tiff/tiff-4.0.8.ebuild +++ b/media-libs/tiff/tiff-4.0.8.ebuild @@ -17,11 +17,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" REQUIRED_USE="test? ( jpeg )" #483132 diff --git a/media-libs/tiff/tiff-4.0.9-r1.ebuild b/media-libs/tiff/tiff-4.0.9-r1.ebuild index fbb216176cdd..72494681d30c 100644 --- a/media-libs/tiff/tiff-4.0.9-r1.ebuild +++ b/media-libs/tiff/tiff-4.0.9-r1.ebuild @@ -17,11 +17,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" REQUIRED_USE="test? ( jpeg )" #483132 diff --git a/media-libs/tiff/tiff-4.0.9-r2.ebuild b/media-libs/tiff/tiff-4.0.9-r2.ebuild index 26a1889a21c7..3bd50a67341e 100644 --- a/media-libs/tiff/tiff-4.0.9-r2.ebuild +++ b/media-libs/tiff/tiff-4.0.9-r2.ebuild @@ -18,11 +18,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" REQUIRED_USE="test? ( jpeg )" #483132 diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild index 8d7408182415..a3fc4bf56e68 100644 --- a/media-libs/tiff/tiff-4.0.9-r3.ebuild +++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild @@ -18,11 +18,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" REQUIRED_USE="test? ( jpeg )" #483132 diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild index 669b496ef207..1a98e36cfd54 100644 --- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild +++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild @@ -15,7 +15,6 @@ SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux" IUSE="static-libs" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +RDEPEND="" DOCS=( AUTHORS NEWS README ) diff --git a/media-libs/x264/x264-0.0.20160712.ebuild b/media-libs/x264/x264-0.0.20160712.ebuild index 853a84945eb7..f8d0fea657fc 100644 --- a/media-libs/x264/x264-0.0.20160712.ebuild +++ b/media-libs/x264/x264-0.0.20160712.ebuild @@ -28,9 +28,7 @@ ASM_DEP=">=dev-lang/yasm-1.2.0" DEPEND="abi_x86_32? ( ${ASM_DEP} ) abi_x86_64? ( ${ASM_DEP} ) opencl? ( dev-lang/perl )" -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" DOCS="AUTHORS doc/*.txt" diff --git a/media-libs/xvid/xvid-1.3.3.ebuild b/media-libs/xvid/xvid-1.3.3.ebuild index 9b80581a9ffa..c042d207346f 100644 --- a/media-libs/xvid/xvid-1.3.3.ebuild +++ b/media-libs/xvid/xvid-1.3.3.ebuild @@ -26,7 +26,7 @@ DEPEND="sys-apps/grep x86-fbsd? ( ${NASM} ) x86-macos? ( ${NASM} ) x64-macos? ( ${NASM} )" -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="" S=${WORKDIR}/${MY_PN}/build/generic diff --git a/media-libs/xvid/xvid-1.3.4.ebuild b/media-libs/xvid/xvid-1.3.4.ebuild index 8271e8428309..2611b93fb187 100644 --- a/media-libs/xvid/xvid-1.3.4.ebuild +++ b/media-libs/xvid/xvid-1.3.4.ebuild @@ -26,7 +26,7 @@ DEPEND="sys-apps/grep x86-fbsd? ( ${NASM} ) x86-macos? ( ${NASM} ) x64-macos? ( ${NASM} )" -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="" S=${WORKDIR}/${MY_PN}/build/generic diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild index f0ddb60833ec..e3d48368da4a 100644 --- a/media-libs/xvid/xvid-1.3.5.ebuild +++ b/media-libs/xvid/xvid-1.3.5.ebuild @@ -26,7 +26,7 @@ DEPEND="sys-apps/grep x86-fbsd? ( ${NASM} ) x86-macos? ( ${NASM} ) x64-macos? ( ${NASM} )" -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="" S="${WORKDIR}/${MY_PN}/build/generic" -- cgit v1.2.3-65-gdbad