summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2013-01-04 19:24:58 +0000
committerRaúl Porcel <armin76@gentoo.org>2013-01-04 19:24:58 +0000
commit109d73d7dd11cccbbf27e5d2bd9bbd9158212273 (patch)
treed1293da3d9326ab91ee50ee3ffdfccbfffd0127d /profiles
parentStable for ia64, wrt bug #449894 (diff)
downloadgentoo-2-109d73d7dd11cccbbf27e5d2bd9bbd9158212273.tar.gz
gentoo-2-109d73d7dd11cccbbf27e5d2bd9bbd9158212273.tar.bz2
gentoo-2-109d73d7dd11cccbbf27e5d2bd9bbd9158212273.zip
Move contents from default/linux/arm/10.0/package.use.mask to here, its proper place
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/arm/ChangeLog8
-rw-r--r--profiles/arch/arm/package.use.mask13
2 files changed, 15 insertions, 6 deletions
diff --git a/profiles/arch/arm/ChangeLog b/profiles/arch/arm/ChangeLog
index 878f6213362e..ebd1e39e4e0b 100644
--- a/profiles/arch/arm/ChangeLog
+++ b/profiles/arch/arm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo/ARM profile directory
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.203 2012/12/31 05:34:13 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.204 2013/01/04 19:24:58 armin76 Exp $
+
+ 04 Jan 2013; Raúl Porcel <armin76@gentoo.org> package.use.mask:
+ Move contents from default/linux/arm/10.0/package.use.mask to here, its
+ proper place
31 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> use.mask:
Mask USE=xine since xine-lib is not keyworded here.
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 60fd43173ea0..d4395637276a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.113 2012/12/31 01:45:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.114 2013/01/04 19:24:58 armin76 Exp $
# Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012)
# requires app-office/unoconv, which requires virtual/ooo, which is not
@@ -32,7 +32,7 @@ dev-util/devhelp gedit
# unkeyworded deps for app-accessibility/speech-dispatcher
app-accessibility/speech-dispatcher espeak flite
-# Markus Meier <maekke@gentoo.org> (23 Dez 2012)
+# Markus Meier <maekke@gentoo.org> (23 Dec 2012)
# mask kde-base/* flags due to unkeyworded dependencies
kde-base/kalzium editor solver
kde-base/krdc rdesktop
@@ -51,7 +51,7 @@ kde-base/perlqt qscintilla qwt
# media-video/coherence not keyworded
=media-video/totem-2* upnp-av
-# Markus Meier <maekke@gentoo.org> (08 Dez 2012)
+# Markus Meier <maekke@gentoo.org> (08 Dec 2012)
# mask app-office/libreoffice java extensions
app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher
@@ -113,6 +113,11 @@ app-admin/syslog-ng json
net-libs/webkit-gtk -jit
www-client/epiphany -jit
+# Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
+# Mask the vde flag on tinc because net-misc/vde is not
+# keyworded for arm
+net-misc/tinc vde
+
# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
# JavaScriptCore JIT is supported only on amd64/arm/x86,
# so it's masked in base profile and unmasked here.