Mask dev-libs/glib[systemtap] and unmask for amd64/x86, bug 384647

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index eb460cdb527789bbc6fe17b9e40083ad2bb39793..5d1bb2d0a2a5b44fdc3111579c3f4afbeab66ba1 100644 (file)
--- 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.143 2011/09/18 12:38:25 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.144 2011/09/27 12:13:12 nirbheek Exp $
+
+  27 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask:
+  Mask dev-libs/glib[systemtap] and unmask for amd64/x86, bug 384647
 
   18 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> no-multilib/package.mask:
   Mask 32bit only games-action/cs2d on no-multilib profile

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 48221cba186044e555c395343dfd43ce939e9455..07f1da797d536d92d1c41af24643e7b94311c97c 100644 (file)
--- 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.105 2011/09/27 09:33:41 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.106 2011/09/27 12:13:12 nirbheek 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
@@ -18,6 +18,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
+# Systemtap is masked in base/package.use.mask
+# Temporarily unmask in amd64/x86, bug 384647
+dev-libs/glib systemtap
+
 # Kacper Kowalik <xarthisius@gentoo.org> (29 Jul 2011)
 # mask assembler as it currently doesn't work
 dev-lang/path64 assembler

diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 8c63094150d53ede479e89daa0cab536edfd873c..edc84e16f7555c2e4df43074b23e5994fa46bf64 100644 (file)
--- 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.76 2011/07/22 18:09:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.77 2011/09/27 12:14:40 nirbheek Exp $
+
+  27 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask:
+  Mask dev-libs/glib[systemtap] and unmask for amd64/x86, bug 384647
 
   22 Jul 2011; Anthony G. Basile <blueness@gentoo.org> package.use.mask:
   Unmask USE="nat-pmp" and "upnp" here.

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 6e48028f4ba042875a78a225177e4b59237715af..fbfd93d7dbe41d8e97947270ac16286eb0f3e3d2 100644 (file)
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,14 @@
 # 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.63 2011/09/27 09:33:41 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.64 2011/09/27 12:14:40 nirbheek Exp $
 
 # This file requires >=portage-2.1.1
 
+# Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
+# Systemtap is masked in base/package.use.mask
+# Temporarily unmask in amd64/x86, bug 384647
+dev-libs/glib -systemtap
+
 # Anthony G. Basile <blueness@gentoo.org> (22 Jul 2011)
 # nat-pmp and upnp are only stable on amd64/x86 for this package
 >=net-misc/tor-0.2.3 -nat-pmp -upnp

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 6add152132b7fe189126cb7889cbbeaedadac49b..e47f686ce5b452ab5a54d5731aef09ef0a827525 100644 (file)
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.298 2011/09/18 09:10:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.299 2011/09/27 12:11:16 nirbheek Exp $
+
+  27 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask:
+  Mask dev-libs/glib[systemtap] and unmask for amd64/x86, bug 384647
 
   18 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> use.mask:
   Remove obsolete USE="hal" mask.

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index cee1ba1330d5aa4620ae913399d40d59edb07c40..0b3c08e70302426782bc087880d28f3ac1a42585 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.268 2011/09/27 09:33:41 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.269 2011/09/27 12:11:16 nirbheek Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
+# Systemtap is not keyworded on anything except amd64/x86
+# Temporarily mask instead of dropping keywords, bug 384647
+dev-libs/glib systemtap
+
 # Markos Chandras <hwoarang@gentoo.org> (19 Aug 2011)
 # Masking xen useflag from app-emulation/libvirt per
 # bug #379815
@@ -23,7 +28,7 @@ gnome-extra/gnome-games seed
 # Nirbheek Chauhan <nirbheek@gentoo.org> (16 Aug 2011)
 # Mask introspection on ebuilds that went stable before it was unmasked.
 # As these ebuilds are cleaned from the tree, the masks can be removed.
-dev-libs/glib introspection
+<dev-libs/glib-2.30.0 introspection
 <dev-libs/atk-1.32.0-r1 introspection
 <app-cdr/brasero-2.32.1-r1 introspection
 <app-crypt/seahorse-2.32.0-r1 introspection