summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-10-21 08:02:42 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-10-21 08:02:42 +0000
commit76cd9a961d40278c3e9973545fea00c0ae409a82 (patch)
tree930e7cc964f51b7bd9751e8fc931bc6b4eb2e36e /profiles
parentDo not use linkoo if we don't run smoketest. (diff)
downloadgentoo-2-76cd9a961d40278c3e9973545fea00c0ae409a82.tar.gz
gentoo-2-76cd9a961d40278c3e9973545fea00c0ae409a82.tar.bz2
gentoo-2-76cd9a961d40278c3e9973545fea00c0ae409a82.zip
Drop hearbeat mask wrt #387685 by Marcin Mirosław <bug@mejor.pl>
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/x86/ChangeLog5
-rw-r--r--profiles/arch/x86/package.use.mask10
2 files changed, 5 insertions, 10 deletions
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 <xarthisius@gentoo.org> package.use.mask:
+ Drop hearbeat mask wrt #387685 by Marcin Mirosław <bug@mejor.pl>
21 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> 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 <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
@@ -76,10 +72,6 @@ media-libs/mesa -llvm
# Valgrind is only available on amd64/x86/ppc/ppc64.
net-libs/gnutls -valgrind
-# 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