summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-07-16 11:26:59 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-07-16 11:26:59 +0000
commiteff6f21bedde107e2cd0187163246767b35b94c4 (patch)
tree8c7e37b87db8eb17fe6207e866d9cdfa84932a98 /profiles
parentRemove old. (diff)
downloadgentoo-2-eff6f21bedde107e2cd0187163246767b35b94c4.tar.gz
gentoo-2-eff6f21bedde107e2cd0187163246767b35b94c4.tar.bz2
gentoo-2-eff6f21bedde107e2cd0187163246767b35b94c4.zip
Mask iconv USE flag for blender by default and unmask for BSD only.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/package.use.mask6
-rw-r--r--profiles/default/bsd/package.use.mask6
3 files changed, 15 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 121b018e324c..c949e072903a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6789 2012/07/16 01:24:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6790 2012/07/16 11:26:59 flameeyes 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!
+ 16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> base/package.use.mask,
+ default/bsd/package.use.mask:
+ Mask iconv USE flag for blender by default and unmask for BSD only.
+
16 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
-default/linux/powerpc/use.mask:
Remove ppc/ppc64 use masking on curl_ssl_axtls
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index afcf2ca6680f..b1742a1bd40c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,14 @@
# 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.369 2012/07/09 19:38:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.370 2012/07/16 11:26:59 flameeyes Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
+# Diego Elio Pettenò <flameeyes@gentoo.org> (16 Jul 2012)
+# Stop glibc/uclibc from using iconv in blender
+media-gfx/blender iconv
+
# Rick Farina <zerochaos@gentoo.org> (09 July 2012)
# libbtbb currently only tested on amd64/x86/arm, hopefully this won't always be needed
net-analyzer/wireshark btbb
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 609e4031a507..e166e1cc1984 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.use.mask,v 1.30 2012/05/31 02:26:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.use.mask,v 1.31 2012/07/16 11:26:59 flameeyes Exp $
+
+# Diego Elio Pettenò <flameeyes@gentoo.org> (16 Jul 2012)
+# Allow using iconv in blender
+media-gfx/blender -iconv
# Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
# No dev-util/source-highlight or media-sound/lilypond here, yet (bug #356069, bug #344289)