summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-06-24 23:44:46 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-06-24 23:44:46 +0000
commit607206c4f0d3ead152bbd885a0e38bbfe3f7a89f (patch)
tree76133a2c316f8d5f798c41c36bac15f86b567cd4 /profiles/arch
parentBump, see http://www.winehq.org/announce/1.5.7 and http://www.winehq.org/anno... (diff)
downloadgentoo-2-607206c4f0d3ead152bbd885a0e38bbfe3f7a89f.tar.gz
gentoo-2-607206c4f0d3ead152bbd885a0e38bbfe3f7a89f.tar.bz2
gentoo-2-607206c4f0d3ead152bbd885a0e38bbfe3f7a89f.zip
Allow win64-only wine on amd64/no-multilib (bug #351436).
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/amd64/ChangeLog7
-rw-r--r--profiles/arch/amd64/no-multilib/package.mask3
-rw-r--r--profiles/arch/amd64/no-multilib/package.use.force7
-rw-r--r--profiles/arch/amd64/no-multilib/package.use.mask6
4 files changed, 19 insertions, 4 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index b95b15da8da1..23c13060f5dc 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/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/arch/amd64/ChangeLog,v 1.179 2012/06/14 22:26:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.180 2012/06/24 23:44:46 tetromino Exp $
+
+ 24 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ +no-multilib/package.use.force, no-multilib/package.mask,
+ no-multilib/package.use.mask:
+ Allow win64-only wine on amd64/no-multilib (bug #351436).
14 Jun 2012; Davide Pesavento <pesa@gentoo.org> package.use.mask:
Consolidate USE=jit masking/unmasking for qt-script and qt-webkit.
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index d7a194ca8ef2..38fb62397b0a 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/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/arch/amd64/no-multilib/package.mask,v 1.114 2012/05/30 16:31:15 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.115 2012/06/24 23:44:46 tetromino Exp $
# AMD64 Team <amd64@gentoo.org>
# Mask packages that rely on amd64 multilib
@@ -38,7 +38,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/arch/amd64/no-multilib/package.use.force b/profiles/arch/amd64/no-multilib/package.use.force
new file mode 100644
index 000000000000..1478706d0d9a
--- /dev/null
+++ b/profiles/arch/amd64/no-multilib/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/arch/amd64/no-multilib/package.use.force,v 1.1 2012/06/24 23:44:46 tetromino Exp $
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
+# Force 64-bit parts of wine, bug #351436
+app-emulation/wine win64
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 67bd1f467c25..924c421bd443 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/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/arch/amd64/no-multilib/package.use.mask,v 1.13 2012/03/22 16:59:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.use.mask,v 1.14 2012/06/24 23:44:46 tetromino Exp $
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
+# Disable 32-bit parts of wine, bug #351436
+app-emulation/wine mono win32
# Feb 06, 2010 Justin Lecher <jlec@gentoo.org>
# icc masked