[gentoo-commits] proj/hardened-dev:master commit in: sys-apps/policycoreutils/files/, sys-apps/policycoreutils/

[Sven Vermeulen]

commit:     81f31baf97cf9312497b9b4da8ab2100eb6264bc
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat May 26 14:45:33 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Sat May 26 14:45:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=81f31baf

Support python3

---
 sys-apps/policycoreutils/ChangeLog                 |  497 ++++++++++++++++++++
 .../policycoreutils-extra-1.21-fix-python3.patch   |  108 +++++
 sys-apps/policycoreutils/metadata.xml              |   21 +
 .../policycoreutils-2.1.10-r3.ebuild               |  141 ++++++
 4 files changed, 767 insertions(+), 0 deletions(-)

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
new file mode 100644
index 0000000..93130ad
--- /dev/null
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -0,0 +1,497 @@
+# ChangeLog for sys-apps/policycoreutils
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.98 2012/04/29 10:08:04 swift Exp $
+
+*policycoreutils-2.1.10-r2 (30 Apr 2012)
+
+  30 Apr 2012; <swift@g.o> +policycoreutils-2.1.10-r2.ebuild:
+  Updating rlpkg with proper python3 support
+
+*policycoreutils-2.1.10-r1 (29 Apr 2012)
+
+  29 Apr 2012; <swift@g.o> policycoreutils-2.1.10.ebuild,
+  +policycoreutils-2.1.10-r1.ebuild:
+  Remove dependency on libcgroup (but drop sesandbox support along the way)
+
+  29 Apr 2012; <swift@g.o> policycoreutils-2.1.10.ebuild:
+  Stabilization
+
+*policycoreutils-2.1.10 (31 Mar 2012)
+
+  31 Mar 2012; <swift@g.o> +policycoreutils-2.1.10.ebuild, metadata.xml:
+  Bump to version 2.1.10
+
+  26 Feb 2012; <swift@g.o> policycoreutils-2.1.0-r2.ebuild:
+  Stabilization
+
+  14 Jan 2012; <swift@g.o> +policycoreutils-2.1.0-r2.ebuild,
+  metadata.xml:
+  Mark audit as a local USE flag
+
+*policycoreutils-2.1.0-r2 (14 Jan 2012)
+
+  14 Jan 2012; <swift@g.o> +policycoreutils-2.1.0-r2.ebuild:
+  Override auto-detection of pam and audit, use USE flags for this
+
+  12 Nov 2011; <swift@g.o> -policycoreutils-2.0.82.ebuild,
+  -policycoreutils-2.0.82-r1.ebuild, -policycoreutils-2.0.85.ebuild,
+  -policycoreutils-2.1.0.ebuild:
+  removing obsoleted ebuilds
+
+  23 Oct 2011; <swift@g.o> policycoreutils-2.1.0-r1.ebuild:
+  Stabilization (tracker #384231)
+
+  23 Oct 2011; <swift@g.o> policycoreutils-2.0.82-r1.ebuild:
+  Stabilize 2.0.82-r1 to fix #372807
+
+*policycoreutils-2.1.0-r1 (17 Sep 2011)
+
+  17 Sep 2011; <swift@g.o> +policycoreutils-2.1.0-r1.ebuild:
+  Add /var/lib/selinux directory, needed for 'semodule permissive' support (bug
+  #381755)
+
+  02 Sep 2011; <swift@g.o> policycoreutils-2.0.85.ebuild,
+  policycoreutils-2.1.0.ebuild:
+  Update patch locations to dev.g.o instead of files/ folder
+
+  12 Aug 2011; Anthony G. Basile <blueness@g.o>
+  -policycoreutils-2.0.55.ebuild, -policycoreutils-2.0.69.ebuild,
+  -policycoreutils-2.0.69-r1.ebuild, -policycoreutils-2.0.69-r2.ebuild,
+  -files/policycoreutils-2.0.69-setfiles.diff:
+  Removed deprecated versions
+
+*policycoreutils-2.1.0 (03 Aug 2011)
+
+  03 Aug 2011; Anthony G. Basile <blueness@g.o>
+  +policycoreutils-2.1.0.ebuild:
+  Bump to 20110727 SELinux userspace release
+
+*policycoreutils-2.0.85 (15 Jul 2011)
+
+  15 Jul 2011; Anthony G. Basile <blueness@g.o>
+  +policycoreutils-2.0.85.ebuild,
+  +files/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz,
+  +files/policycoreutils-2.0.85-sesandbox.patch.gz:
+  Add fix for bug #374897 and initial support for python3
+
+  08 Jul 2011; Samuli Suominen <ssuominen@g.o>
+  policycoreutils-2.0.55.ebuild, policycoreutils-2.0.69.ebuild,
+  policycoreutils-2.0.69-r1.ebuild, policycoreutils-2.0.69-r2.ebuild:
+  Convert from "useq" to "use".
+
+*policycoreutils-2.0.82-r1 (30 Jun 2011)
+
+  30 Jun 2011; Anthony G. Basile <blueness@g.o>
+  +policycoreutils-2.0.82-r1.ebuild:
+  Overwrite invalid .po files with valid ones, fixes bug #372807
+
+  16 Jun 2011; Anthony G. Basile <blueness@g.o>
+  policycoreutils-2.0.82.ebuild:
+  Drop use_nls dependency on gettext. Its mandatory. See bug #299681.
+  Also put gettext in COMMON_DEPS, it is more than a RDEPEND.
+
+  28 May 2011; Anthony G. Basile <blueness@g.o>
+  policycoreutils-2.0.82.ebuild:
+  Stable amd64 x86
+
+  16 Apr 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata info.
+
+  08 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  policycoreutils-2.0.82.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #353762). Fix dependencies. Fix installation
+  with FEATURES="multilib-strict".
+
+*policycoreutils-2.0.82 (05 Feb 2011)
+
+  05 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +policycoreutils-2.0.82.ebuild:
+  New upstream release.
+
+*policycoreutils-2.0.69-r2 (05 Feb 2011)
+
+  05 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +policycoreutils-2.0.69-r2.ebuild,
+  +files/policycoreutils-2.0.69-setfiles.diff:
+  Fixed bug #300613
+
+  04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  policycoreutils-2.0.55.ebuild, policycoreutils-2.0.69.ebuild,
+  policycoreutils-2.0.69-r1.ebuild:
+  Delete calls to deprecated python_version().
+
+*policycoreutils-2.0.69-r1 (20 Sep 2009)
+
+  20 Sep 2009; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-2.0.69-r1.ebuild:
+  Update rlpkg for ext4 and btrfs.
+
+  14 Sep 2009; Chris PeBenito <pebenito@g.o>
+  policycoreutils-2.0.69.ebuild:
+  Fix libsemanage DEP.
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  policycoreutils-2.0.55.ebuild, policycoreutils-2.0.69.ebuild:
+  Add python_need_rebuild.
+
+*policycoreutils-2.0.69 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-2.0.69.ebuild:
+  New upstream release.
+
+  18 Jul 2009; Chris PeBenito <pebenito@g.o>
+  -policycoreutils-1.34.15.ebuild, policycoreutils-2.0.55.ebuild:
+  Mark stable. Remove old ebuilds.
+
+*policycoreutils-2.0.55 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-2.0.55.ebuild:
+  Initial commit of policycoreutils 2.0.
+
+  29 May 2008; Ali Polatel <hawking@g.o>
+  policycoreutils-1.34.15.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
+
+  26 May 2008; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.34.15.ebuild:
+  Fix libsemanage dependency.
+
+  13 May 2008; Chris PeBenito <pebenito@g.o>
+  -files/policycoreutils-1.28-quietlp.diff,
+  -files/policycoreutils-1.32-quietlp.diff,
+  -files/policycoreutils-unsigned-char-ppc.diff,
+  -policycoreutils-1.28.ebuild, -policycoreutils-1.30-r1.ebuild,
+  -policycoreutils-1.34.1.ebuild, -policycoreutils-1.34.11.ebuild,
+  policycoreutils-1.34.15.ebuild:
+  Mark 1.34.15 stable, clear old ebuilds.
+
+*policycoreutils-1.34.15 (29 Jan 2008)
+
+  29 Jan 2008; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.34.15.ebuild:
+  New upstream bugfix release.
+
+  19 Oct 2007; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.34.11.ebuild:
+  Fix quoting in unpack.
+
+*policycoreutils-1.34.11 (18 Oct 2007)
+
+  18 Oct 2007; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.34.11.ebuild:
+  New upstream release.
+
+  04 Jun 2007; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.34.1.ebuild:
+  Mark stable.
+
+*policycoreutils-1.34.1 (15 Feb 2007)
+
+  15 Feb 2007; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.34.1.ebuild:
+  New upstream release.
+
+  24 Oct 2006; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.30.30.ebuild:
+  Fix glibc handling.
+
+  09 Oct 2006; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.30.30.ebuild:
+  Stable to make repoman happy.
+
+*policycoreutils-1.30.30 (05 Oct 2006)
+
+  05 Oct 2006; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-1.32-quietlp.diff, +policycoreutils-1.30.30.ebuild:
+  Add SVN snapshot and updated extras in preparation for reference policy.
+
+  31 Jul 2006; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.30-r1.ebuild:
+  Mark stable, long overdue.
+
+*policycoreutils-1.30-r1 (28 Mar 2006)
+
+  28 Mar 2006; Chris PeBenito <pebenito@g.o>
+  -policycoreutils-1.30.ebuild, +policycoreutils-1.30-r1.ebuild:
+  Fix install location of python site packages.
+
+  22 Feb 2006; Stephen Bennett <spb@g.o> policycoreutils-1.28.ebuild:
+  Alpha stable
+
+  19 Feb 2006; Joshua Kinard <kumba@g.o> policycoreutils-1.28.ebuild:
+  Marked stable on mips.
+
+*policycoreutils-1.30 (18 Mar 2006)
+
+  18 Mar 2006; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.30.ebuild:
+  New upstream release.
+
+  05 Feb 2006; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-unsigned-char-ppc.diff,
+  policycoreutils-1.28.ebuild:
+  Add patch to fix #121689.
+
+  17 Jan 2006; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.28.ebuild:
+  Mark stable, x86, amd64, ppc, sparc.
+
+  14 Jan 2006; Stephen Bennett <spb@g.o> policycoreutils-1.28.ebuild:
+  Added ~alpha
+
+  15 Dec 2005; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.22.ebuild, policycoreutils-1.24-r2.ebuild,
+  policycoreutils-1.28.ebuild:
+  Tighten up versioning to try to prevent mismatch problems as seen in #112348.
+
+*policycoreutils-1.28 (09 Dec 2005)
+
+  09 Dec 2005; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-1.28-quietlp.diff, -policycoreutils-1.24-r1.ebuild,
+  +policycoreutils-1.28.ebuild:
+  New upstream release.
+
+*policycoreutils-1.24-r2 (08 Dec 2005)
+
+  08 Dec 2005; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.24-r2.ebuild:
+  Add compatability symlink for genhomedircon.
+
+*policycoreutils-1.24-r1 (09 Sep 2005)
+
+  09 Sep 2005; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.24-r1.ebuild:
+  Update for fixed selinuxconfig source policy path.
+
+  11 Jul 2005; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.22.ebuild, policycoreutils-1.24.ebuild:
+  Fix RDEPEND for building stages.  Libsepol is required now.
+
+*policycoreutils-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-1.24-genhomedircon-quiet.diff,
+  -policycoreutils-1.20-r1.ebuild, +policycoreutils-1.24.ebuild:
+  New upstream release.
+
+  10 May 2005; Stephen Bennett <spb@g.o> policycoreutils-1.22.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@g.o> policycoreutils-1.22.ebuild:
+  Added ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.22.ebuild:
+  Mark stable.
+
+*policycoreutils-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-1.22-genhomedircon-quiet.diff,
+  +policycoreutils-1.22.ebuild:
+  New upstream release.
+
+*policycoreutils-1.20-r1 (13 Feb 2005)
+
+  13 Feb 2005; Chris PeBenito <pebenito@g.o>
+  -policycoreutils-1.16.ebuild, +policycoreutils-1.20-r1.ebuild,
+  -policycoreutils-1.20.ebuild:
+  Add back some tools deleted from upstream libselinux.
+
+*policycoreutils-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.18-r1.ebuild, +policycoreutils-1.20.ebuild:
+  New upstream release. Mark 1.18-r1 stable.
+
+*policycoreutils-1.18-r1 (03 Jan 2005)
+
+  03 Jan 2005; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-nonls.diff, +policycoreutils-1.18-r1.ebuild:
+  Make pam and nls optional for embedded systems use.
+
+  22 Nov 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.18.ebuild:
+  Ensure a few dirs and perms during stage1 build.
+
+  15 Nov 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.18.ebuild:
+  Fix libsepol dep.
+
+*policycoreutils-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.18.ebuild:
+  New upstream release.
+
+*policycoreutils-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-1.16-genhomedircon-compat.diff,
+  +policycoreutils-1.16.ebuild:
+  New upstream release.
+
+  08 Aug 2004; Tom Martin <slarti@g.o> policycoreutils-1.12-r1.ebuild,
+  policycoreutils-1.12-r2.ebuild, policycoreutils-1.14.ebuild,
+  policycoreutils-1.4-r1.ebuild:
+  Typo in DESCRIPTION: utilites -> utilities. Bug 59717.
+
+  06 Jul 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.14.ebuild:
+  Bump extras to fix free() bug in runscript_selinux.so.
+
+*policycoreutils-1.12-r2 (06 Jul 2004)
+
+  06 Jul 2004; Chris PeBenito <pebenito@g.o>
+  +files/runscript-selinux.diff, +policycoreutils-1.12-r2.ebuild:
+  Fix free() error in runscript_selinux.so.
+
+  03 Jul 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.14.ebuild:
+  Update extras.
+
+*policycoreutils-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@g.o>
+  +files/policycoreutils-1.14-genhomedircon-compat.diff,
+  +policycoreutils-1.14.ebuild:
+  New upstream version.
+
+*policycoreutils-1.12-r1 (28 Jun 2004)
+
+  28 Jun 2004; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.12-r1.ebuild:
+  Add toggle_bool to extras.
+
+  11 Jun 2004; Chris PeBenito <pebenito@g.o>
+  -policycoreutils-1.10-r1.ebuild, policycoreutils-1.12.ebuild:
+  Mark stable
+
+*policycoreutils-1.12 (14 May 2004)
+
+  14 May 2004; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.12.ebuild:
+  New upstream release.
+
+*policycoreutils-1.10-r1 (28 Apr 2004)
+
+  28 Apr 2004; Chris PeBenito <pebenito@g.o>
+  +policycoreutils-1.10-r1.ebuild, -policycoreutils-1.10.ebuild,
+  -policycoreutils-1.8.ebuild:
+  Update extras and mark stable.
+
+*policycoreutils-1.10 (20 Apr 2004)
+
+  08 Apr 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.4-r1.ebuild, policycoreutils-1.8.ebuild:
+  More specific versioning for libselinux.
+
+  08 Apr 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.8.ebuild:
+  Mark stable for 2004.1
+
+  15 Mar 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.8.ebuild:
+  Update extras.
+
+*policycoreutils-1.8 (12 Mar 2004)
+
+  12 Mar 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.8.ebuild:
+  New upstream release.
+
+*policycoreutils-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.4-r1.ebuild, policycoreutils-1.6.ebuild:
+  New upstream release.  Mark 1.4-r1 stable.
+
+*policycoreutils-1.4-r1 (09 Feb 2004)
+
+  09 Feb 2004; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.4-r1.ebuild:
+  Move extras to mirrors, and add runscript_selinux.so.
+
+  31 Jan 2004; Chris PeBenito <pebenito@g.o> files/rlpkg:
+  Switch to portageq from inline python.  Add missing quotes for completeness.
+
+  16 Dec 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.4.ebuild:
+  Mark stable.
+
+*policycoreutils-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.4.ebuild:
+  New upstream version.
+
+*policycoreutils-1.2-r2 (23 Nov 2003)
+
+  23 Nov 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.2-r2.ebuild:
+  Bump to add /sbin/seinit.
+
+  29 Oct 2003; Joshua Brindle <method@g.o>
+  policycoreutils-1.2-r1.ebuild:
+  added sparc
+
+*policycoreutils-1.2-r1 (20 Oct 2003)
+
+  20 Oct 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.2-r1.ebuild:
+  Remove unneeded -lattr linking from Makefiles.
+
+  07 Oct 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.2.ebuild:
+  Mark stable.
+
+*policycoreutils-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.2.ebuild, files/policycoreutils-1.2-gentoo.diff:
+  New upstream version.
+
+  29 Sep 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.1-r1.ebuild:
+  Add build USE flag; when asserted, only setfiles is built and merged.
+
+  22 Sep 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.1-r1.ebuild:
+  Move selinux-base-policy RDEPEND to checkpolicy. No longer RDEPEND on
+  checkpolicy.
+
+  22 Sep 2003; <paul@g.o> metadata.xml:
+  Fix metadata.xml
+
+  24 Aug 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.1-r1.ebuild, policycoreutils-1.1.ebuild:
+  Mark stable
+
+*policycoreutils-1.1-r1 (18 Aug 2003)
+
+  18 Aug 2003; Chris PeBenito <pebenito@g.o> metadata.xml,
+  policycoreutils-1.0.ebuild, policycoreutils-1.1-r1.ebuild,
+  files/avc_enforcing, files/avc_toggle,
+  files/policycoreutils-1.1-setfiles.diff:
+  Add setfiles patch for alternate root. Add avc_enforcing and avc_toggle
+  scripts for ease of use for old API users. Use package description from RPM
+  spec file in metadata.xml long description.
+
+*policycoreutils-1.1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.1.ebuild:
+  New upstream version
+
+  10 Aug 2003; Chris PeBenito <pebenito@g.o>
+  policycoreutils-1.0.ebuild, files/rlpkg:
+  Add mkinitrd RDEP, add rlpkg.
+
+*policycoreutils-1.0 (03 Aug 2003)
+
+  03 Aug 2003; Chris PeBenito <pebenito@g.o> metadata.xml,
+  policycoreutils-1.0.ebuild, files/policycoreutils-1.0-gentoo.diff:
+  Initial commit
+

diff --git a/sys-apps/policycoreutils/files/policycoreutils-extra-1.21-fix-python3.patch b/sys-apps/policycoreutils/files/policycoreutils-extra-1.21-fix-python3.patch
new file mode 100644
index 0000000..66979ab
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-extra-1.21-fix-python3.patch
@@ -0,0 +1,108 @@
+diff -ur policycoreutils-extra.orig/scripts/rlpkg policycoreutils-extra/scripts/rlpkg
+--- policycoreutils-extra.orig/scripts/rlpkg	2012-05-01 16:01:43.321023704 +0200
++++ policycoreutils-extra/scripts/rlpkg	2012-05-01 16:01:53.192023725 +0200
+@@ -86,7 +86,7 @@
+ 		t = portage.db["/"]["vartree"].dbapi.match(search_key)
+ 	# catch the "amgigous package" Exception
+ 	except ValueError as e:
+-		if type(e[0]) == types.ListType:
++		if type(e[0]) == list:
+ 			t = []
+ 			for cp in e[0]:
+ 				t += portage.db["/"]["vartree"].dbapi.match(cp)
+@@ -112,7 +112,7 @@
+ 
+ def find_xattr_mounts():
+ 	"""Find mounted xattr filesystems"""
+-	print("Relabeling filesystem types: "+" ".join(xattrfs))
++	print(("Relabeling filesystem types: "+" ".join(xattrfs)))
+ 	mounts=open("/etc/mtab", "r")
+ 
+ 	fs_matches=[]
+@@ -158,29 +158,29 @@
+ 
+ 		(ret,context) = selinux.getfilecon(filename)
+ 		if ret < 0:
+-			print("Error getting context of "+filename)
++			print(("Error getting context of "+filename))
+ 			continue
+ 
+ 		ctx = string.split(context,":")
+ 
+ 		if len(ctx) < 3:
+-			print("Debug: getfilecon on \""+filename+"\" returned a context of \""+context+"\" which split incorrectly ("+ctx+").")
++			print(("Debug: getfilecon on \""+filename+"\" returned a context of \""+context+"\" which split incorrectly ("+ctx+")."))
+ 			continue
+ 
+ 		if ctx[2] in textrel_ok_relabelfrom:
+ 			if verbose:
+-				print("Relabeling "+filename+" to "+textrel_type+".")
++				print(("Relabeling "+filename+" to "+textrel_type+"."))
+ 			ctx[2] = textrel_type
+ 			if selinux.setfilecon(filename,string.join(ctx,":")) < 0:
+-				print("Failed to relabel "+filename)
++				print(("Failed to relabel "+filename))
+ 		elif ctx[2] == textrel_type:
+ 			if verbose:
+-				print("Skipping "+filename+" because it is already "+textrel_type+".")
++				print(("Skipping "+filename+" because it is already "+textrel_type+"."))
+ 		else:
+-			print("Not relabeling "+filename+" because it is "+ctx[2]+".")
++			print(("Not relabeling "+filename+" because it is "+ctx[2]+"."))
+ 			notok += 1
+ 
+-	print("%(a)d libraries with text relocations, %(b)d not relabeled." % {"a":textrel_libs, "b":notok})
++	print(("%(a)d libraries with text relocations, %(b)d not relabeled." % {"a":textrel_libs, "b":notok}))
+ 
+ 	if notok > 0:
+ 		print("\nSome files were not relabeled!  This is not necessarily bad,")
+@@ -197,10 +197,10 @@
+ 
+ 	textrel_bins = 0
+ 	for line in tb.stdout.readline():
+-		print("PIE executable "+line.split()[1]+" has text relocations!")
++		print(("PIE executable "+line.split()[1]+" has text relocations!"))
+ 		textrel_bins += 1
+ 
+-	print("%d binaries with text relocations detected." % (textrel_bins))
++	print(("%d binaries with text relocations detected." % (textrel_bins)))
+ 
+ 	if textrel_bins > 0:
+ 		print("\nPIE binaries with text relocations have been detected!")
+@@ -234,8 +234,8 @@
+ 	childin = os.popen(string.join(cmdline),'w')
+ 
+ 	for i in pkglist:
+-		print("Relabeling: "+i.get_cpv())
+-		for j in i.get_contents().keys():
++		print(("Relabeling: "+i.get_cpv()))
++		for j in list(i.get_contents().keys()):
+ 			childin.write(j+'\n')
+ 
+ 	rc = childin.close()
+@@ -245,14 +245,14 @@
+ 	if rc == None:
+ 		rc = 0
+ 	else:
+-		print("Error relabeling: %d" % (rc))
++		print(("Error relabeling: %d" % (rc)))
+ 
+ 	return rc
+ 
+ def usage(message=""):
+ 	pgmname = os.path.basename(sys.argv[0])
+ 
+-	print("Usage: %s [OPTIONS] {<pkg1> [<pkg2> ...]}" % (pgmname))
++	print(("Usage: %s [OPTIONS] {<pkg1> [<pkg2> ...]}" % (pgmname)))
+ 	print("\n\
+   -a, --all	 Relabel the entire filesystem instead of individual packages.\n\
+   -r, --reset	 Force reset of context if the file's selinux identity is\n\
+@@ -266,7 +266,7 @@
+ \"policycoreutils\" or \">=sys-apps/policycoreutils-1.30\".\n\
+ ")
+ 	if message != "":
+-		print(pgmname+": "+message)
++		print((pgmname+": "+message))
+ 		sys.exit(1)
+ 	else:
+ 		sys.exit(0)

diff --git a/sys-apps/policycoreutils/metadata.xml b/sys-apps/policycoreutils/metadata.xml
new file mode 100644
index 0000000..e7a78d9
--- /dev/null
+++ b/sys-apps/policycoreutils/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>
+		Policycoreutils contains the policy core utilities that are required
+		for basic operation of a SELinux system.  These utilities include
+		load_policy to load policies, setfiles to label filesystems, newrole
+		to switch roles, and run_init to run /etc/init.d scripts in the proper
+		context.
+
+		Gentoo-specific tools include rlpkg for relabeling packages by name,
+		avc_toggle to toggle between enforcing and permissive modes, and
+		avc_enforcing to query the current mode of the system, enforcing or
+		permissive.
+	</longdescription>
+	<use>
+	  <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg> and use the audit_* functions (like audit_getuid instead of getuid())</flag>
+	  <flag name='sesandbox'>Enable support for SELinux sandbox application</flag>
+	</use>
+</pkgmetadata>

diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.10-r3.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.10-r3.ebuild
new file mode 100644
index 0000000..d474c87
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.10-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.10-r1.ebuild,v 1.1 2012/04/29 10:08:04 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit multilib python toolchain-funcs eutils
+
+EXTRAS_VER="1.21"
+SEMNG_VER="2.1.6"
+SELNX_VER="2.1.9"
+SEPOL_VER="2.1.4"
+
+IUSE="audit pam dbus sesandbox"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${P}-gentoo-r1.tar.gz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+	>=sys-libs/glibc-2.4
+	>=sys-libs/libcap-1.10-r10
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
+	sys-libs/libcap-ng
+	>=sys-libs/libsepol-${SEPOL_VER}
+	sys-devel/gettext
+	dev-python/ipy
+	sesandbox? ( dev-libs/libcgroup )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	audit? ( >=sys-process/audit-1.5.1 )
+	pam? ( sys-libs/pam )"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+S2=${WORKDIR}/policycoreutils-extra
+
+src_prepare() {
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Overwrite gl.po, id.po and et.po with valid PO file
+	cp "${S}/po/sq.po" "${S}/po/gl.po" || die "failed to copy ${S}/po/sq.po to gl.po"
+	cp "${S}/po/sq.po" "${S}/po/id.po" || die "failed to copy ${S}/po/sq.po to id.po"
+	cp "${S}/po/sq.po" "${S}/po/et.po" || die "failed to copy ${S}/po/sq.po to et.po"
+	# Fixes for Python 3 support in the extras
+	cd "${S2}";
+	epatch "${FILESDIR}/policycoreutils-extra-1.21-fix-python3.patch"
+}
+
+src_compile() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+	use sesandbox && use_sesandbox="y";
+
+	python_copy_sources semanage sandbox
+	building() {
+		einfo "Compiling policycoreutils"
+		emake -C "${S}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+		einfo "Compiling policycoreutils-extra "
+		emake -C "${S2}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+	}
+	python_execute_function -s --source-dir semanage building
+}
+
+src_install() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+	use sesandbox && use_sesandbox="y";
+
+	# Python scripts are present in many places. There are no extension modules.
+	installation() {
+		einfo "Installing policycoreutils"
+		emake -C "${S}" DESTDIR="${T}/images/${PYTHON_ABI}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="python$(python_get_version)" install || return 1
+
+		einfo "Installing policycoreutils-extra"
+		emake -C "${S2}" DESTDIR="${T}/images/${PYTHON_ABI}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d"
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
+
+	# location for permissive definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+}
+
+pkg_postinst() {
+	python_mod_optimize seobject.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup seobject.py
+}