summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2012-08-08 19:37:41 +0000
committerSven Vermeulen <swift@gentoo.org>2012-08-08 19:37:41 +0000
commitdbc33c5adb57fd44130af4006f3fbaa12caebb20 (patch)
tree60cc26c0969a0fb510083a9e143b2b0f46d68745 /profiles/features
parentMarking dmake-4.12.2 ppc for bug 422073 (diff)
downloadhistorical-dbc33c5adb57fd44130af4006f3fbaa12caebb20.tar.gz
historical-dbc33c5adb57fd44130af4006f3fbaa12caebb20.tar.bz2
historical-dbc33c5adb57fd44130af4006f3fbaa12caebb20.zip
Add back forcing python2 USE flag on Portage for SELinux profiles, see bug #430488
Diffstat (limited to 'profiles/features')
-rw-r--r--profiles/features/ChangeLog6
-rw-r--r--profiles/features/selinux/package.use.force7
-rw-r--r--profiles/features/selinux/package.use.mask7
3 files changed, 17 insertions, 3 deletions
diff --git a/profiles/features/ChangeLog b/profiles/features/ChangeLog
index 5e1a13ae7ae1..2994c8ac29e2 100644
--- a/profiles/features/ChangeLog
+++ b/profiles/features/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo/AMD64 profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.45 2012/08/01 16:52:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.46 2012/08/08 19:37:40 swift Exp $
+
+ 08 Aug 2012; <swift@gentoo.org> selinux/package.use.force,
+ selinux/package.use.mask:
+ Add back python2 force on portage for SELinux, see bug #430488
01 Aug 2012; <swift@gentoo.org> selinux/package.use.force,
selinux/package.use.mask:
diff --git a/profiles/features/selinux/package.use.force b/profiles/features/selinux/package.use.force
index 6c16db2127c7..80cf534661c1 100644
--- a/profiles/features/selinux/package.use.force
+++ b/profiles/features/selinux/package.use.force
@@ -1,6 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.use.force,v 1.4 2012/08/01 16:52:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.use.force,v 1.5 2012/08/08 19:37:41 swift Exp $
+
+# Sven Vermeulen <swift@gentoo.org> (08 Aug 2012)
+# sys-apps/portage SELinux integration code within Portage is still Python-2.6
+# only. See bug #430488
+sys-apps/portage python2
# Sven Vermeulen <swift@gentoo.org> (07 Oct 2011)
# sys-apps/policycoreutils (semanage command) uses sepolgen, which requires libselinux with USE="python".
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 46bd1fa3f887..cc23b6994791 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.use.mask,v 1.3 2012/08/01 16:52:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.use.mask,v 1.4 2012/08/08 19:37:41 swift Exp $
+
+# Sven Vermeulen <swift@gentoo.org> (08 Aug 2012)
+# sys-apps/portage SELinux integration code still requires Python 2.
+# See bug #430488
+sys-apps/portage python3
# Saleem Abdulrasool <compnerd@gentoo.org> (23 Nov 2007)
# Unmask when we get HAL 0.5.10 straightened out