summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-11-11 14:28:15 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-11-11 14:28:15 +0000
commit77507509678c149ce7a0a63bce4bacefaa78ab9c (patch)
treefb797ccd63d652e654a7116661ef69870632f16b /profiles
parentRemoved on request of drac. (diff)
downloadgentoo-2-77507509678c149ce7a0a63bce4bacefaa78ab9c.tar.gz
gentoo-2-77507509678c149ce7a0a63bce4bacefaa78ab9c.tar.bz2
gentoo-2-77507509678c149ce7a0a63bce4bacefaa78ab9c.zip
ffmpeg2theora-9999 punted, removing mask entry.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5c79d8ea8c2f..aa8e3e1e8e9d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2040 2008/11/11 03:38:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2041 2008/11/11 14:28:15 loki_val 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!
+ 11 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> package.mask:
+ ffmpeg2theora-9999 punted, removing mask entry.
+
11 Nov 2008; Jeremy Olexa <darkside@gentoo.org> package.mask:
Lift p.mask for app-admin/osiris because many people wanted it to stay. bug
#245479
diff --git a/profiles/package.mask b/profiles/package.mask
index 23523102941b..05e8296a234c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.9160 2008/11/11 03:38:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.9161 2008/11/11 14:28:15 loki_val 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
@@ -858,11 +858,6 @@ sys-fs/redirfs
# Probably breaks a lot of stuff, needs testing
=net-wireless/wireless-tools-30_pre*
-# Samuli Suominen <drac@gentoo.org> (12 Feb 2008)
-# If 0.20 fails with hardmasked ffmpeg snapshot,
-# try this instead.
-~media-video/ffmpeg2theora-9999
-
# Sebastien Fabbro <bicatali@gentoo.org> (05 Feb 2008)
# sci-libs/metis-5.* still experimental
>=sci-libs/metis-4.99