summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-21 13:37:14 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-21 13:37:14 +0000
commit27e8e05afecb38eeabce91801366ea62538dad68 (patch)
tree2699e7a57f9d4e2b5a54293a5ca1bc098aac6261 /profiles
parentdrop alpha arm hppa ia64 ppc ppc64 sparc x86 x86-fbsd (diff)
downloadhistorical-27e8e05afecb38eeabce91801366ea62538dad68.tar.gz
historical-27e8e05afecb38eeabce91801366ea62538dad68.tar.bz2
historical-27e8e05afecb38eeabce91801366ea62538dad68.zip
Unmask FFmpeg 0.6.
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 d6f92fb8aa4e..dda898aa8bf8 100644
--- 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.4310 2010/06/21 09:56:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4311 2010/06/21 13:37:13 ssuominen 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!
+ 21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Unmask FFmpeg 0.6.
+
21 Jun 2010; Justin Lecher <jlec@gentoo.org> updates/2Q-2010:
Move dev-util/tkcvs to dev-vcs/tkcvs
diff --git a/profiles/package.mask b/profiles/package.mask
index 8abcf4e4df03..427895385866 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11674 2010/06/21 07:58:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11675 2010/06/21 13:37:14 ssuominen 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
@@ -94,10 +94,6 @@ virtual/postgresql-server
# Removal on 2010-08-15
sci-biology/mpiblast
-# Alexis Ballier <aballier@gentoo.org> (16 Jun 2010)
-# Mask FFmpeg 0.6 until reverse deps are checked and safe
->=media-video/ffmpeg-0.6
-
# Diego E. Pettenò <flameeyes@gentoo.org> (16 Jun 2010)
# Beta version, used to fall-in behind with older releases
=app-admin/sudo-1.7.3_beta*