summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-07-12 13:36:26 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-07-12 13:36:26 +0000
commitecc2194da07440efadff5585637dc5b51aa2d847 (patch)
tree74594c7102a573732c7a25293c2dc0e16fa1d765 /profiles
parentia64 stable wrt bug #403843 (diff)
downloadgentoo-2-ecc2194da07440efadff5585637dc5b51aa2d847.tar.gz
gentoo-2-ecc2194da07440efadff5585637dc5b51aa2d847.tar.bz2
gentoo-2-ecc2194da07440efadff5585637dc5b51aa2d847.zip
Mask x11-proto/glproto-1.4.16 too
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask3
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b98aafd66138..ca2b8e19c97a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6771 2012/07/11 18:28:33 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6772 2012/07/12 13:36:26 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
# here. If in doubt put a record here!
+ 12 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ package.mask:
+ Mask x11-proto/glproto-1.4.16 too
+
11 Jul 2012; Alex Legler <a3li@gentoo.org> license_groups:
Add Ruby-BSD license to GPL-COMPATIBLE. The license allows the alternative
use of the 2-clause BSD license which is GPL-compatible.
diff --git a/profiles/package.mask b/profiles/package.mask
index be5377e035fe..63b1b3613384 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13955 2012/07/12 02:38:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13956 2012/07/12 13:36:26 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
@@ -351,6 +351,7 @@ dev-perl/Devel-Profiler
# Full support for gles2 pending drivers providing it
=app-admin/eselect-opengl-1.2.6*
=x11-proto/glproto-1.4.15-r1
+=x11-proto/glproto-1.4.16
=media-libs/mesa-8.0.3-r1
# Markos Chandras <hwoarang@gentoo.org> (04 Jun 2012)