diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2009-02-18 16:23:01 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2009-02-18 16:23:01 +0000 |
| commit | b07e86f1d5e93c9e04de8d8378d1c36d7a9c7f68 (patch) | |
| tree | a767a817e6a30c59f3906ec4e90fe0463a0f71d1 /profiles | |
| parent | New package sci-biology/consed, bug 253451 (diff) | |
| download | gentoo-2-b07e86f1d5e93c9e04de8d8378d1c36d7a9c7f68.tar.gz gentoo-2-b07e86f1d5e93c9e04de8d8378d1c36d7a9c7f68.tar.bz2 gentoo-2-b07e86f1d5e93c9e04de8d8378d1c36d7a9c7f68.zip | |
Sync from ../../arch/x86
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/default-linux/x86/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/default-linux/x86/package.use.mask | 17 | ||||
| -rw-r--r-- | profiles/default-linux/x86/use.mask | 3 |
3 files changed, 20 insertions, 5 deletions
diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog index 4dd87291510b..ae1a9c9d403b 100644 --- a/profiles/default-linux/x86/ChangeLog +++ b/profiles/default-linux/x86/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86 profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.146 2009/01/21 23:38:15 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.147 2009/02/18 16:23:01 armin76 Exp $ + + 18 Feb 2009; Raúl Porcel <armin76@gentoo.org> package.use.mask, use.mask: + Sync from ../../arch/x86 21 Jan 2009; Markus Meier <maekke@gentoo.org> package.mask: mask some unported x11-libs/qt-4.4* packages for a smooth upgrade wrt bug diff --git a/profiles/default-linux/x86/package.use.mask b/profiles/default-linux/x86/package.use.mask index 3fc73600ab83..4fe0804f0671 100644 --- a/profiles/default-linux/x86/package.use.mask +++ b/profiles/default-linux/x86/package.use.mask @@ -1,5 +1,19 @@ # This file requires >=portage-2.1.1 +# Raúl Porcel <armin76@gentoo.org> (02 Dec 2008) +media-libs/realcodecs win32codecs + +# Tomas Chvatal <scarabeus@gentoo.org> (24 Nov 2008) +# masked in base, unmaks for x86/amd64 +sci-misc/boinc -cuda + +# Robert Buchholz <rbu@gentoo.org> (16 Aug 2008) +# masked in base, unmask for x86/amd64 +dev-python/kaa-base -tls + +# Serkan Kaba <serkan@gentoo.org> (20 Jul 2008) +app-text/enchant -zemberek + dev-java/sun-jdk -nsplugin dev-java/sun-jre-bin -nsplugin dev-java/ibm-jdk-bin -nsplugin @@ -18,6 +32,3 @@ dev-java/ibm-jre-bin -alsa # Steve Dibb <beandog@gentoo.org> (29 Sept 2008) media-video/mplayer -cpudetection -custom-cpuopts -win32codecs -dxr3 -bindist -# Raúl Porcel <armin76@gentoo.org> (02 Dec 2008) -media-libs/realcodecs win32codecs - diff --git a/profiles/default-linux/x86/use.mask b/profiles/default-linux/x86/use.mask index a3fcc250b49e..88bd9b274433 100644 --- a/profiles/default-linux/x86/use.mask +++ b/profiles/default-linux/x86/use.mask @@ -1,6 +1,6 @@ # Copyright 2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.43 2008/11/06 00:07:05 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.44 2009/02/18 16:23:01 armin76 Exp $ # This file masks out USE flags that are simply NOT allowed in the default # x86 profile. This works, for example, if another architecture's @@ -13,6 +13,7 @@ # Unmask x86 instruction sets -3dnow -3dnowext +-lilo -mmx -mmxext -sse |