From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B93991382AC for ; Tue, 21 Jun 2016 19:47:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40D6FE08D3; Tue, 21 Jun 2016 19:47:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5C2AE08D3 for ; Tue, 21 Jun 2016 19:47:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7E2833E5E4 for ; Tue, 21 Jun 2016 19:47:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BD68208E for ; Tue, 21 Jun 2016 19:47:56 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1466538473.572d19c1a2aa2f5cf3cb9e4b414407880ea61f3c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/oyranos/oyranos-0.9.5-r1.ebuild media-libs/oyranos/oyranos-0.9.5.ebuild media-libs/oyranos/oyranos-9999.ebuild X-VCS-Directories: media-libs/oyranos/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 572d19c1a2aa2f5cf3cb9e4b414407880ea61f3c X-VCS-Branch: master Date: Tue, 21 Jun 2016 19:47:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 80e9b95b-ad7f-4326-a63b-d076bdd02d40 X-Archives-Hash: 98db880d5834a8e57648e5bcea2b9104 commit: 572d19c1a2aa2f5cf3cb9e4b414407880ea61f3c Author: Michał Górny gentoo org> AuthorDate: Tue Jun 21 19:46:58 2016 +0000 Commit: Michał Górny gentoo 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}]