summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2015-02-14 19:50:16 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2015-02-14 19:50:16 +0000
commit3936e748bc208d57bc90379a912ddbea5efaaec7 (patch)
treefdc5941961cef1821b9b136f9f1bd65e86ac725b /profiles
parentVersion bump, add patch for building with poppler-0.31.0 (bug 539492) (diff)
downloadgentoo-2-3936e748bc208d57bc90379a912ddbea5efaaec7.tar.gz
gentoo-2-3936e748bc208d57bc90379a912ddbea5efaaec7.tar.bz2
gentoo-2-3936e748bc208d57bc90379a912ddbea5efaaec7.zip
Unmask poppler-0.31.0 now we have a working cups-filters for it
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index fde4deeea50c..2ce79c03675b 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9788 2015/02/13 16:31:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9789 2015/02/14 19:50:15 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!
+ 14 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+ Unmask poppler-0.31.0 now we have a working cups-filters for it
+
13 Feb 2015; Ulrich Müller <ulm@gentoo.org> license_groups:
Remove unused licenses.
diff --git a/profiles/package.mask b/profiles/package.mask
index 74a88e75e99e..d47bff42020c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16359 2015/02/13 10:08:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16360 2015/02/14 19:50:16 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
@@ -50,11 +50,6 @@ app-office/openerp-web
# Potentially destructive to @world, bug #539746.
=sys-apps/portage-2.2.16
-# Manuel Rüger <mrueg@gentoo.org> (10 Feb 2015)
-# Breaks build for cups-filters-1.0.61
-# See bug #539492
-=app-text/poppler-0.31.0
-
# Kristian Fiskerstrand <k_f@gentoo.org> (09 Feb 2015)
# Dead upstream, will be removed in 30 days.
# Qt support is provided by app-crypt/pinentry[qt4]