From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-697936-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (unknown [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 01B481381FA
	for <garchives@archives.gentoo.org>; Wed, 21 May 2014 16:13:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7C2D3E09D5;
	Wed, 21 May 2014 16:13:18 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id EFA72E09D5
	for <gentoo-commits@lists.gentoo.org>; Wed, 21 May 2014 16:13:17 +0000 (UTC)
Received: from flycatcher.gentoo.org (unknown [81.93.255.6])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id AFFBA33FCC7
	for <gentoo-commits@lists.gentoo.org>; Wed, 21 May 2014 16:13:16 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2265)
	id 52EB02004C; Wed, 21 May 2014 16:13:15 +0000 (UTC)
From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, chithanh@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in profiles: ChangeLog package.mask
X-VCS-Repository: gentoo-x86
X-VCS-Files: ChangeLog package.mask
X-VCS-Directories: profiles
X-VCS-Committer: chithanh
X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20140521161315.52EB02004C@flycatcher.gentoo.org>
Date: Wed, 21 May 2014 16:13:15 +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: ed879e4a-1990-4894-808c-2154cb00fe98
X-Archives-Hash: 2b152763c56e65271408c73b8dae9384

chithanh    14/05/21 16:13:15

  Modified:             ChangeLog package.mask
  Log:
  Rearrange Xwayland and fontsproto mask, add patched libXfont to mask.

Revision  Changes    Path
1.8988               profiles/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.8988&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.8988&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?r1=1.8987&r2=1.8988

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v
retrieving revision 1.8987
retrieving revision 1.8988
diff -u -r1.8987 -r1.8988
--- ChangeLog	21 May 2014 14:43:18 -0000	1.8987
+++ ChangeLog	21 May 2014 16:13:14 -0000	1.8988
@@ -1,6 +1,6 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8987 2014/05/21 14:43:18 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8988 2014/05/21 16:13:14 chithanh Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
@@ -8,6 +8,10 @@
 
   21 May 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   package.mask:
+  Rearrange Xwayland and fontsproto mask, add patched libXfont to mask.
+
+  21 May 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.mask:
   Mask recent fontsproto, xorg-server, wayland and weston
 
   21 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:



1.15712              profiles/package.mask

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.15712&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.15712&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?r1=1.15711&r2=1.15712

Index: package.mask
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v
retrieving revision 1.15711
retrieving revision 1.15712
diff -u -r1.15711 -r1.15712
--- package.mask	21 May 2014 14:10:53 -0000	1.15711
+++ package.mask	21 May 2014 16:13:14 -0000	1.15712
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15711 2014/05/21 14:10:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15712 2014/05/21 16:13:14 chithanh Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,14 +31,15 @@
 #--- END OF EXAMPLES ---
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (21 May 2014)
-# Incompatible with <x11-libs/libXfont-1.5
->=x11-proto/fontsproto-2.1.3
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (21 May 2014)
 # Mask until the necessary keywording for Xwayland is done, bug #510940
+# fontsproto has new function prototypes that make it incompatible
+# with older libXfont. All these packages should probably be unmasked
+# together.
 >=dev-libs/wayland-1.5.0
 >=dev-libs/weston-1.5.0
 >=x11-base/xorg-server-1.15.99
+>=x11-proto/fontsproto-2.1.3
+>=x11-libs/libXfont-1.4.8-r1
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (19 May 2014)
 # Masked until dev-libs/glib supports the new timezone format, bug #510422