summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2011-07-25 22:48:28 +0000
committerAnthony G. Basile <blueness@gentoo.org>2011-07-25 22:48:28 +0000
commit6c6f3d3a54fd78ba5dfcbca3ce082b193ec03bf9 (patch)
treed5720b10881df4936362c569d69f005c48121b5c /profiles
parentSwitch to selinux-gpg (diff)
downloadgentoo-2-6c6f3d3a54fd78ba5dfcbca3ce082b193ec03bf9.tar.gz
gentoo-2-6c6f3d3a54fd78ba5dfcbca3ce082b193ec03bf9.tar.bz2
gentoo-2-6c6f3d3a54fd78ba5dfcbca3ce082b193ec03bf9.zip
Added maskings and unmaskings for sec-policy/selinux-gpg
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/package.mask3
-rw-r--r--profiles/features/selinux/package.mask3
-rw-r--r--profiles/selinux/package.mask3
4 files changed, 11 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c8a9eeb9a2d4..b2aa0eb8e40b 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5573 2011/07/25 11:42:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5574 2011/07/25 22:48:28 blueness 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!
+ 25 Jul 2011; Anthony G. Basile <blueness@gentoo.org> base/package.mask,
+ features/selinux/package.mask, selinux/package.mask:
+ Added maskings and unmaskings for sec-policy/selinux-gpg
+
25 Jul 2011; Pacho Ramos <pacho@gentoo.org> package.mask:
Mask dev-libs/libsigc++:1.0 for removal , bug 358587
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 6f7cc34571d3..92a934c66cae 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.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/base/package.mask,v 1.19 2011/06/19 13:40:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.20 2011/07/25 22:48:28 blueness Exp $
# Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011)
# on behalf of QA team <qa@gentoo.org
@@ -95,6 +95,7 @@ sec-policy/selinux-gift
sec-policy/selinux-gitosis
sec-policy/selinux-gnome
sec-policy/selinux-gnupg
+sec-policy/selinux-gpg
sec-policy/selinux-gorg
sec-policy/selinux-gpm
sec-policy/selinux-gpsd
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index a78c3713da67..b4b6118190f5 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.4 2011/07/11 12:01:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.5 2011/07/25 22:48:28 blueness Exp $
# >=sci-libs/acml-3.6 requires gcc-4.2.
>=sci-libs/acml-3.6
@@ -88,6 +88,7 @@
-sec-policy/selinux-gitosis
-sec-policy/selinux-gnome
-sec-policy/selinux-gnupg
+-sec-policy/selinux-gpg
-sec-policy/selinux-gorg
-sec-policy/selinux-gpm
-sec-policy/selinux-gpsd
diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask
index 35ce6e403c81..04cfc8df6a17 100644
--- a/profiles/selinux/package.mask
+++ b/profiles/selinux/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.59 2011/06/19 11:00:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.60 2011/07/25 22:48:28 blueness Exp $
# >=sci-libs/acml-3.6 requires gcc-4.2.
>=sci-libs/acml-3.6
@@ -88,6 +88,7 @@
-sec-policy/selinux-gitosis
-sec-policy/selinux-gnome
-sec-policy/selinux-gnupg
+-sec-policy/selinux-gpg
-sec-policy/selinux-gorg
-sec-policy/selinux-gpm
-sec-policy/selinux-gpsd