summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-03-03 07:34:00 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-03-03 07:34:00 +0000
commit3ebc5d871cf2f767be89dd802a36ead706891c7e (patch)
tree8c6f99aefcf90d4340d588d0a04671de755e7a4a /profiles
parentVersion bump (diff)
downloadgentoo-2-3ebc5d871cf2f767be89dd802a36ead706891c7e.tar.gz
gentoo-2-3ebc5d871cf2f767be89dd802a36ead706891c7e.tar.bz2
gentoo-2-3ebc5d871cf2f767be89dd802a36ead706891c7e.zip
Update wine to autotools-multilib.eclass
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/amd64/ChangeLog6
-rw-r--r--profiles/arch/amd64/package.use.force8
-rw-r--r--profiles/arch/amd64/x32/package.use.mask8
3 files changed, 17 insertions, 5 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 1105d270a763..07656bb8dfa9 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo/AMD64 profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.213 2013/02/27 23:21:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.214 2013/03/03 07:34:00 tetromino Exp $
+
+ 03 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.force,
+ x32/package.use.mask:
+ Update wine to autotools-multilib.eclass
27 Feb 2013; Michał Górny <mgorny@gentoo.org> +x32/use.force,
+x32/use.mask:
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 33c6a7352081..a5adb6bee35f 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2011 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/amd64/package.use.force,v 1.6 2011/04/21 10:30:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.force,v 1.7 2013/03/03 07:34:00 tetromino Exp $
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (03 Mar 2013)
+# wine64 is optional
+app-emulation/wine -abi_x86_64
# Diego Elio Pettenò <flameeyes@gmail.com> (21 Apr 2011)
# The plugin is 32-bit only (and I'm not even sure if it works with
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index d6b253b0a74b..2fb162c4a2ec 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,9 +1,13 @@
-# 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/amd64/x32/package.use.mask,v 1.1 2012/10/07 17:58:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.use.mask,v 1.2 2013/03/03 07:34:00 tetromino Exp $
# This file requires >=portage-2.1.1
+# Alexandre Rostovtsev <tetromino@gentoo.org> (03 Mar 2013)
+# Wine is x86- and x64-only
+app-emulation/wine abi_x86_x32
+
# Pawel Hajdan jr <phajdan.jr@gentoo.org> (07 Oct 2012)
# V8 upstream said they won't support x32, bug #423815
# Masked V8 and reverse dependencies.