diff options
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 85833223c065..ed55cfe009ea 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 28a0efe54381..5389657ac9c5 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 a575c75b6a2c..3dd0a0e7a970 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 28a0efe54381..5389657ac9c5 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 d7a9bd8fa2e2..c6fe98a09771 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} |