commit: 572d19c1a2aa2f5cf3cb9e4b414407880ea61f3c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:46:58 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:47:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572d19c1
media-libs/oyranos: Fix use of := in ||, #586314
media-libs/oyranos/oyranos-0.9.5-r1.ebuild | 7 ++-----
media-libs/oyranos/oyranos-0.9.5.ebuild | 7 ++-----
media-libs/oyranos/oyranos-9999.ebuild | 5 +----
3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
index 844ed97..78081bb 100644
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,10 +18,7 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
COMMON_DEPEND="
- || (
- =app-admin/elektra-0.7*:0=[${MULTILIB_USEDEP}]
- >=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
- )
+ >=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild
b/media-libs/oyranos/oyranos-0.9.5.ebuild
index 183f150..c1124a7 100644
--- a/media-libs/oyranos/oyranos-0.9.5.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,10 +16,7 @@ SLOT="0"
IUSE="X cairo cups doc exif fltk qt4 raw test"
RDEPEND="
- || (
- =app-admin/elektra-0.7*:0=[${MULTILIB_USEDEP}]
- >=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
- )
+ >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
media-libs/icc-profiles-basiccolor-printing2009
diff --git a/media-libs/oyranos/oyranos-9999.ebuild
b/media-libs/oyranos/oyranos-9999.ebuild
index b5780cf..54c4b49 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -18,10 +18,7 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner
test tiff"
#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
COMMON_DEPEND="
- || (
- =app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
- >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
- )
+ >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
