summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-10-21 08:03:05 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-10-21 08:03:05 +0000
commitbd24aa749745b15ada16b501b9e9dc542c235b35 (patch)
tree05e928eb627e8cfa25422f933733074134a94665 /profiles/arch
parentDrop hearbeat mask wrt #387685 by Marcin Mirosław <bug@mejor.pl> (diff)
downloadgentoo-2-bd24aa749745b15ada16b501b9e9dc542c235b35.tar.gz
gentoo-2-bd24aa749745b15ada16b501b9e9dc542c235b35.tar.bz2
gentoo-2-bd24aa749745b15ada16b501b9e9dc542c235b35.zip
Drop hearbeat mask wrt #387685 by Marcin Mirosław <bug@mejor.pl>
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/amd64/ChangeLog5
-rw-r--r--profiles/arch/amd64/package.use.mask10
2 files changed, 5 insertions, 10 deletions
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 <xarthisius@gentoo.org> package.use.mask:
+ Drop hearbeat mask wrt #387685 by Marcin Mirosław <bug@mejor.pl>
21 Oct 2011; Hans de Graaff <graaff@gentoo.org> 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 <xarthisius@gentoo.org> (22 Feb 2011)
-# >=heartbeat-3.0 is pmasked
-sys-cluster/pacemaker-gui heartbeat
-
# Tim Harder <radhermit@gentoo.org> (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 <xarthisius@gentoo.org> (1 Jul 2010)
-# >=heartbeat-3.0 is pmasked
-sys-cluster/pacemaker heartbeat
-
# Nirbheek Chauhna <nirbheek@gentoo.org> (26 Jun 2010)
# Inter-process communication doesn't work on anything except x86/amd64/arm
# due to lack of atomic ops, bug 325185