Mask new networkmanager release for testing; mask its new systemd flag, and unmask on arches where systemd is available.

8 files changed, 44 insertions, 8 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0f727a391122..d1f31940c96a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6360 2012/03/27 04:42:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6361 2012/03/27 08:23:20 tetromino 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!
 
   27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
+  Mask new networkmanager-0.9.4 and friends.
+
+  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
   Update the gnome-3.4 mask.
 
   26 Mar 2012; Nirbheek Chauhan <nirbheek@gentoo.org> package.mask:
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 800eb9666b52..2a06ac75d09b 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.167 2012/03/22 16:59:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.168 2012/03/27 08:23:21 tetromino Exp $
+
+  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Allow networkmanager[systemd] on amd64.
 
   22 Mar 2012; Tim Harder <radhermit@gentoo.org> no-multilib/package.use.mask:
   Remove redundant use flag mask.
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 76807421b32a..d690b8539d91 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.119 2012/03/18 14:08:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.120 2012/03/27 08:23:21 tetromino 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,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
+# Masked in base profile, supported on this arch
+net-misc/networkmanager -systemd
+
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Feb 2012)
 # Masked in base profile, supported on this arch
 gnustep-base/gnustep-make -libobjc2
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 10f3b2ec91a5..1f5a53fea13d 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.95 2012/03/05 14:30:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.96 2012/03/27 08:23:21 tetromino Exp $
+
+  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Allow networkmanager[systemd] on x86.
 
   05 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> use.mask:
   dxr3 unmask, works with v4l2, #350211
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 008beda2284b..9c3dd8de7835 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2012 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.79 2012/02/27 13:17:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.80 2012/03/27 08:23:21 tetromino Exp $
 
 # This file requires >=portage-2.1.1
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
+# Masked in base profile, supported on this arch
+net-misc/networkmanager -systemd
+
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Feb 2012)
 # Masked in base profile, supported on this arch
 gnustep-base/gnustep-make -libobjc2
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 2a5b98331e20..f24caf906137 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.368 2012/03/27 04:42:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.369 2012/03/27 08:23:21 tetromino Exp $
+
+  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Mask USE=systemd for gnome-extra/gnome-screensaver, it requires a systemd
+  version which is keyworded only on two arches.
 
   27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
   Mask x11-libs/gtk+[wayland], requires libxkbcommon from x11 overlay.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 042218fea359..c5dfac6b0125 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,15 @@
 # Copyright 1999-2012 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.327 2012/03/27 04:42:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.328 2012/03/27 08:23:21 tetromino Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (11 Feb 2012)
+# Requires >=sys-apps/systemd-31, which is masked and keyworded only for two
+# arches.
+net-misc/networkmanager systemd
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
 # Requires libxkbcommon from the x11 overlay
 x11-libs/gtk+ wayland
diff --git a/profiles/package.mask b/profiles/package.mask
index 515653513dc5..a4236e209be2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13620 2012/03/27 04:42:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13621 2012/03/27 08:23:20 tetromino 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
@@ -31,6 +31,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
+# NetworkManager-0.9.4, masked for testing
+=gnome-extra/nm-applet-0.9.4*
+=net-misc/networkmanager-0.9.4*
+=net-misc/networkmanager-openconnect-0.9.4*
+=net-misc/networkmanager-openswan-0.9.4*
+=net-misc/networkmanager-openvpn-0.9.4*
+=net-misc/networkmanager-pptp-0.9.4*
+=net-misc/networkmanager-vpnc-0.9.4*
+
 # Mike Gilbert <floppym@gentoo.org> (25 Mar 2012)
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (25 Mar 2012)
 # Masked for testing.