[gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/

Mon, 30 Apr 2018 09:04:39 -0700 

commit:     264a03233f7f38957a4e8a9988956aa9121f6b81
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 14:29:49 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 15:39:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264a0323

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

 media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild | 12 +++---------
 media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild | 12 +++---------
 media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild | 10 ++--------
 media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild    | 12 +++---------
 media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild    | 10 ++--------
 5 files changed, 13 insertions(+), 43 deletions(-)

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 85833223c06..ed55cfe009e 100644
--- 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 28a0efe5438..5389657ac9c 100644
--- 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 a575c75b6a2..3dd0a0e7a97 100644
--- 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 28a0efe5438..5389657ac9c 100644
--- 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 d7a9bd8fa2e..c6fe98a0977 100644
--- 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}

Reply via email to