*/*: Remove emul-linux-x86-* blockers

Closes: https://github.com/gentoo/gentoo/pull/8073

12 files changed, 10 insertions, 40 deletions

diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index db2ce30179e1..900c6be96bc1 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="app-eselect/eselect-cdparanoia
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND="app-eselect/eselect-cdparanoia"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 897d7f112012..ef87e2afa1a6 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -12,8 +12,6 @@ LICENSE="gsm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
 
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
index 0046819ee8b8..3081514a92e8 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -21,9 +21,7 @@ RDEPEND="
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!media-sound/jack-cvs"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
index aad1c0fff8f3..5a1fa3d1b5ce 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
@@ -22,9 +22,7 @@ RDEPEND="
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!media-sound/jack-cvs"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index ef695a4bf571..6686a549bace 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -22,9 +22,7 @@ RDEPEND="
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!media-sound/jack-cvs"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/media-sound/mpg123/mpg123-1.25.10.ebuild b/media-sound/mpg123/mpg123-1.25.10.ebuild
index 8882ebf1b0d0..9ce3ffc8c792 100644
--- a/media-sound/mpg123/mpg123-1.25.10.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
index 30e10ca885c7..3de21c6e036b 100644
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.6.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/media-sound/mpg123/mpg123-1.25.8.ebuild b/media-sound/mpg123/mpg123-1.25.8.ebuild
index 34770e816b60..5cb30beae9dc 100644
--- a/media-sound/mpg123/mpg123-1.25.8.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.8.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 696f54ef075e..f4f7e4eb5104 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -18,8 +18,6 @@ IUSE=""
 
 RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
 	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r5
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 	!media-libs/libmpcdec
 	!media-libs/libmpcdecsv7"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/twolame/twolame-0.3.13-r1.ebuild b/media-sound/twolame/twolame-0.3.13-r1.ebuild
index 72f6a6d3ffdc..f3080949bd24 100644
--- a/media-sound/twolame/twolame-0.3.13-r1.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r1.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index d2ba75d3fbe3..e9b23313266b 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
index 90e2d630992f..acc5b7de9845 100644
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=virtual/libiconv-0-r1
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )