summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-09-18 07:53:52 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-09-18 07:53:52 +0000
commit152d9e5e2c333c7b097667feb9f2b06125a3466f (patch)
tree4e5b3200da67a5f1f5764ffc717d008e4a598ca1 /profiles
parentVersion bump to latest 2.12 release and to 3.0.2. Drop older overshadowed ver... (diff)
downloadhistorical-152d9e5e2c333c7b097667feb9f2b06125a3466f.tar.gz
historical-152d9e5e2c333c7b097667feb9f2b06125a3466f.tar.bz2
historical-152d9e5e2c333c7b097667feb9f2b06125a3466f.zip
update pmask for gnutls.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask9
2 files changed, 9 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 63bfd0993706..6bea9e86ced6 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5710 2011/09/18 03:20:10 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5711 2011/09/18 07:53:52 scarabeus 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!
+ 18 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
+ update pmask for gnutls.
+
18 Sep 2011; Mounir Lamouri <volkmar@gentoo.org> package.mask:
pmask www-plugins/weave for removal.
diff --git a/profiles/package.mask b/profiles/package.mask
index b015e8d72730..00d227eaf9c1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13059 2011/09/18 03:20:10 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13060 2011/09/18 07:53:52 scarabeus 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
@@ -735,9 +735,10 @@ sys-kernel/usermode-sources
# can emerge udev.
=sys-apps/pciutils-3.1.7-r1
-# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (25 Mar 2011)
-# Some packages fail to build or work with GnuTLS built with Nettle crypto backend.
-=net-libs/gnutls-2.12*
+# Tomáš Chvátal <scarabeus@gentoo.org> (18 Sep 2011)
+# Mask latest revisions using dev-libs/nettle and app-crypt/p11-kit
+# Needs tinderbox testing.
+>=net-libs/gnutls-2.12
# Stefaan De Roeck <stefaan@gentoo.org> (19 Mar 2011)
# New major upstream release.