summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2011-12-20 22:39:18 +0000
committerDavide Pesavento <pesa@gentoo.org>2011-12-20 22:39:18 +0000
commit86a6403a765fbcf987248a3efd89d610a29b0cc4 (patch)
treeb1d1e562230663db6fbbfca6332eba6cc0ee0f58
parentStable for AMD64, wrt bug #395383 (diff)
downloadhistorical-86a6403a765fbcf987248a3efd89d610a29b0cc4.tar.gz
historical-86a6403a765fbcf987248a3efd89d610a29b0cc4.tar.bz2
historical-86a6403a765fbcf987248a3efd89d610a29b0cc4.zip
x11-libs/qt is no longer in the tree, remove mask.
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask13
2 files changed, 5 insertions, 13 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index bae436745acd..d3a73b5a56cb 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6031 2011/12/20 15:20:34 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6032 2011/12/20 22:39:17 pesa 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!
+ 20 Dec 2011; Davide Pesavento <pesa@gentoo.org> package.mask:
+ x11-libs/qt is no longer in the tree, remove mask.
+
20 Dec 2011; Michael Pagano <mpagano@gentoo.org> package.mask:
Remove portpeek masks
diff --git a/profiles/package.mask b/profiles/package.mask
index 9dfb564efc04..53b1e0051bf3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13341 2011/12/20 15:20:34 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13342 2011/12/20 22:39:18 pesa 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
@@ -1090,17 +1090,6 @@ dev-lisp/gcl
<dev-db/mysql-5.0.60-r1
<virtual/mysql-5.0
-# Ben de Groot <yngwin@gentoo.org> (25 Jun 2009)
-# Mask the Qt4 meta ebuild, to prevent devs from being silly and depend on
-# the meta ebuild instead of on the specific split Qt ebuilds needed. See
-# bug 217161 comment 11. Users may unmask this if they want to pull in all
-# Qt modules, but packages in portage (or overlays) will pull in the split
-# modules they need as dependency. Unmasking this will most likely pull in
-# more than you need.
-# Davide Pesavento <pesa@gentoo.org> (08 Dec 2011)
-# Now superseded by x11-libs/qt-meta. Removal on 18 Dec 2011.
-=x11-libs/qt-4*
-
# Nirbheek Chauhan <nirbheek@gentoo.org> (10 Jun 2009)
# Several feature regressions that will make our users
# go on a witchhunt if unmasked