From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-888078-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id F011E1382AC
	for <garchives@archives.gentoo.org>; Tue, 21 Jun 2016 19:42:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4CA45E0895;
	Tue, 21 Jun 2016 19:42:52 +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 DF8B0E0895
	for <gentoo-commits@lists.gentoo.org>; Tue, 21 Jun 2016 19:42:51 +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 71E2333FD3F
	for <gentoo-commits@lists.gentoo.org>; Tue, 21 Jun 2016 19:42:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id F3543241B
	for <gentoo-commits@lists.gentoo.org>; Tue, 21 Jun 2016 19:42:38 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1466538150.a1493acc4ec62d79348449837e3d0a3aff3f97a6.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild media-libs/xine-lib/xine-lib-1.2.9999.ebuild
X-VCS-Directories: media-libs/xine-lib/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: a1493acc4ec62d79348449837e3d0a3aff3f97a6
X-VCS-Branch: master
Date: Tue, 21 Jun 2016 19:42:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 73c753ae-dba9-4f34-8a9e-df8068ec57bb
X-Archives-Hash: e351edc6948d030ced7280fc8b2b0184

commit:     a1493acc4ec62d79348449837e3d0a3aff3f97a6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:42:24 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:42:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1493acc

media-libs/xine-lib: Remove := slot op from ||, #586316

 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 2 +-
 media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 0d16682..032fd3c 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
 	flac? ( media-libs/flac )
 	fusion? ( media-libs/FusionSound )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	jpeg? ( virtual/jpeg:0 )
 	libcaca? ( media-libs/libcaca )

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 79fdaae..dc6926a 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
 	flac? ( media-libs/flac )
 	fusion? ( media-libs/FusionSound )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	jpeg? ( virtual/jpeg:0 )
 	libcaca? ( media-libs/libcaca )