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

[Sven Vermeulen]

commit:     0774b7fff0e4abdc907b6a57e13eddb5ba9aaa60
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Tue Aug  2 20:27:20 2011 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Tue Aug  2 20:27:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0774b7ff

Bump to 20110727 userspace release for SELinux utilities

---
 dev-python/sepolgen/ChangeLog                      |   57 +++
 dev-python/sepolgen/metadata.xml                   |    6 +
 dev-python/sepolgen/sepolgen-1.1.0.ebuild          |   57 +++
 sys-apps/checkpolicy/ChangeLog                     |  266 ++++++++++++
 sys-apps/checkpolicy/checkpolicy-2.1.0.ebuild      |   41 ++
 sys-apps/checkpolicy/metadata.xml                  |    6 +
 sys-apps/policycoreutils/ChangeLog                 |  441 ++++++++++++++++++++
 .../files/policycoreutils-2.0.69-setfiles.diff     |   12 +
 ...icycoreutils-2.0.85-fix-seunshare-vuln.patch.gz |  Bin 0 -> 8962 bytes
 .../policycoreutils-2.0.85-sesandbox.patch.gz      |  Bin 0 -> 4551 bytes
 sys-apps/policycoreutils/metadata.xml              |   17 +
 .../policycoreutils/policycoreutils-2.1.0.ebuild   |  115 +++++
 sys-libs/libselinux/ChangeLog                      |  326 +++++++++++++++
 sys-libs/libselinux/libselinux-2.1.0.ebuild        |   83 ++++
 sys-libs/libselinux/metadata.xml                   |   10 +
 sys-libs/libsemanage/ChangeLog                     |  170 ++++++++
 sys-libs/libsemanage/libsemanage-2.1.0.ebuild      |  121 ++++++
 sys-libs/libsemanage/metadata.xml                  |    6 +
 sys-libs/libsepol/ChangeLog                        |  188 +++++++++
 sys-libs/libsepol/libsepol-2.1.0.ebuild            |   39 ++
 sys-libs/libsepol/metadata.xml                     |    6 +
 21 files changed, 1967 insertions(+), 0 deletions(-)

diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
new file mode 100644
index 0000000..dd1fd23
--- /dev/null
+++ b/dev-python/sepolgen/ChangeLog
@@ -0,0 +1,57 @@
+# ChangeLog for dev-python/sepolgen
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.11 2011/05/28 05:34:22 blueness Exp $
+
+*sepolgen-1.1.0 (02 Aug 2011)
+
+  02 Aug 2011; <swift@g.o> +sepolgen-1.1.0.ebuild, +metadata.xml:
+  Bump to 20110727 release of SELinux userspace
+
+  28 May 2011; Anthony G. Basile <blueness@g.o> sepolgen-1.0.23.ebuild:
+  Stable amd64 x86
+
+  25 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  sepolgen-1.0.13.ebuild, sepolgen-1.0.17.ebuild, sepolgen-1.0.17-r1.ebuild:
+  Fix deprecation warnings.
+
+  13 Feb 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata.xml to reflect new selinux herd.
+
+  06 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  sepolgen-1.0.23.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #345551).
+
+*sepolgen-1.0.23 (06 Feb 2011)
+
+  06 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +sepolgen-1.0.23.ebuild:
+  New upstream release.
+
+  04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  sepolgen-1.0.13.ebuild, sepolgen-1.0.17.ebuild, sepolgen-1.0.17-r1.ebuild:
+  Delete calls to deprecated python_version().
+
+*sepolgen-1.0.17-r1 (16 Dec 2009)
+
+  16 Dec 2009; Chris PeBenito <pebenito@g.o>
+  +sepolgen-1.0.17-r1.ebuild:
+  Fix build tests for #296737.
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o> sepolgen-1.0.13.ebuild,
+  sepolgen-1.0.17.ebuild:
+  Fix bug #244742.
+
+*sepolgen-1.0.17 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o> +sepolgen-1.0.17.ebuild:
+  New upstream release.
+
+  18 Jul 2009; Chris PeBenito <pebenito@g.o> sepolgen-1.0.13.ebuild:
+  Mark stable. Remove old ebuilds.
+
+*sepolgen-1.0.13 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@g.o> +metadata.xml,
+  +sepolgen-1.0.13.ebuild:
+  Initial commit.
+

diff --git a/dev-python/sepolgen/metadata.xml b/dev-python/sepolgen/metadata.xml
new file mode 100644
index 0000000..d75890e
--- /dev/null
+++ b/dev-python/sepolgen/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Python module needed for audit2allow</longdescription>
+</pkgmetadata>

diff --git a/dev-python/sepolgen/sepolgen-1.1.0.ebuild b/dev-python/sepolgen/sepolgen-1.1.0.ebuild
new file mode 100644
index 0000000..dee1fa2
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-1.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.0.23.ebuild,v 1.3 2011/05/28 05:34:22 blueness Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+
+inherit python
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/libselinux-2.0[python]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix up default paths to not be RH specific
+	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
+		"${S}/src/sepolgen/defaults.py" || die
+	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
+		"${S}/src/sepolgen/module.py" || die
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	if has_version sec-policy/selinux-base-policy; then
+		python_src_test
+	else
+		ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+	fi
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+	}
+	python_execute_function installation
+}
+
+pkg_postinst() {
+	python_mod_optimize sepolgen
+}
+
+pkg_postrm() {
+	python_mod_cleanup sepolgen
+}

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
new file mode 100644
index 0000000..1824979
--- /dev/null
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -0,0 +1,266 @@
+# ChangeLog for sys-apps/checkpolicy
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.59 2011/07/15 20:54:05 blueness Exp $
+
+*checkpolicy-2.1.0 (02 Aug 2011)
+
+  02 Aug 2011; <swift@g.o> +checkpolicy-2.1.0.ebuild, +metadata.xml:
+  Bump to 20110727 SELinux userspace
+
+*checkpolicy-2.0.23 (15 Jul 2011)
+
+  15 Jul 2011; Anthony G. Basile <blueness@g.o>
+  +checkpolicy-2.0.23.ebuild:
+  Bump to 2.0.23 - proxy for SwifT
+
+  08 Jul 2011; Samuli Suominen <ssuominen@g.o>
+  checkpolicy-2.0.16.ebuild, checkpolicy-2.0.19.ebuild:
+  Convert from "useq" to "use".
+
+  28 May 2011; Anthony G. Basile <blueness@g.o>
+  checkpolicy-2.0.19.ebuild:
+  Fixed minor syntax
+
+  28 May 2011; Anthony G. Basile <blueness@g.o>
+  checkpolicy-2.0.21.ebuild:
+  Stable amd64 x86
+
+  13 Feb 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata.xml to reflect new selinux herd.
+
+  08 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  checkpolicy-2.0.21.ebuild:
+  Respect CC.
+
+*checkpolicy-2.0.21 (05 Feb 2011)
+
+  05 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +checkpolicy-2.0.21.ebuild:
+  New upstream release.
+
+*checkpolicy-2.0.19 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-2.0.19.ebuild:
+  New upstream release.
+
+  22 Jul 2009; Chris PeBenito <pebenito@g.o>
+  -checkpolicy-1.34.4.ebuild, checkpolicy-2.0.16.ebuild:
+  Mark stable. Remove old ebuilds.
+
+*checkpolicy-2.0.16 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-2.0.16.ebuild:
+  Initial commit of checkpolicy 2.0.
+
+  10 Sep 2008; Chris PeBenito <pebenito@g.o>
+  checkpolicy-1.34.4.ebuild:
+  Remove rdep on flex and bison as they are build tools.
+
+  26 May 2008; Chris PeBenito <pebenito@g.o>
+  checkpolicy-1.34.4.ebuild:
+  Fix libsemanage dependency.
+
+  13 May 2008; Chris PeBenito <pebenito@g.o>
+  -files/checkpolicy-1.30.1.diff, -checkpolicy-1.28.ebuild,
+  -checkpolicy-1.30-r1.ebuild, -checkpolicy-1.34.0.ebuild,
+  -checkpolicy-1.34.3.ebuild, checkpolicy-1.34.4.ebuild:
+  Mark 1.34.4 stable, clear old ebuilds.
+
+*checkpolicy-1.34.4 (29 Jan 2008)
+
+  29 Jan 2008; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.34.4.ebuild:
+  New upstream bugfix release.
+
+*checkpolicy-1.34.3 (18 Oct 2007)
+
+  18 Oct 2007; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.34.3.ebuild:
+  New upstream release.
+
+  04 Jun 2007; Chris PeBenito <pebenito@g.o>
+  checkpolicy-1.34.0.ebuild:
+  Mark stable.
+
+*checkpolicy-1.34.0 (15 Feb 2007)
+
+  15 Feb 2007; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.34.0.ebuild:
+  New upstream release.
+
+*checkpolicy-1.30.12 (05 Oct 2006)
+
+  05 Oct 2006; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.30.12.ebuild:
+  Add SVN snapshot.
+
+  31 Jul 2006; Chris PeBenito <pebenito@g.o>
+  checkpolicy-1.30-r1.ebuild:
+  Mark stable, long overdue.
+
+*checkpolicy-1.30-r1 (24 Mar 2006)
+
+  24 Mar 2006; Chris PeBenito <pebenito@g.o>
+  +files/checkpolicy-1.30.1.diff, -checkpolicy-1.30.ebuild,
+  +checkpolicy-1.30-r1.ebuild:
+  Upstream bugfix for require blocks in base module.
+
+*checkpolicy-1.30 (18 Mar 2006)
+
+  18 Mar 2006; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.30.ebuild:
+  New upstream release.
+
+  22 Feb 2006; Stephen Bennett <spb@g.o> checkpolicy-1.28.ebuild:
+  Alpha stable
+
+  19 Feb 2006; Joshua Kinard <kumba@g.o> checkpolicy-1.28.ebuild:
+  Marked stable on mips.
+
+  17 Jan 2006; Chris PeBenito <pebenito@g.o> checkpolicy-1.28.ebuild:
+  Mark stable, x86, amd64, ppc, sparc.
+
+  14 Jan 2006; Stephen Bennett <spb@g.o> checkpolicy-1.28.ebuild:
+  Added ~alpha
+
+  15 Dec 2005; Chris PeBenito <pebenito@g.o> checkpolicy-1.24.ebuild,
+  checkpolicy-1.28.ebuild:
+  Tighten up versioning to try to prevent mismatch problems as seen in #112348.
+
+*checkpolicy-1.28 (09 Dec 2005)
+
+  09 Dec 2005; Chris PeBenito <pebenito@g.o>
+  -checkpolicy-1.22.ebuild, +checkpolicy-1.28.ebuild:
+  New upstream release.
+
+  09 Sep 2005; Chris PeBenito <pebenito@g.o> checkpolicy-1.24.ebuild:
+  Mark stable.
+
+*checkpolicy-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@g.o>
+  -checkpolicy-1.20.ebuild, +checkpolicy-1.24.ebuild:
+  New upstream release.
+
+  10 May 2005; Stephen Bennett <spb@g.o> checkpolicy-1.22.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@g.o> checkpolicy-1.22.ebuild:
+  Added ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@g.o> checkpolicy-1.22.ebuild:
+  Mark stable.
+
+*checkpolicy-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.22.ebuild:
+  New upstream release.
+
+  13 Feb 2005; Chris PeBenito <pebenito@g.o> checkpolicy-1.20.ebuild:
+  Mark stable.
+
+*checkpolicy-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@g.o> checkpolicy-1.18.ebuild,
+  +checkpolicy-1.20.ebuild:
+  New upstream release.  Mark 1.18 stable.
+
+*checkpolicy-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@g.o>
+  +checkpolicy-1.18.ebuild:
+  New upstream release.
+
+  15 Sep 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.16.ebuild:
+  Fix Makefile for multiple compile jobs.
+
+*checkpolicy-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@g.o> +checkpolicy-1.16.ebuild:
+  New upstream release.
+
+*checkpolicy-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@g.o> +checkpolicy-1.14.ebuild:
+  New upstream version.  This compiles policy versions 15 to 18.
+
+  27 Apr 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.10.ebuild:
+  Make it listen to LDFLAGS.
+
+*checkpolicy-1.10 (18 Apr 2004)
+
+  18 Apr 2004; Chris PeBenito <pebenito@g.o> +checkpolicy-1.10.ebuild:
+  New upstream version.
+
+  08 Apr 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.8.ebuild:
+  Mark stable for 2004.1
+
+*checkpolicy-1.8 (12 Mar 2004)
+
+  12 Mar 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.8.ebuild:
+  New upstream release.
+
+*checkpolicy-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.6.ebuild:
+  New upstream release.
+
+  26 Jan 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.4-r1.ebuild:
+  Mark stable.
+
+*checkpolicy-1.4-r1 (17 Jan 2004)
+
+  17 Jan 2004; Chris PeBenito <pebenito@g.o> checkpolicy-1.4-r1.ebuild,
+  files/checkpolicy-1.4-negset.diff:
+  Add patch to exclude types in TE rules.
+
+  16 Dec 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.4.ebuild:
+  Mark stable.
+
+*checkpolicy-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.4.ebuild:
+  New upstream version.
+
+  29 Oct 2003; Joshua Brindle <method@g.o> checkpolicy-1.2.ebuild:
+  added sparc
+
+  07 Oct 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.2.ebuild:
+  Mark stable.
+
+*checkpolicy-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.2.ebuild,
+  files/checkpolicy-1.2-gentoo.diff:
+  New upstream version.
+
+  22 Sep 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.1.ebuild:
+  Add selinux-base-policy dependancy.
+
+  22 Sep 2003; <paul@g.o> metadata.xml:
+  Fix metadata.xml
+
+  24 Aug 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.0-r1.ebuild,
+  checkpolicy-1.1.ebuild, files/checkpolicy-little_endian.diff:
+  Mark stable
+
+*checkpolicy-1.1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.1.ebuild:
+  New upstream version
+
+*checkpolicy-1.0-r1 (13 Aug 2003)
+
+  13 Aug 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.0-r1.ebuild,
+  checkpolicy-1.0.ebuild, files/checkpolicy-little_endian.diff:
+  Add endian-ness fix
+
+*checkpolicy-1.0 (03 Aug 2003)
+
+  03 Aug 2003; Chris PeBenito <pebenito@g.o> checkpolicy-1.0.ebuild,
+  metadata.xml, files/checkpolicy-1.0-gentoo.diff:
+  Initial commit
+

diff --git a/sys-apps/checkpolicy/checkpolicy-2.1.0.ebuild b/sys-apps/checkpolicy/checkpolicy-2.1.0.ebuild
new file mode 100644
index 0000000..b106540
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.0.23.ebuild,v 1.1 2011/07/15 20:54:05 blueness Exp $
+
+inherit toolchain-funcs
+
+SEPOL_VER="2.1.0"
+SEMNG_VER="2.1.0"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libsemanage-${SEMNG_VER}
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" YACC="bison -y" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
+}

diff --git a/sys-apps/checkpolicy/metadata.xml b/sys-apps/checkpolicy/metadata.xml
new file mode 100644
index 0000000..92f48e0
--- /dev/null
+++ b/sys-apps/checkpolicy/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>SELinux policy compilier</longdescription>
+</pkgmetadata>

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
new file mode 100644
index 0000000..13c6ced
--- /dev/null
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -0,0 +1,441 @@
+# ChangeLog for sys-apps/policycoreutils
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.87 2011/07/15 23:29:30 blueness Exp $
+
+*policycoreutils-2.1.0 (02 Aug 2011)
+
+  02 Aug 2011; <swift@g.o> +files/policycoreutils-2.0.69-setfiles.diff,
+  +files/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz,
+  +files/policycoreutils-2.0.85-sesandbox.patch.gz,
+  +policycoreutils-2.1.0.ebuild, +metadata.xml:
+  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-2.0.69-setfiles.diff b/sys-apps/policycoreutils/files/policycoreutils-2.0.69-setfiles.diff
new file mode 100644
index 0000000..7ad233d
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-2.0.69-setfiles.diff
@@ -0,0 +1,12 @@
+*** setfiles/setfiles.c	2010-12-03 23:49:12.372000001 +0000
+--- setfiles/setfiles.c	2010-12-03 01:21:09.435000002 +0000
+***************
+*** 12,17 ****
+--- 12,18 ----
+ #include <regex.h>
+ #include <sys/vfs.h>
+ #include <sys/utsname.h>
++#include <sys/stat.h>
+ #define __USE_XOPEN_EXTENDED 1	/* nftw */
+ #define SKIP -2
+ #define ERR -1

diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz b/sys-apps/policycoreutils/files/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz
new file mode 100644
index 0000000..d58b5b3
Binary files /dev/null and b/sys-apps/policycoreutils/files/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz differ

diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.0.85-sesandbox.patch.gz b/sys-apps/policycoreutils/files/policycoreutils-2.0.85-sesandbox.patch.gz
new file mode 100644
index 0000000..336dcb2
Binary files /dev/null and b/sys-apps/policycoreutils/files/policycoreutils-2.0.85-sesandbox.patch.gz differ

diff --git a/sys-apps/policycoreutils/metadata.xml b/sys-apps/policycoreutils/metadata.xml
new file mode 100644
index 0000000..87cddb0
--- /dev/null
+++ b/sys-apps/policycoreutils/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+</pkgmetadata>

diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild
new file mode 100644
index 0000000..ef4966a
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild,v 1.1 2011/07/15 23:29:30 blueness Exp $
+
+EAPI="3"
+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.0"
+SELNX_VER="2.1.0"
+SEPOL_VER="2.1.0"
+
+IUSE=""
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2
+	mirror://gentoo/policycoreutils-2.0.85-python3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+	>=sys-libs/glibc-2.4
+	>=sys-process/audit-1.5.1
+	>=sys-libs/libcap-1.10-r10
+	sys-libs/pam
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
+	sys-libs/libcap-ng
+	>=sys-libs/libsepol-${SEPOL_VER}
+	sys-devel/gettext"
+
+# 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"
+	# We currently do not support MCS, so the sandbox code in policycoreutils
+	# is not usable yet. However, work for MCS is on the way and a reported
+	# vulnerability (bug #374897) might go by unnoticed if we ignore it now.
+	# As such, we will
+	# - prepare support for switching name from "sandbox" to "sesandbox"
+	epatch "${FILESDIR}/policycoreutils-2.0.85-sesandbox.patch.gz"
+	# - patch the sandbox and seunshare code to fix the vulnerability
+	#   (uses, with permission, extract from
+	#   http://pkgs.fedoraproject.org/gitweb/?p=policycoreutils.git;a=blob_plain;f=policycoreutils-rhat.patch;hb=HEAD)
+	epatch "${FILESDIR}/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz"
+	# But for now, disable building sandbox code
+	sed -i -e 's/sandbox //' "${S}/Makefile" || die "failed removing sandbox"
+	# 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"
+	# Fixed scripts for Python 3 support
+	cp "${WORKDIR}/seobject.py" "${S}/semanage/seobject.py" || die "failed to copy seobject.py"
+	cp "${WORKDIR}/semanage" "${S}/semanage/semanage" || die "failed to copy semanage"
+	cp "${WORKDIR}/chcat" "${S}/scripts/chcat" || die "failed to copy chcat"
+	cp "${WORKDIR}/audit2allow" "${S}/audit2allow/audit2allow" || die "failed to copy audit2allow"
+}
+
+src_compile() {
+	python_copy_sources semanage sandbox
+	building() {
+		einfo "Compiling policycoreutils"
+		emake -C "${S}" AUDIT_LOG_PRIVS="y" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+		einfo "Compiling policycoreutils-extra"
+		emake -C "${S2}" AUDIT_LOG_PRIVS="y" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+	}
+	python_execute_function -s --source-dir semanage building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation() {
+		einfo "Installing policycoreutils"
+		emake -C "${S}" DESTDIR="${T}/images/${PYTHON_ABI}" 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
+}
+
+pkg_postinst() {
+	python_mod_optimize seobject.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup seobject.py
+}

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
new file mode 100644
index 0000000..48d9d3b
--- /dev/null
+++ b/sys-libs/libselinux/ChangeLog
@@ -0,0 +1,326 @@
+# ChangeLog for sys-libs/libselinux
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.72 2011/07/15 20:57:55 blueness Exp $
+
+*libselinux-2.1.0 (02 Aug 2011)
+
+  02 Aug 2011; <swift@g.o> +libselinux-2.1.0.ebuild, +metadata.xml:
+  Bump to 20110727 SELinux userspace release
+
+*libselinux-2.0.98 (15 Jul 2011)
+
+  15 Jul 2011; Anthony G. Basile <blueness@g.o>
+  +libselinux-2.0.98.ebuild:
+  Bump to 2.0.98 - proxy for SwifT
+
+  28 May 2011; Anthony G. Basile <blueness@g.o>
+  libselinux-2.0.94.ebuild:
+  Stable amd64 x86
+
+  13 Feb 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata.xml to reflect new selinux herd.
+
+  06 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libselinux-2.0.94.ebuild:
+  Add "python" USE flag.
+
+  05 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libselinux-2.0.94.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #353763). Respect AR and CC.
+
+*libselinux-2.0.94 (05 Feb 2011)
+
+  05 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +libselinux-2.0.94.ebuild:
+  New upstream release.
+
+  29 Sep 2010; Mike Frysinger <vapier@g.o> libselinux-2.0.85.ebuild,
+  +files/libselinux-2.0.85-headers.patch:
+  Fix by Chris Richards for building with glibc-2.12 #338302.
+
+  16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libselinux-2.0.71.ebuild, libselinux-2.0.85.ebuild:
+  Delete calls to deprecated python_version().
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  libselinux-2.0.71.ebuild, libselinux-2.0.85.ebuild:
+  Add python_need_rebuild.
+
+*libselinux-2.0.85 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  +libselinux-2.0.85.ebuild:
+  New upstream release.
+
+  18 Jul 2009; Chris PeBenito <pebenito@g.o>
+  -libselinux-1.34.14.ebuild, libselinux-2.0.71.ebuild:
+  Mark stable. Remove old ebuilds.
+
+*libselinux-2.0.71 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@g.o>
+  +libselinux-2.0.71.ebuild:
+  Initial commit of 2.0 libselinux.
+
+  29 May 2008; Ali Polatel <hawking@g.o> libselinux-1.34.14.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
+
+  13 May 2008; Chris PeBenito <pebenito@g.o>
+  -libselinux-1.28-r1.ebuild, -libselinux-1.30.ebuild,
+  -libselinux-1.34.0.ebuild, -libselinux-1.34.13.ebuild,
+  libselinux-1.34.14.ebuild:
+  Mark 1.34.14 stable, clear old ebuilds.
+
+  11 May 2008; Chris PeBenito <pebenito@g.o>
+  libselinux-1.34.0.ebuild, libselinux-1.34.13.ebuild,
+  libselinux-1.34.14.ebuild:
+  Fix bug #221501.
+
+*libselinux-1.34.14 (29 Jan 2008)
+
+  29 Jan 2008; Chris PeBenito <pebenito@g.o>
+  +libselinux-1.34.14.ebuild:
+  New upstream bugfix release.
+
+*libselinux-1.34.13 (18 Oct 2007)
+
+  18 Oct 2007; Chris PeBenito <pebenito@g.o>
+  +libselinux-1.34.13.ebuild:
+  New upstream release.
+
+  04 Jun 2007; Chris PeBenito <pebenito@g.o>
+  libselinux-1.34.0.ebuild:
+  Mark stable.
+
+  16 Feb 2007; Stephen Bennett <spb@g.o> libselinux-1.34.0.ebuild:
+  Add missing swig depend. Bug #167007
+
+*libselinux-1.34.0 (15 Feb 2007)
+
+  15 Feb 2007; Chris PeBenito <pebenito@g.o>
+  +libselinux-1.34.0.ebuild:
+  New upstream release.
+
+  23 Oct 2006; Chris PeBenito <pebenito@g.o>
+  libselinux-1.30.29.ebuild:
+  Fix depend for glibc
+
+  09 Oct 2006; Chris PeBenito <pebenito@g.o>
+  libselinux-1.30.29.ebuild:
+  Stable to make repoman happy.
+
+*libselinux-1.30.29 (05 Oct 2006)
+
+  05 Oct 2006; Chris PeBenito <pebenito@g.o>
+  +libselinux-1.30.29.ebuild:
+  Add SVN snapshot.
+
+  31 Jul 2006; Chris PeBenito <pebenito@g.o> libselinux-1.30.ebuild:
+  Mark stable, long overdue.
+
+  07 Apr 2006; Chris PeBenito <pebenito@g.o> libselinux-1.30.ebuild:
+  Split python wrapper compile into a separate emake to ensure the main
+  library is built before trying to build the wrapper. Fixes bug #129074.
+
+  22 Mar 2006; Chris PeBenito <pebenito@g.o> -libselinux-1.24.ebuild,
+  -libselinux-1.28.ebuild, libselinux-1.28-r1.ebuild:
+  Mark 1.28-r1 stable, clean out old ebuilds.
+
+*libselinux-1.30 (18 Mar 2006)
+
+  18 Mar 2006; Chris PeBenito <pebenito@g.o> +libselinux-1.30.ebuild:
+  New upstream release.
+
+  22 Feb 2006; Stephen Bennett <spb@g.o> libselinux-1.28.ebuild:
+  Alpha stable
+
+*libselinux-1.28-r1 (20 Feb 2006)
+
+  20 Feb 2006; Chris PeBenito <pebenito@g.o> +files/compat.py,
+  +libselinux-1.28-r1.ebuild:
+  Add python-selinux compatability aliases to swig wrapper.
+
+  19 Feb 2006; Joshua Kinard <kumba@g.o> libselinux-1.28.ebuild:
+  Marked stable on mips.
+
+  09 Feb 2006; Chris PeBenito <pebenito@g.o> libselinux-1.28.ebuild:
+  Move python_version out of global scope.
+
+  29 Jan 2006; Chris PeBenito <pebenito@g.o> libselinux-1.28.ebuild:
+  Add python version handling to fix #120829, and add -fPIC to LDFLAGS to
+  hopefully fix #119271.
+
+  17 Jan 2006; Chris PeBenito <pebenito@g.o> libselinux-1.28.ebuild:
+  Mark stable, x86, amd64, ppc, sparc.
+
+  14 Jan 2006; Stephen Bennett <spb@g.o> libselinux-1.28.ebuild:
+  Added ~alpha
+
+  15 Dec 2005; Chris PeBenito <pebenito@g.o> libselinux-1.28.ebuild:
+  Tighten up versioning to try to prevent mismatch problems as seen in #112348.
+
+*libselinux-1.28 (09 Dec 2005)
+
+  09 Dec 2005; Chris PeBenito <pebenito@g.o>
+  -files/libselinux-1.22.diff, -libselinux-1.22-r1.ebuild,
+  +libselinux-1.28.ebuild:
+  New upstream release.
+
+  09 Sep 2005; Chris PeBenito <pebenito@g.o> libselinux-1.24.ebuild:
+  Mark stable.
+
+*libselinux-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@g.o> -libselinux-1.20.ebuild,
+  -libselinux-1.22.ebuild, +libselinux-1.24.ebuild:
+  New upstream release.
+
+  13 May 2005; Chris PeBenito <pebenito@g.o>
+  libselinux-1.22-r1.ebuild:
+  Mark stable.
+
+  10 May 2005; Stephen Bennett <spb@g.o> libselinux-1.22.ebuild:
+  mips stable
+
+*libselinux-1.22-r1 (08 May 2005)
+
+  08 May 2005; Chris PeBenito <pebenito@g.o>
+  +files/libselinux-1.22.diff, +libselinux-1.22-r1.ebuild:
+  A couple fixes, including one for bug #91921.
+
+  01 May 2005; Stephen Bennett <spb@g.o> libselinux-1.22.ebuild:
+  Mark ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@g.o> libselinux-1.22.ebuild:
+  Mark stable.
+
+*libselinux-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@g.o> +libselinux-1.22.ebuild:
+  New upstream release.
+
+  13 Feb 2005; Chris PeBenito <pebenito@g.o> libselinux-1.20.ebuild:
+  Mark stable.
+
+*libselinux-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@g.o> libselinux-1.18.ebuild,
+  +libselinux-1.20.ebuild:
+  New upstream release.  Mark 1.18 stable.
+
+  03 Jan 2005; Chris PeBenito <pebenito@g.o> libselinux-1.16.ebuild,
+  libselinux-1.18.ebuild:
+  Switch to libc virtual for DEP since uclibc now has xattr support.
+
+*libselinux-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@g.o>
+  +files/selinuxconfig.c.diff, +libselinux-1.18.ebuild:
+  New upstream release.
+
+*libselinux-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@g.o> +libselinux-1.16.ebuild:
+  New upstream release.
+
+*libselinux-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@g.o> +libselinux-1.14.ebuild:
+  New upstream version.
+
+  11 Jun 2004; Chris PeBenito <pebenito@g.o> -libselinux-1.10.ebuild,
+  libselinux-1.12.ebuild:
+  Mark stable
+
+*libselinux-1.12 (14 May 2004)
+
+  14 May 2004; Chris PeBenito <pebenito@g.o> +libselinux-1.12.ebuild:
+  New upstream release.
+
+*libselinux-1.10 (17 Apr 2004)
+
+  17 Apr 2004; Chris PeBenito <pebenito@g.o> +libselinux-1.10.ebuild:
+  New upstream version.
+
+  08 Apr 2004; Chris PeBenito <pebenito@g.o> libselinux-1.8.ebuild:
+  Mark stable for 2004.1
+
+*libselinux-1.8 (12 Mar 2004)
+
+  12 Mar 2004; Chris PeBenito <pebenito@g.o> libselinux-1.8.ebuild:
+  New upstream release.
+
+*libselinux-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@g.o> libselinux-1.6.ebuild:
+  New upstream release.
+
+  16 Dec 2003; Chris PeBenito <pebenito@g.o> libselinux-1.4.ebuild:
+  Mark stable.
+
+*libselinux-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@g.o> libselinux-1.4.ebuild:
+  New upstream version.
+
+  29 Oct 2003; Joshua Brindle <method@g.o> libselinux-1.2-r2.ebuild:
+  added sparc
+
+*libselinux-1.2-r2 (20 Oct 2003)
+
+  20 Oct 2003; Chris PeBenito <pebenito@g.o> libselinux-1.2-r2.ebuild,
+  files/libselinux-1.2-attr.diff:
+  Compile against sys-apps/attr only if linux-headers are older than 2.4.20.
+
+*libselinux-1.2-r1 (07 Oct 2003)
+
+  07 Oct 2003; Chris PeBenito <pebenito@g.o> libselinux-1.2-r1.ebuild,
+  files/libselinux-1.2-gentoo.diff:
+  Move libraries to /lib, to fix problems with having a separate /usr during
+  booting.
+
+*libselinux-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@g.o> libselinux-1.2.ebuild,
+  files/libselinux-1.2-const.diff:
+  New upstream version.
+
+  22 Sep 2003; <paul@g.o> metadata.xml:
+  Fix metadata.xml
+
+  21 Aug 2003; Chris PeBenito <pebenito@g.o> libselinux-1.1-r1.ebuild:
+  Add a dep for portage. The newer versions have labelling support for the old
+  API.
+
+  18 Aug 2003; Chris PeBenito <pebenito@g.o> libselinux-1.1-r1.ebuild,
+  metadata.xml:
+  Fix license, this is public-domain, not GPL-2. Use package description in RPM
+  spec file as metadata.xml long description.
+
+  15 Aug 2003; Chris PeBenito <pebenito@g.o> libselinux-1.0.ebuild,
+  libselinux-1.1-r1.ebuild, files/libselinux-1.0-gentoo.diff:
+  Mark stable
+
+*libselinux-1.1-r1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@g.o> libselinux-1.1-r1.ebuild,
+  libselinux-1.1.ebuild, files/libselinux-1.1-linkfix.diff:
+  Add fix for a random linking problem that causes libselinux to work
+  incorrectly.
+
+*libselinux-1.1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@g.o> libselinux-1.1.ebuild,
+  files/libselinux-1.1-gentoo.diff:
+  New upstream version
+
+  04 Aug 2003; Chris PeBenito <pebenito@g.o>
+  files/libselinux-1.0-gentoo.diff:
+  Add on a NSA nullbyte patch to the gentoo patch
+
+*libselinux-1.0 (03 Aug 2003)
+
+  03 Aug 2003; Chris PeBenito <pebenito@g.o> libselinux-1.0.ebuild,
+  metadata.xml, files/libselinux-1.0-gentoo.diff:
+  Initial commit
+

diff --git a/sys-libs/libselinux/libselinux-2.1.0.ebuild b/sys-libs/libselinux/libselinux-2.1.0.ebuild
new file mode 100644
index 0000000..dff140f
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.98.ebuild,v 1.1 2011/07/15 20:57:55 blueness Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit multilib python toolchain-funcs
+
+SEPOL_VER="2.1.0"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ruby"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	ruby? ( dev-lang/ruby )"
+DEPEND="${RDEPEND}
+	ruby? ( dev-lang/swig )"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# fix up paths for multilib
+	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \
+		|| die "Fix for multilib LIBDIR failed."
+	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \
+		|| die "Fix for multilib SHLIBDIR failed."
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC ${LDFLAGS}" all || die
+
+	if use python; then
+		python_copy_sources src
+		building() {
+			emake CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap
+		}
+		python_execute_function -s --source-dir src building
+	fi
+
+	if use ruby; then
+		emake CC="$(tc-getCC)" rubywrap || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install-pywrap
+		}
+		python_execute_function -s --source-dir src installation
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-rubywrap || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize selinux
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup selinux
+	fi
+}

diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
new file mode 100644
index 0000000..0c7f186
--- /dev/null
+++ b/sys-libs/libselinux/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>
+		Libselinux provides an API for SELinux applications to get and set
+		process and file security contexts and to obtain security policy
+		decisions.  Required for any applications that use the SELinux API.
+	</longdescription>
+</pkgmetadata>

diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
new file mode 100644
index 0000000..9f8fd18
--- /dev/null
+++ b/sys-libs/libsemanage/ChangeLog
@@ -0,0 +1,170 @@
+# ChangeLog for sys-libs/libsemanage
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.37 2011/07/15 21:00:46 blueness Exp $
+
+*libsemanage-2.1.0 (02 Aug 2011)
+
+  02 Aug 2011; <swift@g.o> +libsemanage-2.1.0.ebuild, +metadata.xml:
+  Bump to 20110727 SELinux userspace release
+
+*libsemanage-2.0.46 (15 Jul 2011)
+
+  15 Jul 2011; Anthony G. Basile <blueness@g.o>
+  +libsemanage-2.0.46.ebuild:
+  Bump to 2.0.46 - proxy for SwifT
+
+  30 Jun 2011; Anthony G. Basile <blueness@g.o>
+  libsemanage-2.0.45.ebuild:
+  Only build libsemanage for python-2, fixes bug #369089
+
+  28 May 2011; Anthony G. Basile <blueness@g.o>
+  libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild:
+  Make RDEPEND explicit
+
+  28 May 2011; Anthony G. Basile <blueness@g.o>
+  libsemanage-2.0.45.ebuild:
+  Stable amd64 x86
+
+  13 Feb 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata.xml to reflect new selinux herd.
+
+  06 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libsemanage-2.0.45.ebuild:
+  Add "python" and "ruby" USE flags.
+
+  05 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libsemanage-2.0.45.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #353764). Respect AR and CC.
+
+*libsemanage-2.0.45 (05 Feb 2011)
+
+  05 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +libsemanage-2.0.45.ebuild:
+  New upstream release.
+
+  16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild,
+  libsemanage-2.0.33-r1.ebuild:
+  Delete calls to deprecated python_version().
+
+*libsemanage-2.0.33-r1 (24 Aug 2009)
+
+  24 Aug 2009; Chris PeBenito <pebenito@g.o>
+  +libsemanage-2.0.33-r1.ebuild, +files/libsemanage-2.0.33-bzip.diff:
+  Add patch to make bzip2 compression configurable.
+
+  03 Aug 2009; Chris PeBenito <pebenito@g.o>
+  libsemanage-2.0.33.ebuild:
+  Fix libsepol dependency.
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild:
+  Add python_need_rebuild to libsemanage.
+
+*libsemanage-2.0.33 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o>
+  +libsemanage-2.0.33.ebuild:
+  New upstream release.
+
+  18 Jul 2009; Chris PeBenito <pebenito@g.o>
+  -libsemanage-1.10.9.ebuild, libsemanage-2.0.27.ebuild:
+  Mark stable. Remove old ebuilds.
+
+*libsemanage-2.0.27 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@g.o>
+  +libsemanage-2.0.27.ebuild:
+  Initial commit of 2.0 libsemanage.
+
+  10 Sep 2008; Chris PeBenito <pebenito@g.o>
+  libsemanage-1.10.9.ebuild:
+  Tests cannot be run in the ebuild, they are supposed to be ran on the full
+  SELinux userland repo.
+
+  29 May 2008; Ali Polatel <hawking@g.o> libsemanage-1.10.9.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
+
+  26 May 2008; Chris PeBenito <pebenito@g.o>
+  libsemanage-1.10.9.ebuild:
+  Fix libsepol dependency.
+
+  13 May 2008; Chris PeBenito <pebenito@g.o> -libsemanage-1.4.ebuild,
+  -libsemanage-1.6.ebuild, -libsemanage-1.10.0.ebuild,
+  -libsemanage-1.10.5.ebuild, libsemanage-1.10.9.ebuild:
+  Mark 1.10.9 stable, clear old ebuilds.
+
+*libsemanage-1.10.9 (29 Jan 2008)
+
+  29 Jan 2008; Chris PeBenito <pebenito@g.o>
+  +libsemanage-1.10.9.ebuild:
+  New upstream bugfix release.
+
+*libsemanage-1.10.5 (18 Oct 2007)
+
+  18 Oct 2007; Chris PeBenito <pebenito@g.o>
+  +libsemanage-1.10.5.ebuild:
+  New upstream release.
+
+  04 Jun 2007; Chris PeBenito <pebenito@g.o>
+  libsemanage-1.10.0.ebuild:
+  Mark stable.
+
+*libsemanage-1.10.0 (15 Feb 2007)
+
+  15 Feb 2007; Chris PeBenito <pebenito@g.o>
+  +libsemanage-1.10.0.ebuild:
+  New upstream release.
+
+  09 Oct 2006; Chris PeBenito <pebenito@g.o>
+  libsemanage-1.6.17-r1.ebuild:
+  Stable to make repoman happy.
+
+*libsemanage-1.6.17-r1 (08 Oct 2006)
+
+  08 Oct 2006; Chris PeBenito <pebenito@g.o>
+  -libsemanage-1.6.17.ebuild, +libsemanage-1.6.17-r1.ebuild:
+  Install semanage.conf since this is masked on example policy-based profiles.
+
+*libsemanage-1.6.17 (05 Oct 2006)
+
+  05 Oct 2006; Chris PeBenito <pebenito@g.o>
+  +libsemanage-1.6.17.ebuild:
+  Add SVN snapshot.
+
+  31 Jul 2006; Chris PeBenito <pebenito@g.o> libsemanage-1.6.ebuild:
+  Mark stable, long overdue.
+
+  27 Apr 2006; Alec Warner <antarus@g.o>
+  files/digest-libsemanage-1.4, Manifest:
+  Fixing SHA256 digest, pass four
+
+*libsemanage-1.6 (18 Mar 2006)
+
+  18 Mar 2006; Chris PeBenito <pebenito@g.o> +libsemanage-1.6.ebuild:
+  New upstream release.
+
+  22 Feb 2006; Stephen Bennett <spb@g.o> libsemanage-1.4.ebuild:
+  Alpha stable
+
+  19 Feb 2006; Joshua Kinard <kumba@g.o> libsemanage-1.4.ebuild:
+  Marked stable on mips.
+
+  09 Feb 2006; Chris PeBenito <pebenito@g.o> libsemanage-1.4.ebuild:
+  Set python version to fix compiles on non 2.4 pythons.
+
+  17 Jan 2006; Chris PeBenito <pebenito@g.o> libsemanage-1.4.ebuild:
+  Mark stable, x86, amd64, ppc, sparc.
+
+  14 Jan 2006; Stephen Bennett <spb@g.o> libsemanage-1.4.ebuild:
+  Added ~alpha
+
+  15 Dec 2005; Chris PeBenito <pebenito@g.o> libsemanage-1.4.ebuild:
+  Tighten up versioning to try to prevent mismatch problems as seen in #112348.
+
+*libsemanage-1.4 (09 Dec 2005)
+
+  09 Dec 2005; Chris PeBenito <pebenito@g.o> +metadata.xml,
+  +libsemanage-1.4.ebuild:
+  Initial commit.
+

diff --git a/sys-libs/libsemanage/libsemanage-2.1.0.ebuild b/sys-libs/libsemanage/libsemanage-2.1.0.ebuild
new file mode 100644
index 0000000..2087adb
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.1.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.0.46.ebuild,v 1.1 2011/07/15 21:00:46 blueness Exp $
+
+EAPI="3"
+# Support for 4 depends on python.eclass
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit multilib python toolchain-funcs
+
+SEPOL_VER="2.1.0"
+SELNX_VER="2.1.0"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ruby"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libselinux-${SELNX_VER}
+	dev-libs/ustr
+	ruby? ( dev-lang/ruby )"
+DEPEND="${RDEPEND}
+	ruby? ( dev-lang/swig )"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" all || die
+
+	if use python; then
+		python_copy_sources src
+		building() {
+			emake CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" "$@"
+		}
+		python_execute_function -s --source-dir src building -- swigify
+		python_execute_function -s --source-dir src building -- pywrap
+	fi
+
+	if use ruby; then
+		emake -C src CC="$(tc-getCC)" rubywrap || die
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${D}usr/$(get_libdir)" \
+		SHLIBDIR="${D}$(get_libdir)" \
+		install || die
+	dosym "../../$(get_libdir)/libsemanage.so.1" "/usr/$(get_libdir)/libsemanage.so" || die
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				PYLIBVER="python$(python_get_version)" \
+				LIBDIR="${D}usr/$(get_libdir)" \
+				install-pywrap
+		}
+		python_execute_function -s --source-dir src installation
+	fi
+
+	if use ruby; then
+		emake -C src \
+			DESTDIR="${D}" \
+			LIBDIR="${D}usr/$(get_libdir)" \
+			install-rubywrap || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize semanage.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup semanage.py
+	fi
+}

diff --git a/sys-libs/libsemanage/metadata.xml b/sys-libs/libsemanage/metadata.xml
new file mode 100644
index 0000000..ebc32c0
--- /dev/null
+++ b/sys-libs/libsemanage/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>SELinux policy management libraries</longdescription>
+</pkgmetadata>

diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
new file mode 100644
index 0000000..9115115
--- /dev/null
+++ b/sys-libs/libsepol/ChangeLog
@@ -0,0 +1,188 @@
+# ChangeLog for sys-libs/libsepol
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.41 2011/07/15 21:03:08 blueness Exp $
+
+*libsepol-2.1.0 (02 Aug 2011)
+
+  02 Aug 2011; <swift@g.o> +libsepol-2.1.0.ebuild, +metadata.xml:
+  Bump to 20110727 SELinux userspace release
+
+*libsepol-2.0.42 (15 Jul 2011)
+
+  15 Jul 2011; Anthony G. Basile <blueness@g.o> +libsepol-2.0.42.ebuild:
+  Bump to 2.0.42 - proxy for SwifT
+
+  28 May 2011; Anthony G. Basile <blueness@g.o> libsepol-2.0.32.ebuild,
+  libsepol-2.0.37.ebuild:
+  Make RDEPEND explicit
+
+  28 May 2011; Anthony G. Basile <blueness@g.o> libsepol-2.0.41.ebuild:
+  Stable amd64 x86
+
+  13 Feb 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata.xml to reflect new selinux herd.
+
+  05 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  libsepol-2.0.41.ebuild:
+  Respect AR and CC.
+
+*libsepol-2.0.41 (05 Feb 2011)
+
+  05 Feb 2011; Anthony G. Basile <blueness@g.o>
+  +libsepol-2.0.41.ebuild:
+  New upstream release.
+
+  23 Sep 2009; Patrick Lauer <patrick@g.o> libsepol-2.0.32.ebuild,
+  libsepol-2.0.37.ebuild:
+  Remove virtual/libc
+
+*libsepol-2.0.37 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@g.o> +libsepol-2.0.37.ebuild:
+  New upstream release.
+
+  18 Jul 2009; Chris PeBenito <pebenito@g.o>
+  -files/libsepol-1.12.2.diff, -libsepol-1.16.11.ebuild,
+  libsepol-2.0.32.ebuild:
+  Mark stable. Remove old ebuilds.
+
+*libsepol-2.0.32 (03 Oct 2008)
+
+  03 Oct 2008; Chris PeBenito <pebenito@g.o>
+  +files/libsepol-2.0.32-expand_rule.diff, +libsepol-2.0.32.ebuild:
+  Initial commit of 2.0 libsepol.
+
+  10 Sep 2008; Chris PeBenito <pebenito@g.o> libsepol-1.16.11.ebuild:
+  Tests cannot be run in the ebuild, they are supposed to be ran on the full
+  SELinux userland repo.
+
+  13 May 2008; Chris PeBenito <pebenito@g.o> -libsepol-1.10.ebuild,
+  -libsepol-1.12-r1.ebuild, -libsepol-1.16.3.ebuild,
+  -libsepol-1.16.6.ebuild, libsepol-1.16.11.ebuild:
+  Mark 1.16.11 stable, clear old ebuilds.
+
+*libsepol-1.16.11 (07 Feb 2008)
+
+  07 Feb 2008; Chris PeBenito <pebenito@g.o>
+  -libsepol-1.16.10.ebuild, +libsepol-1.16.11.ebuild:
+  sys-libs/libsepol: upstream bugfix release.
+
+*libsepol-1.16.10 (29 Jan 2008)
+
+  29 Jan 2008; Chris PeBenito <pebenito@g.o>
+  +libsepol-1.16.10.ebuild:
+  New upstream bugfix release.
+
+*libsepol-1.16.6 (18 Oct 2007)
+
+  18 Oct 2007; Chris PeBenito <pebenito@g.o> +libsepol-1.16.6.ebuild:
+  New upstream release.
+
+  04 Jun 2007; Chris PeBenito <pebenito@g.o> libsepol-1.16.3.ebuild:
+  Mark stable.
+
+*libsepol-1.16.3 (10 May 2007)
+
+  10 May 2007; Chris PeBenito <pebenito@g.o> +libsepol-1.16.3.ebuild:
+  New stable bugfix release.
+
+  17 Apr 2007; Chris PeBenito <pebenito@g.o> libsepol-1.16.2.ebuild:
+  This was a critical bug fix for SELinux policy linking, mark stable.
+
+*libsepol-1.16.2 (04 Apr 2007)
+
+  04 Apr 2007; Chris PeBenito <pebenito@g.o> +libsepol-1.16.2.ebuild:
+  Add bugfix release to fix boolean mapping problem.
+
+  25 Mar 2007; Chris PeBenito <pebenito@g.o> libsepol-1.16.0.ebuild:
+  Mark stable.
+
+*libsepol-1.16.0 (15 Feb 2007)
+
+  15 Feb 2007; Chris PeBenito <pebenito@g.o> +libsepol-1.16.0.ebuild:
+  New upstream release.
+
+  09 Oct 2006; Chris PeBenito <pebenito@g.o> libsepol-1.12.28.ebuild:
+  Stable to make repoman happy.
+
+*libsepol-1.12.28 (05 Oct 2006)
+
+  05 Oct 2006; Chris PeBenito <pebenito@g.o>
+  +libsepol-1.12.28.ebuild:
+  Add SVN snapshot.
+
+  31 Jul 2006; Chris PeBenito <pebenito@g.o> libsepol-1.12-r1.ebuild:
+  Mark stable, long overdue.
+
+*libsepol-1.12-r1 (27 Mar 2006)
+
+  27 Mar 2006; Chris PeBenito <pebenito@g.o>
+  +files/libsepol-1.12.2.diff, -libsepol-1.12.ebuild,
+  +libsepol-1.12-r1.ebuild:
+  Uptream bugfix patch, including a fix for big endian machines. Users of big
+  endian systems should remerge checkpolicy as it statically links against
+  libsepol.
+
+*libsepol-1.12 (18 Mar 2006)
+
+  18 Mar 2006; Chris PeBenito <pebenito@g.o> +libsepol-1.12.ebuild:
+  New upstream release.
+
+  22 Feb 2006; Stephen Bennett <spb@g.o> libsepol-1.10.ebuild:
+  Alpha stable
+
+  19 Feb 2006; Joshua Kinard <kumba@g.o> libsepol-1.10.ebuild:
+  Marked stable on mips.
+
+  17 Jan 2006; Chris PeBenito <pebenito@g.o> libsepol-1.10.ebuild:
+  Mark stable, x86, amd64, ppc, sparc.
+
+  14 Jan 2006; Stephen Bennett <spb@g.o> libsepol-1.10.ebuild:
+  Added ~alpha
+
+*libsepol-1.10 (09 Dec 2005)
+
+  09 Dec 2005; Chris PeBenito <pebenito@g.o> -libsepol-1.4.ebuild,
+  +libsepol-1.10.ebuild:
+  New upstream release.
+
+  09 Sep 2005; Chris PeBenito <pebenito@g.o> libsepol-1.6.ebuild:
+  Mark stable.
+
+*libsepol-1.6 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@g.o> +libsepol-1.6.ebuild:
+  New upstream release.
+
+  10 May 2005; Stephen Bennett <spb@g.o> libsepol-1.4.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@g.o> libsepol-1.4.ebuild:
+  Added ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@g.o> libsepol-1.4.ebuild:
+  Mark stable.
+
+*libsepol-1.4 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@g.o> +libsepol-1.4.ebuild:
+  New upstream release.
+
+  07 Jan 2005; Chris PeBenito <pebenito@g.o> libsepol-1.0.ebuild,
+  libsepol-1.2.ebuild:
+  Mark 1.2 stable.  Change glibc dep to libc virtual.
+
+  15 Nov 2004; Chris PeBenito <pebenito@g.o> libsepol-1.2.ebuild:
+  Fix non mls compile.
+
+*libsepol-1.2 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@g.o> +libsepol-1.2.ebuild:
+  New upstream release.
+
+*libsepol-1.0 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@g.o> +metadata.xml,
+  +libsepol-1.0.ebuild:
+  Initial commit.
+

diff --git a/sys-libs/libsepol/libsepol-2.1.0.ebuild b/sys-libs/libsepol/libsepol-2.1.0.ebuild
new file mode 100644
index 0000000..52d9e72
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-2.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.0.42.ebuild,v 1.1 2011/07/15 21:03:08 blueness Exp $
+
+EAPI="2"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="SELinux binary policy representation library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	# fix up paths for multilib
+	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \
+		|| die "Fix for multilib LIBDIR failed."
+	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \
+		|| die "Fix for multilib SHLIBDIR failed."
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}

diff --git a/sys-libs/libsepol/metadata.xml b/sys-libs/libsepol/metadata.xml
new file mode 100644
index 0000000..b13f947
--- /dev/null
+++ b/sys-libs/libsepol/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>SELinux library for manipulating binary security policies</longdescription>
+</pkgmetadata>