From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 21 Jun 2016 19:46:58 +0000 (+0200)
Subject: media-libs/oyranos: Fix use of := in ||, #586314
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=572d19c1a2aa2f5cf3cb9e4b414407880ea61f3c;p=gentoo.git

media-libs/oyranos: Fix use of := in ||, #586314
---

diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
index 844ed97b5bc9..78081bb62d2b 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 183f150f970d..c1124a7de034 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 b5780cfd4fd6..54c4b495b78c 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}]