summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-05-31 11:18:02 +0000
committerTim Harder <radhermit@gentoo.org>2012-05-31 11:18:02 +0000
commit19ad1baf52cffec83eab2e4c04cea5974a5fd2aa (patch)
treeeee4806109c4c7aef58a15a32a0ade11409d6d6e /profiles
parentDo not use ruby-ng eclass as the optional work is completely fucked. (diff)
downloadgentoo-2-19ad1baf52cffec83eab2e4c04cea5974a5fd2aa.tar.gz
gentoo-2-19ad1baf52cffec83eab2e4c04cea5974a5fd2aa.tar.bz2
gentoo-2-19ad1baf52cffec83eab2e4c04cea5974a5fd2aa.zip
Unmask >=media-video/mkvtoolnix-5.1.0.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b0c9cb333ef7..ee5080637072 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6617 2012/05/31 10:55:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6618 2012/05/31 11:18:02 radhermit 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!
+ 31 May 2012; Tim Harder <radhermit@gentoo.org> package.mask:
+ Unmask >=media-video/mkvtoolnix-5.1.0.
+
31 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> package.mask:
Unmask sys-apps/hardened-shadow.
diff --git a/profiles/package.mask b/profiles/package.mask
index a840ebb86840..50adb56d465c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13808 2012/05/31 10:55:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13809 2012/05/31 11:18:02 radhermit 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
@@ -575,11 +575,6 @@ dev-util/febootstrap
# spidermonkey-1.9.2.x was renamed to 1.8.2.x; mask 1.9.2.x for bug #393473.
=dev-lang/spidermonkey-1.9.2*
-# Tim Harder <radhermit@gentoo.org> (29 Nov 2011)
-# Masked until gcc-4.6 is unmasked
->=media-video/mkvtoolnix-5.1.0
-
-# Christoph Junghans <ottxor@gentoo.org> (15 Nov 2011)
# current version of google-talkplugin never clear what you get
=www-plugins/google-talkplugin-9999