summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-02-20 20:58:26 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-02-20 20:58:26 +0000
commit1c1390079c4e3273f213b938d3bafbd58a5c40de (patch)
treea731b80d8d788e7d95c5153168226ea466f49e24 /profiles
parentReplace USE=truetype with USE=xft and make x11-libs/libXft dependency optiona... (diff)
downloadgentoo-2-1c1390079c4e3273f213b938d3bafbd58a5c40de.tar.gz
gentoo-2-1c1390079c4e3273f213b938d3bafbd58a5c40de.tar.bz2
gentoo-2-1c1390079c4e3273f213b938d3bafbd58a5c40de.zip
unmask vlc 2.0
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ab2df1407360..90856f89d0b0 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.6234 2012/02/20 20:18:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6235 2012/02/20 20:58:26 aballier 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 Feb 2012; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask vlc 2.0
+
20 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Mask what will be the Xfce Desktop Environment 4.10 for testing.
diff --git a/profiles/package.mask b/profiles/package.mask
index 4794d018bc60..690c1a41fb57 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13506 2012/02/20 20:51:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13507 2012/02/20 20:58:26 aballier 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
@@ -508,10 +508,6 @@ net-mail/vmailmgr-tools
=net-misc/radvd-1.8
=net-misc/radvd-1.8.1
-# Alexis Ballier <aballier@gentoo.org> (04 Nov 2011)
-# Pre-releases of vlc 1.2. Mask it until final version is out
->=media-video/vlc-1.2_pre
-
# Diego E. Pettenò <flameeyes@gentoo.org> (30 Oct 2011)
# Working on more reliable versioning, consider experimental for now.
>=dev-lang/luajit-2.0.0_beta8