unmask vlc 1.1.0

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index aa669d55ebfa43a47ae5ac2571d8b8f1d62f5e99..b05ca9375e88112fc9e92be7a4d782d72d73b950 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4313 2010/06/21 14:38:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4314 2010/06/22 05:57:48 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!
 
+  22 Jun 2010; Alexis Ballier <aballier@gentoo.org> package.mask:
+  unmask vlc 1.1.0
+
   21 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> package.mask:
   Mask new version of sys-cluster/heartbeat
 

diff --git a/profiles/package.mask b/profiles/package.mask
index fe4f92eaf1d3d5a6f9f03ba78375f0464145f2b5..87a0fadbc99268fc81bcf501e6f00887f2b395bd 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11677 2010/06/21 14:38:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11678 2010/06/22 05:57:48 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
@@ -534,10 +534,6 @@ app-office/nostaples
 # doing
 =sys-devel/gcc-4.5*
 
-# Alexis Ballier <aballier@gentoo.org> (22 Apr 2010)
-# Pre release
->=media-video/vlc-1.1.0_pre
-
 # Peter Volkov <pva@gentoo.org> (22 Apr 2010)
 # Masking development kernels. Test it and report bugs upstream.
 =sys-kernel/openvz-sources-2.6.32*