summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-13 09:25:24 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-13 09:25:24 +0000
commit70c5ad0c03372d90475b68e36f65bc9a427e88a9 (patch)
tree5005ec4ad29f88d9d2739d6eefd73293f60d85c3 /profiles
parentMask net-misc/openswan. (diff)
downloadgentoo-2-70c5ad0c03372d90475b68e36f65bc9a427e88a9.tar.gz
gentoo-2-70c5ad0c03372d90475b68e36f65bc9a427e88a9.tar.bz2
gentoo-2-70c5ad0c03372d90475b68e36f65bc9a427e88a9.zip
Restore mask on gst-plugins-{gconf,gnomevfs}.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask4
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 2ab8177aec91..693e929228bb 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.9075 2014/06/13 09:12:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9076 2014/06/13 09:25:24 mgorny 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 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Restore mask on gst-plugins-{gconf,gnomevfs}.
+
13 Jun 2014; Mike Gilbert <floppym@gentoo.org> package.mask:
Mask net-misc/openswan.
diff --git a/profiles/package.mask b/profiles/package.mask
index 499884701af7..e3fac1a0ffba 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15788 2014/06/13 09:12:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15789 2014/06/13 09:25:24 mgorny 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
@@ -143,10 +143,12 @@ dev-java/ibm-jdk-bin:1.5
>=media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r2:0.10
>=media-plugins/gst-plugins-flac-0.10.31-r1:0.10
>=media-plugins/gst-plugins-flac-1.2.4-r1:1.0
+>=media-plugins/gst-plugins-gconf-0.10.31-r1
>=media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1:0.10
>=media-plugins/gst-plugins-gdkpixbuf-1.2.4-r1:1.0
>=media-plugins/gst-plugins-gio-0.10.36-r1:0.10
>=media-plugins/gst-plugins-gl-0.10.3-r1
+>=media-plugins/gst-plugins-gnomevfs-0.10.36-r1
>=media-plugins/gst-plugins-gsm-0.10.23-r1:0.10
>=media-plugins/gst-plugins-hls-1.2.4-r1:1.0
>=media-plugins/gst-plugins-ivorbis-0.10.36-r1:0.10