diff options
-rw-r--r-- | profiles/ChangeLog | 6 | ||||
-rw-r--r-- | profiles/arch/amd64/no-multilib/package.mask | 3 | ||||
-rw-r--r-- | profiles/features/64bit-native/package.mask | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index e3bbe8acd5aa..c6decd27df56 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3271 2009/09/16 13:11:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3272 2009/09/16 20:18:07 ulm 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 Sep 2009; Ulrich Mueller <ulm@gentoo.org> + arch/amd64/no-multilib/package.mask, features/64bit-native/package.mask: + Package mask =app-editors/emacs-18* in no-multilib profiles. + 16 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> package.mask: Remove =vanilla-sources-2.6.31_rc* mask because they've been removed from tree. diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask index 5fb79ad233f3..9143cfb949c5 100644 --- a/profiles/arch/amd64/no-multilib/package.mask +++ b/profiles/arch/amd64/no-multilib/package.mask @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.50 2009/09/15 18:09:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.51 2009/09/16 20:18:08 ulm Exp $ # AMD64 Team <amd64@gentoo.org> # Mask packages that rely on amd64 multilib @@ -11,6 +11,7 @@ app-antivirus/f-prot <app-arch/rar-3.8.0 app-arch/stuffit app-benchmarks/cpuburn +=app-editors/emacs-18* app-emulation/crossover-office-bin app-emulation/crossover-office-pro-bin app-emulation/playonlinux diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask index ca79c09c15b7..294ac8c51693 100644 --- a/profiles/features/64bit-native/package.mask +++ b/profiles/features/64bit-native/package.mask @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.29 2009/09/15 18:10:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.30 2009/09/16 20:18:08 ulm Exp $ # AMD64 Team <amd64@gentoo.org> # Mask packages that rely on amd64 multilib @@ -11,6 +11,7 @@ app-antivirus/f-prot <app-arch/rar-3.8.0 app-arch/stuffit app-benchmarks/cpuburn +=app-editors/emacs-18* app-emulation/crossover-office-bin app-emulation/crossover-office-pro-bin app-emulation/point2play |