From 2e59c6a5624411505e20da23c0e324aa965716f4 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Fri, 21 Oct 2011 08:03:05 +0000 Subject: Drop hearbeat mask wrt #387685 by Marcin Mirosław MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/arch/amd64/ChangeLog | 5 ++++- profiles/arch/amd64/package.use.mask | 10 +--------- profiles/arch/x86/ChangeLog | 5 ++++- profiles/arch/x86/package.use.mask | 10 +--------- 4 files changed, 10 insertions(+), 20 deletions(-) (limited to 'profiles') diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index df193dd46941..110d22f15afe 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.153 2011/10/21 07:03:29 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.154 2011/10/21 08:03:05 xarthisius Exp $ + + 21 Oct 2011; Kacper Kowalik package.use.mask: + Drop hearbeat mask wrt #387685 by Marcin Mirosław 21 Oct 2011; Hans de Graaff use.mask: Unmask Rubinius since it is keyworded for amd64. diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index fcb3ff23bcda..0dcb696d100e 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.112 2011/10/21 05:10:15 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.113 2011/10/21 08:03:05 xarthisius 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 @@ -64,10 +64,6 @@ dev-lang/php -firebird # Masked in base, unmask for amd64/x86 media-video/mplayer2 -bluray -vdpau -# Kacper Kowalik (22 Feb 2011) -# >=heartbeat-3.0 is pmasked -sys-cluster/pacemaker-gui heartbeat - # Tim Harder (13 Feb 2011) # Masked in base, unmask for amd64/x86 >=media-video/mplayer-1.0_rc4_p20101219 -bluray @@ -98,10 +94,6 @@ media-libs/mesa -llvm >=media-libs/gst-plugins-bad-0.10.21 -orc >=media-sound/pulseaudio-1.0 -orc -# Kacper Kowalik (1 Jul 2010) -# >=heartbeat-3.0 is pmasked -sys-cluster/pacemaker heartbeat - # Nirbheek Chauhna (26 Jun 2010) # Inter-process communication doesn't work on anything except x86/amd64/arm # due to lack of atomic ops, bug 325185 diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog index 615f082d319d..5b0659f690b8 100644 --- a/profiles/arch/x86/ChangeLog +++ b/profiles/arch/x86/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86 profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.82 2011/10/21 05:14:13 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.83 2011/10/21 08:02:42 xarthisius Exp $ + + 21 Oct 2011; Kacper Kowalik package.use.mask: + Drop hearbeat mask wrt #387685 by Marcin Mirosław 21 Oct 2011; Alexandre Rostovtsev package.use.mask: Undo poorly thought out masking of USE="colord packagekit" on gtk+; need to diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index 97ae6ef1d3fd..b7668e42a9be 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.67 2011/10/21 05:10:15 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.68 2011/10/21 08:02:42 xarthisius Exp $ # This file requires >=portage-2.1.1 @@ -42,10 +42,6 @@ sci-mathematics/fricas -cmucl # # Masked in base, unmask for amd64/x86 media-video/mplayer2 -bluray -vdpau -# Kacper Kowalik (22 Feb 2011) -# >=heartbeat-3.0 is pmasked -sys-cluster/pacemaker-gui heartbeat - # Tim Harder (13 Feb 2011) # Masked in base, unmask for amd64/x86 >=media-video/mplayer-1.0_rc4_p20101219 -bluray @@ -76,10 +72,6 @@ media-libs/mesa -llvm # Valgrind is only available on amd64/x86/ppc/ppc64. net-libs/gnutls -valgrind -# Kacper Kowalik (1 Jul 2010) -# >=heartbeat-3.0 is pmasked -sys-cluster/pacemaker heartbeat - # Nirbheek Chauhna (26 Jun 2010) # Inter-process communication doesn't work on anything except x86/amd64/arm # due to lack of atomic ops, bug 325185 -- cgit v1.2.3-65-gdbad