summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-09-01 14:27:56 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-09-01 14:27:56 +0000
commitd163071c44de573e19fc7ba8fc8e9c64c2084f22 (patch)
treede7ab463d3facbbbaaaa7ae0027d2bde73540a0c /profiles
parentmask >=media-video/mpv-0.4.2 explicitly wrt #521808 (diff)
downloadgentoo-2-d163071c44de573e19fc7ba8fc8e9c64c2084f22.tar.gz
gentoo-2-d163071c44de573e19fc7ba8fc8e9c64c2084f22.tar.bz2
gentoo-2-d163071c44de573e19fc7ba8fc8e9c64c2084f22.zip
rm mask on >=media-video/mpv-0.4.2 wrt #521808
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 0e8c35abfa39..4a12f2b07672 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9335 2014/08/30 16:28:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9336 2014/09/01 14:27:56 hasufell 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!
+ 01 Sep 2014; Julian Ospald <hasufell@gentoo.org> package.mask:
+ rm mask on >=media-video/mpv-0.4.2 wrt #521808
+
30 Aug 2014; Ulrich Müller <ulm@gentoo.org> license_groups:
The AdobeFlash-10.3, GBuffy, IBM-J1.5, Livestation-EULA, and skype-eula
licenses are gone, so remove them from their respective groups.
diff --git a/profiles/package.mask b/profiles/package.mask
index 365571e4ddfb..400248036fac 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15997 2014/08/29 17:45:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15998 2014/09/01 14:27:56 hasufell 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
@@ -264,12 +264,6 @@ sys-block/afacli
=dev-libs/libmodbus-3.0.3
=dev-libs/libmodbus-3.1.0
-# Maxim Koltsov <maksbotan@gentoo.org> (9 Jul 2014)
-# Requires >=libav-10, which is masked, or >=ffmpeg-2.1.4
-# If you use ffmpeg instead of libav, sorry!
-=media-video/mpv-0.4*
-=media-video/mpv-0.5*
-
# Andreas K. Huettel <dilfridge@gentoo.org> (29 Jun 2014)
# Severe security issue (bug 460780), unhandled for over a year.
# Masked for removal in 30 days.