media-plugins/alsa-plugins: Clean media-libs/speex dependencies.

diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
index 85833223c065ce88e7be145b05b69b6cc45463c9..ed55cfe009ea13bfd946299a0eee9d03d569135a 100644 (file)
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.1-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=6
@@ -23,14 +23,8 @@ RDEPEND="
        libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
        speex? (
-               || (
-                       (
-                               >=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-                               media-libs/speexdsp[${MULTILIB_USEDEP}]
-                       )
-                       <media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-               )
-               media-libs/speex:=[${MULTILIB_USEDEP}]
+               >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+               media-libs/speexdsp[${MULTILIB_USEDEP}]
        )
 "
 DEPEND="${RDEPEND}

diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild
index 28a0efe54381debff62b911d509e90d5636d1047..5389657ac9c5c23cb4c1d26b9dd0d6e082394e07 100644 (file)
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.4-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=6
@@ -23,14 +23,8 @@ RDEPEND="
        libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
        speex? (
-               || (
-                       (
-                               >=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-                               media-libs/speexdsp[${MULTILIB_USEDEP}]
-                       )
-                       <media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-               )
-               media-libs/speex:=[${MULTILIB_USEDEP}]
+               >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+               media-libs/speexdsp[${MULTILIB_USEDEP}]
        )
 "
 DEPEND="${RDEPEND}

diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
index a575c75b6a2c8ac6aae9573750a6d38d252eca59..3dd0a0e7a970395942de890304215303c1a3d84f 100644 (file)
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
@@ -23,14 +23,8 @@ RDEPEND="
        libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
        speex? (
-               || (
-                       (
-                               >=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-                               media-libs/speexdsp[${MULTILIB_USEDEP}]
-                       )
-                       <media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-               )
-               media-libs/speex:=[${MULTILIB_USEDEP}]
+               >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+               media-libs/speexdsp[${MULTILIB_USEDEP}]
        )
 "
 DEPEND="${RDEPEND}

diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
index 28a0efe54381debff62b911d509e90d5636d1047..5389657ac9c5c23cb4c1d26b9dd0d6e082394e07 100644 (file)
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.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
@@ -23,14 +23,8 @@ RDEPEND="
        libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
        speex? (
-               || (
-                       (
-                               >=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-                               media-libs/speexdsp[${MULTILIB_USEDEP}]
-                       )
-                       <media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-               )
-               media-libs/speex:=[${MULTILIB_USEDEP}]
+               >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+               media-libs/speexdsp[${MULTILIB_USEDEP}]
        )
 "
 DEPEND="${RDEPEND}

diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
index d7a9bd8fa2e21fb64763a8657e635c95f19bf2fd..c6fe98a097716c7be2cfcb800e2a3d9513890e8d 100644 (file)
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
@@ -23,14 +23,8 @@ RDEPEND="
        libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
        speex? (
-               || (
-                       (
-                               >=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-                               media-libs/speexdsp[${MULTILIB_USEDEP}]
-                       )
-                       <media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-               )
-               media-libs/speex:=[${MULTILIB_USEDEP}]
+               >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+               media-libs/speexdsp[${MULTILIB_USEDEP}]
        )
 "
 DEPEND="${RDEPEND}