From 446fa7a93d5e677d8860d6df58bd44491cd8663f Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Wed, 12 Nov 2014 21:53:16 +0000 Subject: [PATCH] no-emul-linux-x86 sub-profiles: unmasked java emul packages as they will not be multilib capable any time soon, added masks for libSM that hard depend on emul-linux-x860-baselibs, removed mask for app-emulation/crossover-bin as it's deps have been adjusted --- profiles/ChangeLog | 9 ++++++++- .../arch/amd64/no-emul-linux-x86/package.mask | 15 +++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 1458415ba3e4..b8f83c10691e 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,18 @@ # ChangeLog for profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9534 2014/11/12 17:45:50 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9535 2014/11/12 21:53:16 axs 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! + 12 Nov 2014; Ian Stakenvicius (_AxS_) + arch/amd64/no-emul-linux-x86/package.mask: + no-emul-linux-x86 sub-profiles: unmasked java emul packages as they will not + be multilib capable any time soon, added masks for libSM that hard depend on + emul-linux-x860-baselibs, removed mask for app-emulation/crossover-bin as + it's deps have been adjusted + 12 Nov 2014; Ulrich Müller package.mask: Temporary mask for app-editors/emacs-vcs live git ebuilds. diff --git a/profiles/arch/amd64/no-emul-linux-x86/package.mask b/profiles/arch/amd64/no-emul-linux-x86/package.mask index 0ef8f5f3a357..6fca0048200c 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.2 2014/10/17 20:28:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.mask,v 1.3 2014/11/12 21:53:16 axs Exp $ # Michał Górny (14 Sep 2014) # on behalf of gx86-multilib project @@ -11,8 +11,6 @@ app-emulation/emul-linux-x86-db app-emulation/emul-linux-x86-gstplugins app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-gtkmmlibs -app-emulation/emul-linux-x86-java -app-emulation/emul-linux-x86-jna app-emulation/emul-linux-x86-medialibs app-emulation/emul-linux-x86-motif app-emulation/emul-linux-x86-opengl @@ -21,14 +19,23 @@ app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs app-emulation/emul-linux-x86-xlibs +# Ian Stakenvicius (12 Nov 2014) +# on behalf of gx86-multilib project +# Allow emul's for java, for now, as there are no other multilib +# alternatives yet, and these emul packages are satisfied with +# gx86-multilib dependencies +#app-emulation/emul-linux-x86-java + (17 Sep 2014) # on behalf of gx86-multilib project # 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 +=x11-libs/libSM-1.2.1-r1 +=x11-libs/libSM-1.2.2 # Michał Górny (17 Sep 2014) # on behalf of gx86-multilib project # Packages that do not support multilib deps at all. Those packages will # need to be updated before emul-linux-x86 packages are removed. -app-emulation/crossover-bin -- 2.26.2