summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dibb <beandog@gentoo.org>2010-02-13 19:47:10 +0000
committerSteve Dibb <beandog@gentoo.org>2010-02-13 19:47:10 +0000
commitf704d55a02b236b0bb512b4a2d821aec79e76e82 (patch)
tree56867c7baad5dd13a86b469442563674309e1723 /profiles
parentdrop mips (diff)
downloadhistorical-f704d55a02b236b0bb512b4a2d821aec79e76e82.tar.gz
historical-f704d55a02b236b0bb512b4a2d821aec79e76e82.tar.bz2
historical-f704d55a02b236b0bb512b4a2d821aec79e76e82.zip
Remove x264+mplayer+ffmpeg mask depset
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask13
2 files changed, 5 insertions, 13 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index abc7573076b5..f4a5af9b53f2 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.3881 2010/02/13 19:00:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3882 2010/02/13 19:47:10 beandog 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!
+ 13 Feb 2010; Steve Dibb <beandog@gentoo.org> package.mask:
+ Remove x264+mplayer+ffmpeg mask depset
+
13 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
bitdefender-console, ghamachi and licq-themes was removed from portage.
diff --git a/profiles/package.mask b/profiles/package.mask
index a55d6517e69b..18321b220408 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11205 2010/02/13 19:00:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11206 2010/02/13 19:47:10 beandog 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
@@ -637,17 +637,6 @@ x11-misc/seyon
# depends on perl-5.10, needs testing
>=dev-perl/DateManip-6.0
-# Steve Dibb <beandog@gentoo.org> (24 Nove 2009)
-# Need to check reverse deps
->=media-libs/x264-0.0.20091124
->=media-video/x264-encoder-0.0.20091124
-
-# Ben de Groot <yngwin@gentoo.org> (25 Nov 20009)
-# Temporarily mask premature version bumps until x264 is bumped as well
-# bug 294469
->=media-video/ffmpeg-0.5_p20601
->=media-video/mplayer-1.0_rc4_p20091124
-
# Krzysiek Pawlik <nelchael@gentoo.org> (23 Nov 2009)
# Borken TPM patch, see bug #294119
=sys-apps/rng-tools-2-r2