From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-870798-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 DD4B459CA5
	for <garchives@archives.gentoo.org>; Fri, 18 Mar 2016 19:18:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E967A21C116;
	Fri, 18 Mar 2016 19:18:18 +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 2E44D21C00D
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2016 19:18:18 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 50E35340CB6
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2016 19:18:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EE91D863
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2016 19:18:13 +0000 (UTC)
From: "Sebastien Fabbro" <bicatali@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, "Sebastien Fabbro" <bicatali@gentoo.org>
Message-ID: <1458331817.b7b140cb0812775115aae6f1f25f3280b0d8b343.bicatali@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/szip/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/szip/szip-2.1.ebuild
X-VCS-Directories: sci-libs/szip/
X-VCS-Committer: bicatali
X-VCS-Committer-Name: Sebastien Fabbro
X-VCS-Revision: b7b140cb0812775115aae6f1f25f3280b0d8b343
X-VCS-Branch: master
Date: Fri, 18 Mar 2016 19:18:13 +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: 9f640e1f-4838-49c6-b1bc-63fe9ac2a100
X-Archives-Hash: cc9dcc26ff51c70a4ed0155d63556867

commit:     b7b140cb0812775115aae6f1f25f3280b0d8b343
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 22:55:11 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 20:10:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b140cb

sci-libs/szip: conflicts with libaec

Package-Manager: portage-2.2.27

 sci-libs/szip/szip-2.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/szip/szip-2.1.ebuild b/sci-libs/szip/szip-2.1.ebuild
index 465dcbd..88e125b 100644
--- a/sci-libs/szip/szip-2.1.ebuild
+++ b/sci-libs/szip/szip-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,6 +14,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE=""
 DEPEND=""
+RDEPEND="!sci-libs/libaec"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"