diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-04 07:18:21 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-04 07:18:21 +0000 |
| commit | d58bec84ebd449c8099f6b664a73686b6f2f6787 (patch) | |
| tree | de362180cada42685adc251d01e7ab8f0b0c53b3 /profiles | |
| parent | amd64/x86 stable (diff) | |
| download | gentoo-2-d58bec84ebd449c8099f6b664a73686b6f2f6787.tar.gz gentoo-2-d58bec84ebd449c8099f6b664a73686b6f2f6787.tar.bz2 gentoo-2-d58bec84ebd449c8099f6b664a73686b6f2f6787.zip | |
Allow win64-only wine on amd64 with features/64bit-native (bug #351436).
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/features/64bit-native/package.mask | 3 | ||||
| -rw-r--r-- | profiles/features/64bit-native/package.use.force | 7 | ||||
| -rw-r--r-- | profiles/features/64bit-native/package.use.mask | 8 | ||||
| -rw-r--r-- | profiles/features/ChangeLog | 7 |
4 files changed, 22 insertions, 3 deletions
diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask index aa745bebf712..afc41d3e8376 100644 --- a/profiles/features/64bit-native/package.mask +++ b/profiles/features/64bit-native/package.mask @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.83 2012/05/30 16:31:16 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.84 2012/07/04 07:18:21 tetromino Exp $ # AMD64 Team <amd64@gentoo.org> # Mask packages that rely on amd64 multilib @@ -37,7 +37,6 @@ app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-java -app-emulation/wine app-emulation/winetricks app-emulation/wine-doors app-text/acroread diff --git a/profiles/features/64bit-native/package.use.force b/profiles/features/64bit-native/package.use.force new file mode 100644 index 000000000000..74b4217f1c6d --- /dev/null +++ b/profiles/features/64bit-native/package.use.force @@ -0,0 +1,7 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.use.force,v 1.1 2012/07/04 07:18:21 tetromino Exp $ + +# Alexandre Rostovtsev <tetromino@gentoo.org> (04 Jul 2012) +# Force 64-bit parts of wine, bug #351436 +app-emulation/wine win64 diff --git a/profiles/features/64bit-native/package.use.mask b/profiles/features/64bit-native/package.use.mask index 3e6d0fc310d9..423bd859155c 100644 --- a/profiles/features/64bit-native/package.use.mask +++ b/profiles/features/64bit-native/package.use.mask @@ -1,3 +1,11 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.use.mask,v 1.9 2012/07/04 07:18:21 tetromino Exp $ + +# Alexandre Rostovtsev <tetromino@gentoo.org> (04 Jul 2012) +# Disable 32-bit parts of wine, bug #351436 +app-emulation/wine mono win32 + # Feb 06 2010 Justin LEcher <jlec@gentoo.org> # icc maked sci-biology/fasta icc diff --git a/profiles/features/ChangeLog b/profiles/features/ChangeLog index 566fcf76c74d..3e8fd416f5d2 100644 --- a/profiles/features/ChangeLog +++ b/profiles/features/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.38 2012/06/20 14:38:44 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.39 2012/07/04 07:18:21 tetromino Exp $ + + 04 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + 64bit-native/package.mask, 64bit-native/package.use.mask, + +64bit-native/package.use.force: + Allow win64-only wine on amd64 with features/64bit-native (bug #351436). 20 Jun 2012; <swift@gentoo.org> selinux/packages: Remove duplicate system dependencies, cleaning to only contain |