summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-26 18:35:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-26 18:35:38 +0000
commit32ddf705d4bf790e47fbd54934e3f06ccf992764 (patch)
tree9edc9fdd1e0c3e5035f32e3386387154d5d2d996 /profiles
parentVersion bump. (diff)
downloadgentoo-2-32ddf705d4bf790e47fbd54934e3f06ccf992764.tar.gz
gentoo-2-32ddf705d4bf790e47fbd54934e3f06ccf992764.tar.bz2
gentoo-2-32ddf705d4bf790e47fbd54934e3f06ccf992764.zip
Unmask ffmpeg and x264 snapshot.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 5 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 80ade321f627..b75f1d7d7fa1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3471 2009/10/26 16:52:49 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3472 2009/10/26 18:35:37 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!
+ 26 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Unmask ffmpeg and x264 snapshot.
+
26 Oct 2009; Bryan Stine <battousai@gentoo.org> package.mask:
x11-base/x11-drm removed from tree
diff --git a/profiles/package.mask b/profiles/package.mask
index 7df781acec4a..1641b70b8bdb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10682 2009/10/26 17:14:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10683 2009/10/26 18:35:38 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
@@ -225,12 +225,6 @@ games-board/knights
# Removal in 30 days
sys-kernel/sh-sources
-# Samuli Suominen <ssuominen@gentoo.org> (22 Oct 2009)
-# New x264 snapshot. Masked for testing.
->=media-libs/x264-0.0.20091001
->=media-video/x264-encoder-0.0.20091001
->=media-video/ffmpeg-0.5_p20373
-
# Doug Goldstein <cardoe@gentoo.org> (21 Oct 2009)
# Work in progress
=app-emulation/libvirt-0.7.0