From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1115366-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 F3FB5138335
for <garchives@archives.gentoo.org>; Wed, 9 Oct 2019 22:12:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 13842E07DB;
Wed, 9 Oct 2019 22:12:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 EF7B2E07DB
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Oct 2019 22:12:31 +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 6B7F834BAD6
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Oct 2019 22:12:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CDE7F83D
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Oct 2019 22:12:27 +0000 (UTC)
From: "Matt Turner" <mattst88@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, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1570659136.9c24cbe8feea118501ed38a9c1d255b3efb6dfef.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libX11/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-libs/libX11/libX11-1.6.9.ebuild
X-VCS-Directories: x11-libs/libX11/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 9c24cbe8feea118501ed38a9c1d255b3efb6dfef
X-VCS-Branch: master
Date: Wed, 9 Oct 2019 22:12:27 +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: cedfad68-06ad-485f-8650-b9106b74af94
X-Archives-Hash: cc60ec7f6675717e99fb3b9466b7cd07
commit: 9c24cbe8feea118501ed38a9c1d255b3efb6dfef
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 9 22:11:58 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 9 22:12:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c24cbe8
x11-libs/libX11: Add blocker on old xorgproto
Bug: https://bugs.gentoo.org/697098
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/libX11/libX11-1.6.9.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
index 6cd68250158..ff545068a6c 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -12,7 +12,8 @@ DESCRIPTION="X.Org X11 library"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="ipv6 test"
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+ !<x11-base/xorg-proto-2019.2"
DEPEND="${RDEPEND}
x11-base/xorg-proto
x11-libs/xtrans"