summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2008-06-20 13:06:51 +0000
committerBen de Groot <yngwin@gentoo.org>2008-06-20 13:06:51 +0000
commit659be429882280983cf480083419ee7238a5533f (patch)
tree3aa475b24f331184ed8730122bc4757408193f2d /profiles
parentKeyworded ~x86-fbsd. (diff)
downloadgentoo-2-659be429882280983cf480083419ee7238a5533f.tar.gz
gentoo-2-659be429882280983cf480083419ee7238a5533f.tar.bz2
gentoo-2-659be429882280983cf480083419ee7238a5533f.zip
Unmasking another stray package that depends on new ffmpeg
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 2d042abe12d4..8c3668eff9e4 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1572 2008/06/20 12:37:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1573 2008/06/20 13:06:51 yngwin 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 doubt put a record here!
20 Jun 2008; Ben de Groot <yngwin@gentoo.org> package.mask:
+ Unmasking another stray package that depends on new ffmpeg
+
+ 20 Jun 2008; Ben de Groot <yngwin@gentoo.org> package.mask:
Unmasking media-video/ffmpeg-0.4.9_p20080326 and packages depending on
that version. Masing ~arch packages that are incompatible. See bug
#214740.
diff --git a/profiles/package.mask b/profiles/package.mask
index 97de18217168..91280bfde5ca 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8744 2008/06/20 12:37:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8745 2008/06/20 13:06:51 yngwin 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
@@ -475,10 +475,6 @@ media-sound/lastfmproxy
# As 1.3.3.x became a stable series and 1.3.4 has crash issues, mask it for now.
=app-office/scribus-1.3.4-r1
-# Joerg Bornkessel <hd_brummy@gentoo.org> (29 Mar 2008
-# masked depend on bug #214740, wait for unmask depend ffmpeg version
-=media-video/vdr2jpeg-0.1.0
-
# Markus Ullmann <jokey@gentoo.org> (27 Mar 2008)
# mask beta version
=mail-filter/MailScanner-4.68.6.1