diff options
| -rw-r--r-- | profiles/ChangeLog | 9 | ||||
| -rw-r--r-- | profiles/arch/amd64/no-multilib/package.mask | 3 | ||||
| -rw-r--r-- | profiles/arch/amd64/package.use.stable.mask | 3 | ||||
| -rw-r--r-- | profiles/default/linux/uclibc/amd64/package.mask | 3 | ||||
| -rw-r--r-- | profiles/features/64bit-native/package.mask | 3 | ||||
| -rw-r--r-- | profiles/hardened/linux/amd64/no-multilib/package.mask | 3 | ||||
| -rw-r--r-- | profiles/hardened/linux/musl/amd64/package.mask | 3 | ||||
| -rw-r--r-- | profiles/package.mask | 7 |
8 files changed, 21 insertions, 13 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index ada8a8260005..6dda83d8fdba 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.9415 2014/10/02 03:04:04 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9416 2014/10/02 10:29:30 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! + 02 Oct 2014; Ulrich Müller <ulm@gentoo.org> + arch/amd64/no-multilib/package.mask, arch/amd64/package.use.stable.mask, + default/linux/uclibc/amd64/package.mask, features/64bit-native/package.mask, + hardened/linux/amd64/no-multilib/package.mask, + hardened/linux/musl/amd64/package.mask, package.mask: + Revert masking of app-emulation/emul-linux-x86-motif, bug 461916. + 02 Oct 2014; Ben de Groot <yngwin@gentoo.org> desc/linguas.desc: Add hr_HR locale diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask index 380ce3a0d0f6..d62ccc132729 100644 --- a/profiles/arch/amd64/no-multilib/package.mask +++ b/profiles/arch/amd64/no-multilib/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-multilib/package.mask,v 1.138 2014/09/30 21:42:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.139 2014/10/02 10:29:30 ulm Exp $ # AMD64 Team <amd64@gentoo.org> # Mask packages that rely on amd64 multilib @@ -25,6 +25,7 @@ app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-gtkmmlibs app-emulation/emul-linux-x86-jna app-emulation/emul-linux-x86-medialibs +app-emulation/emul-linux-x86-motif app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-qtlibs app-emulation/emul-linux-x86-sdl diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 265be99d3d9f..8aa4ecb5497d 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.65 2014/09/30 21:42:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.stable.mask,v 1.66 2014/10/02 10:29:30 ulm 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 @@ -39,6 +39,7 @@ app-emulation/emul-linux-x86-gtkmmlibs abi_x86_32 app-emulation/emul-linux-x86-java abi_x86_32 app-emulation/emul-linux-x86-jna abi_x86_32 app-emulation/emul-linux-x86-medialibs abi_x86_32 pulseaudio +app-emulation/emul-linux-x86-motif abi_x86_32 app-emulation/emul-linux-x86-opengl abi_x86_32 app-emulation/emul-linux-x86-qtlibs abi_x86_32 app-emulation/emul-linux-x86-sdl abi_x86_32 diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask index b3747d50e281..6141fad4db0d 100644 --- a/profiles/default/linux/uclibc/amd64/package.mask +++ b/profiles/default/linux/uclibc/amd64/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/default/linux/uclibc/amd64/package.mask,v 1.4 2014/09/30 21:42:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/uclibc/amd64/package.mask,v 1.5 2014/10/02 10:29:30 ulm Exp $ # Anthony G. Basile <blueness@gentoo.org> (07 Oct 2012) # profile hardened/linux/uclibc/amd64 is not mutlilib @@ -13,6 +13,7 @@ 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 app-emulation/emul-linux-x86-qtlibs app-emulation/emul-linux-x86-sdl diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask index 545e6a3bf2ef..9c11577741cf 100644 --- a/profiles/features/64bit-native/package.mask +++ b/profiles/features/64bit-native/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/features/64bit-native/package.mask,v 1.101 2014/09/30 21:42:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.102 2014/10/02 10:29:30 ulm Exp $ # AMD64 Team <amd64@gentoo.org> # Mask packages that rely on amd64 multilib @@ -29,6 +29,7 @@ app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-gtkmmlibs app-emulation/emul-linux-x86-jna app-emulation/emul-linux-x86-medialibs +app-emulation/emul-linux-x86-motif app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-qtlibs app-emulation/emul-linux-x86-sdl diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask index c07750c54fa6..3a5199ec663b 100644 --- a/profiles/hardened/linux/amd64/no-multilib/package.mask +++ b/profiles/hardened/linux/amd64/no-multilib/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/hardened/linux/amd64/no-multilib/package.mask,v 1.39 2014/09/30 21:42:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.40 2014/10/02 10:29:30 ulm Exp $ # These are broken as reported by Halcy0n, Aug, 23, 2011 net-misc/teamviewer @@ -45,6 +45,7 @@ app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-gtkmmlibs app-emulation/emul-linux-x86-jna app-emulation/emul-linux-x86-medialibs +app-emulation/emul-linux-x86-motif app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-qtlibs app-emulation/emul-linux-x86-sdl diff --git a/profiles/hardened/linux/musl/amd64/package.mask b/profiles/hardened/linux/musl/amd64/package.mask index b3e760cca3d0..a33493e0328f 100644 --- a/profiles/hardened/linux/musl/amd64/package.mask +++ b/profiles/hardened/linux/musl/amd64/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/hardened/linux/musl/amd64/package.mask,v 1.3 2014/09/30 21:42:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/package.mask,v 1.4 2014/10/02 10:29:31 ulm Exp $ # # Anthony G. Basile <blueness@gentoo.org> (07 Oct 2012) @@ -15,6 +15,7 @@ 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 app-emulation/emul-linux-x86-qtlibs app-emulation/emul-linux-x86-sdl diff --git a/profiles/package.mask b/profiles/package.mask index 4cd507dc9321..d93552374eab 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16068 2014/10/02 04:02:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16069 2014/10/02 10:29:30 ulm 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 @@ -30,11 +30,6 @@ #--- END OF EXAMPLES --- -# Ulrich Müller <ulm@gentoo.org> (30 Sep 2014) -# Obsolete, superseded by multilib x11-libs/motif. -# Masked for removal in 60 days, bug #461916. -app-emulation/emul-linux-x86-motif - # Pawel Hajdan jr <phajdan.jr@gentoo.org> (30 Sep 2014) # Reverse dependencies need to be tested and fixed, bug #521406. >=dev-libs/protobuf-2.6.0 |