summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2014-05-24 20:06:56 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2014-05-24 20:06:56 +0000
commit371b2e7917e71c40a8e4c0a09e34c0534c770900 (patch)
tree07bfe5a69addcd214a17e4f93bceff40b36a5c3a
parentRemove special revision and just conditionally apply the poppler-0.26 patch (diff)
downloadgentoo-2-371b2e7917e71c40a8e4c0a09e34c0534c770900.tar.gz
gentoo-2-371b2e7917e71c40a8e4c0a09e34c0534c770900.tar.bz2
gentoo-2-371b2e7917e71c40a8e4c0a09e34c0534c770900.zip
Remove poppler-0.26 mask
-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 bab14848ac88..6eece2738db9 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.8998 2014/05/24 18:17:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8999 2014/05/24 20:06:56 dilfridge 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!
+ 24 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+ Remove poppler-0.26 mask
+
24 May 2014; Lars Wendler <polynomial-c@gentoo.org> package.mask:
Fixed vdr-1.6 mask.
diff --git a/profiles/package.mask b/profiles/package.mask
index 0c23c974595a..44e66282abb3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15723 2014/05/24 18:17:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15724 2014/05/24 20:06:56 dilfridge 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
@@ -193,10 +193,6 @@ app-emulation/qemu-user
# See bug #446016
dev-python/python-gnutls
-# Andreas K. Huettel <dilfridge@gentoo.org> (27 Apr 2014)
-# Mask for testing
-=app-text/poppler-0.26*
-
# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
# Gnome 3.12 mask. Also requires:
# * >=upower-0.99