summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-06-26 13:29:37 +0000
committerLuca Barbato <lu_zero@gentoo.org>2013-06-26 13:29:37 +0000
commit4b6800fd80ee1e295783e7eb97c673c86aa392dd (patch)
treee3f16238c02954c2091cc7430df91ad4f81c29fd /profiles
parentversion bump (diff)
downloadhistorical-4b6800fd80ee1e295783e7eb97c673c86aa392dd.tar.gz
historical-4b6800fd80ee1e295783e7eb97c673c86aa392dd.tar.bz2
historical-4b6800fd80ee1e295783e7eb97c673c86aa392dd.zip
Unmask virtual/ffmpeg-9
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask12
2 files changed, 6 insertions, 11 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index dcbcfc760428..450357a61ae3 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7978 2013/06/26 13:13:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7979 2013/06/26 13:29:37 lu_zero 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 Jun 2013; Luca Barbato <lu_zero@gentoo.org> package.mask:
+ Unmask virtual/ffmpeg-9
+
26 Jun 2013; Julian Ospald <hasufell@gentoo.org> package.mask:
mask >=games-emulation/sdlmame-0.149 and >=games-emulation/sdlmess-0.149
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d868953e1f1..229737b47c8c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14860 2013/06/26 13:13:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14861 2013/06/26 13:29:37 lu_zero 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
@@ -243,11 +243,6 @@ dev-php/ezc-Graph
# Removal in 30 days
x11-themes/pekwm-themes-hewphoria
-# Maxim Koltsov <maksbotan@gentoo.org> (16 May 2013)
-# Needs masked ffmpeg-9
-=media-video/mplayer2-2.0_p20130428
-=media-libs/ffmpegsource-2.17.4_pre755
-
# Markos Chandras <hwoarang@gentoo.org> (12 May 2013)
# Does not build. Dead upstream. Bug #467286
# Removal in 30 days
@@ -712,10 +707,7 @@ net-dialup/hsfmodem
dev-vcs/gitosis
dev-vcs/gitosis-gentoo
-# Diego Elio Pettenò <flameeyes@gentoo.org> (14 Nov 2012)
-# Masked for testing as some packages fail.
-# See bug #443230 for tracking the progress
-~virtual/ffmpeg-9
+
# Joerg Bornkessel <hd_brummy@gentoo.org> (04 Nov 2012)
# masked for testing, bug #422605