From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1125500-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3BC5C138239
for <garchives@archives.gentoo.org>; Tue, 26 Nov 2019 14:59:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6F6B2E091D;
Tue, 26 Nov 2019 14:59:29 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5AEE1E091D
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Nov 2019 14:59:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 68AD034D3ED
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Nov 2019 14:59:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DBFEEA8
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Nov 2019 14:59:25 +0000 (UTC)
From: "Joonas Niilola" <juippis@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, "Joonas Niilola" <juippis@gentoo.org>
Message-ID: <1574780343.738547ac3ececbc50db3f4f2425ab19897ebbafe.juippis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/imlib2/imlib2-1.6.0.ebuild
X-VCS-Directories: media-libs/imlib2/
X-VCS-Committer: juippis
X-VCS-Committer-Name: Joonas Niilola
X-VCS-Revision: 738547ac3ececbc50db3f4f2425ab19897ebbafe
X-VCS-Branch: master
Date: Tue, 26 Nov 2019 14:59:25 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: aa5f8dda-83e1-4680-ab80-ac92c307ae9a
X-Archives-Hash: e87d037331fd1df8e0530516b80cadfa
commit: 738547ac3ececbc50db3f4f2425ab19897ebbafe
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 13:51:21 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 14:59:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738547ac
media-libs/imlib2: add blocker for <imlib2_loaders-1.6.0
- .ico loader was moved to base imlib2, which causes collisons with
older versions.
Closes: https://bugs.gentoo.org/701084
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/imlib2/imlib2-1.6.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/imlib2/imlib2-1.6.0.ebuild b/media-libs/imlib2/imlib2-1.6.0.ebuild
index de1d4da1407..bb6d29fdb68 100644
--- a/media-libs/imlib2/imlib2-1.6.0.ebuild
+++ b/media-libs/imlib2/imlib2-1.6.0.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
x11-libs/libXext[${MULTILIB_USEDEP}]
)
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ !<media-plugins/imlib2_loaders-1.6.0
"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"