summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-03-18 19:50:08 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-03-18 19:50:08 +0000
commitacd3b75f176674d19694eec5cf9b6d27e6e5d4db (patch)
tree01cb8c85a5d286f5d24c45ef63f223fcb7a57dcf /profiles
parentsh/sparc stable wrt #396771 (diff)
downloadgentoo-2-acd3b75f176674d19694eec5cf9b6d27e6e5d4db.tar.gz
gentoo-2-acd3b75f176674d19694eec5cf9b6d27e6e5d4db.tar.bz2
gentoo-2-acd3b75f176674d19694eec5cf9b6d27e6e5d4db.zip
Drop some x11 masks.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask15
2 files changed, 7 insertions, 14 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d94269f1a465..326e23b614bd 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.6327 2012/03/18 18:08:03 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6328 2012/03/18 19:50:08 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!
+ 18 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ package.mask:
+ Drop some x11 masks.
+
18 Mar 2012; Matti Bickel <mabi@gentoo.org> package.mask:
masked dev-php/PEAR-DB_DataObject_FormBuilder for removal, bug 396963
diff --git a/profiles/package.mask b/profiles/package.mask
index b13eb052ff84..1e1a671f0c14 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13588 2012/03/18 19:02:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13589 2012/03/18 19:50:08 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
@@ -104,12 +104,6 @@ app-pda/syncevolution
# Masked for testing
=mail-client/roundcube-0.8*
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (07 Mar 2012)
-# Too many reverse dependencies fail to build, mask until they are fixed or
-# made depend on the correct version
-=x11-base/xorg-server-1.12*
-=x11-base/xorg-drivers-1.12
-
# Johannes Huber <johu@gentoo.org> (06 Mar 2012)
# Masked for removal in 30 days. Superseded by
# kde-base/nepomuk bug #406999.
@@ -347,11 +341,6 @@ sys-apps/systemd-sysv-utils
# Mask experimental software
=mail-mta/postfix-2.10*
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (01 Jan 2012)
-# Mask until dependencies are keyworded, bug #396669
->=x11-drivers/xf86-input-evdev-2.6.99
->=x11-drivers/xf86-input-synaptics-1.5.99
-
# Jeroen Roovers <jer@gentoo.org> (23 Dec 2011)
# Opera Next and Opera snapshots are unsupported and eternally unstable.
# <http://my.opera.com/desktopteam/blog>
@@ -360,7 +349,7 @@ www-client/opera-next
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (19 Dec 2011)
# Mask prerelease x11 packages
-=x11-base/xorg-server-1.11.99*
+=x11-drivers/xf86-input-synaptics-1.5.99*
=x11-libs/libX11-1.4.99*
>=x11-libs/libXi-1.5.99