summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-12-16 11:56:33 +0000
committerPacho Ramos <pacho@gentoo.org>2014-12-16 11:56:33 +0000
commite4c76e6c8a63946bfd3e1aa2552419af9b2f7bf6 (patch)
tree650f914dc9bdddff18cce54f375421166710c968 /profiles
parentbump; comment out tests found to pass in prior version (for now), rm old (diff)
downloadgentoo-2-e4c76e6c8a63946bfd3e1aa2552419af9b2f7bf6.tar.gz
gentoo-2-e4c76e6c8a63946bfd3e1aa2552419af9b2f7bf6.tar.bz2
gentoo-2-e4c76e6c8a63946bfd3e1aa2552419af9b2f7bf6.zip
Update multilib masks for wine
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog8
-rw-r--r--profiles/arch/amd64/no-emul-linux-x86/package.mask4
-rw-r--r--profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask3
-rw-r--r--profiles/arch/amd64/package.use.stable.mask3
4 files changed, 13 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 506c58ebd9ba..b5b579af2fa1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9621 2014/12/15 21:02:11 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9622 2014/12/16 11:56:32 pacho Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 16 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+ arch/amd64/no-emul-linux-x86/package.mask,
+ arch/amd64/no-emul-linux-x86/package.use.stable.mask,
+ arch/amd64/package.use.stable.mask:
+ Update multilib masks for wine
+
15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> profiles.desc:
Added linux prefix-standalone profiles.
diff --git a/profiles/arch/amd64/no-emul-linux-x86/package.mask b/profiles/arch/amd64/no-emul-linux-x86/package.mask
index 891e5ff782bd..4c1733033be5 100644
--- a/profiles/arch/amd64/no-emul-linux-x86/package.mask
+++ b/profiles/arch/amd64/no-emul-linux-x86/package.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.mask,v 1.5 2014/12/08 23:50:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.mask,v 1.6 2014/12/16 11:56:33 pacho Exp $
# Michał Górny <mgorny@gentoo.org> (14 Sep 2014)
# on behalf of gx86-multilib project <multilib@gentoo.org>
@@ -31,7 +31,7 @@ app-emulation/emul-linux-x86-xlibs
# on behalf of gx86-multilib project <multilib@gentoo.org>
# Old version of packages that do not fully support multilib deps. Those
# versions will be removed along with emul-linux-x86 packages.
-<=app-emulation/wine-1.7.18
+<app-emulation/wine-1.6.1
=x11-libs/libSM-1.2.1-r1
=x11-libs/libSM-1.2.2
diff --git a/profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask b/profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask
index 222224bf8159..9ea9adb63ae8 100644
--- a/profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask
+++ b/profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask,v 1.27 2014/12/13 13:55:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.use.stable.mask,v 1.28 2014/12/16 11:56:33 pacho Exp $
# Michał Górny <mgorny@gentoo.org> (14 Sep 2014)
# on behalf of gx86-multilib project <multilib@gentoo.org>
@@ -9,6 +9,7 @@
app-accessibility/flite -abi_x86_32
app-admin/fam -abi_x86_32
app-admin/gamin -abi_x86_32
+app-emulation/wine -abi_x86_32
app-arch/bzip2 -abi_x86_32
app-arch/xz-utils -abi_x86_32
app-crypt/heimdal -abi_x86_32
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 5469632a2af7..3aebb5be0413 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.101 2014/12/13 13:55:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.102 2014/12/16 11:56:33 pacho Exp $
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,7 @@ net-im/bitlbee skype
app-accessibility/flite abi_x86_32
app-admin/fam abi_x86_32
app-admin/gamin abi_x86_32
+app-emulation/wine abi_x86_32
app-arch/bzip2 abi_x86_32
app-arch/xz-utils abi_x86_32
app-crypt/heimdal abi_x86_32