summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-08-04 11:01:34 +0000
committerJeroen Roovers <jer@gentoo.org>2012-08-04 11:01:34 +0000
commit913a954e1313a985661f760a892b61daf01cefa5 (patch)
treecdb8993a414df365ab05ddf060e0e01c0680f847 /profiles
parentRespect LDFLAGS (bug 429664, thanks flameeyes for the report and pinkbyte for... (diff)
downloadgentoo-2-913a954e1313a985661f760a892b61daf01cefa5.tar.gz
gentoo-2-913a954e1313a985661f760a892b61daf01cefa5.tar.bz2
gentoo-2-913a954e1313a985661f760a892b61daf01cefa5.zip
Unmask net-misc/curl USE=metalink again (bug #429334).
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/base/package.use.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b3e6c7df6966..a4b5fa3243b6 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6867 2012/08/03 21:31:21 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6868 2012/08/04 11:01:34 jer 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!
+ 04 Aug 2012; Jeroen Roovers <jer@gentoo.org> base/package.use.mask:
+ Unmask net-misc/curl USE=metalink again (bug #429334).
+
03 Aug 2012; Steev Klimaszewski <steev@gentoo.org> arch/arm/package.use.mask
Mask USE=doc-pdf on net-analyzer/wireshark for ARM
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b1c8b945e82a..68d22d9f2b1c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,14 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.382 2012/08/01 11:58:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.383 2012/08/04 11:01:34 jer Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
-# Anthony G. Basile <blueness@gentoo.org> (Aug 1 2012)
-# mask metalink on curl until media-libs/libmetalink-0.1.0, bug #429334
-=net-misc/curl-7.27.0* metalink
-
# Ben de Groot <yngwin@gentoo.org> (30 Jul 2012)
# fontconfig-infinality dependency not yet keyworded on most arches
media-libs/freetype infinality