Summer cleaning

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

13 files changed, 27 insertions, 677 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index d287a51c40ef..723fea8bad51 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.98 2013/06/23 08:30:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.99 2013/07/07 17:58:21 swift Exp $
+
+  07 Jul 2013; Sven Vermeulen <swift@gentoo.org> -libselinux-2.1.9.ebuild,
+  -libselinux-2.1.9-r1.ebuild, -libselinux-2.1.9-r2.ebuild,
+  -libselinux-2.1.9-r3.ebuild:
+  Summer cleaning
 
 *libselinux-2.1.13-r3 (23 Jun 2013)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index d7575aa4ecdb..8a185f5fa643 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -6,7 +6,6 @@ AUX libselinux-2.1.9-mountsys.patch 957 SHA256 ab2c728464411d3d44d19afe79ebcfa0f
 AUX libselinux-2.1.9-support_ruby19.patch 635 SHA256 095b618bdbf786545d552fbc25ab91369d4b9dbc72764c3379706b65bb6f106c SHA512 bd1150a12097ae0dfd0c34b0e1742fef3af9a8ccff921a6a64f8abe24a681db9d5a8936ecc0eb973119c5d33712834a85998dd6a057aa0cbcebdc9455b6ac217 WHIRLPOOL 7c74fff046041fd99d4c6ca66401208752bf489415807dd02f4a7a699b12741a0a838a8de8ddbc72cff8c158efc0ed02e8f2555023d9398b9e411183babcd280
 DIST libselinux-2.1.12.tar.gz 162162 SHA256 8dad879380e0ce1e4ab67195a08f6052c1396493bcb12fe92a033f49f7dbca9e SHA512 9bc18e321309d2eec84a219d5fd179d8e282eb65d6a89a5c93f5f9215fe10024205ca9672bb87006350e9549f14b925ad7d7d363c3fdfb4aa12cb428c8698d14 WHIRLPOOL a95f9b6bda72ff53d58c49d25411be9f3ee78c9e29f1ab63559009775cdedda952c2d01d651757db594aae9345b849c9008b271d5c560cec0ae0130be3fd3a9b
 DIST libselinux-2.1.13.tar.gz 168931 SHA256 57aad47c06b7ec18a76e8d9870539277a84cb40109cfdcf70ed3260bdb04447a SHA512 e0f922a7b71e944f7cde8cc99f74654aa6d1018ebe9b6186a4f9bc2bc1a06f515ea9d2ea8b9d7718bea481e9311a47943b0bf7cd1344a739ea960f62f9cd59a6 WHIRLPOOL 8b907756719fca6038a38ca54a9d3d7571e17abf142c54349c12e072c2e0ef7f2ce020f5e92ad647d8b822c634aad09c0ef7063675ed8b2f098f877ddfec9fc4
-DIST libselinux-2.1.9.tar.gz 155840 SHA256 749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f SHA512 5e4659360ea08928ea8bb8dee3ab64ffd3c76071d7c3a1009f1d69298c015a99ab1f1d1af2d1f8afdcdd01b8be309883a26d2c2ca05c1b528e08778f22a74c96 WHIRLPOOL 384b7c935cfd93aa2bca7ff68374925ecf9066c3b63b38325c4d53a8a20075fc003872f9f4838dc8c346edfaa5a334f49b36d4545855cfc6358410b153151926
 DIST patchbundle-libselinux-2.1.12-r1.tar.gz 814 SHA256 d24a5eefb482a81f5986fdec0f3d74220fc071adbc3a3726657c4dd5b767b57e SHA512 e8c49441cdce2ed2fe11a4103c55c4f9d6eca2605aad4020cc64febfbe67f8f1205ef30329272c7624c57ab0beec98d96c338ed4a01ffef25caf5d126e210ee9 WHIRLPOOL 42f6a267a9c260fb6d70627136037db12c9d5003e5d23f2767c0c6bb808dde61c905c9088f68055a9acea9d288258b90b90b6caf97833ebc0c4052b45fd1d62b
 DIST patchbundle-libselinux-2.1.12-r2.tar.gz 1117 SHA256 10b7e3fcef7a98320a0db0b4c9b27236d0981fd99efa4069e2c4791e9156ea23 SHA512 cc79e5e89fb695ed97a80d65e26adf00ebf7ae2f0c9f0425d57c4aed76cd9adbb73f81ad39db2940bff44435b61d70678ca937a92202bf1523a5ab41e30d2669 WHIRLPOOL 4ba1f27fbb358bff5136921698b8495e6d3361e5957f95fc1766d7e170b1e546a8ec42c7d723cd54a85ab96f13ce1c6bf5b953ec39e48e15367a8d80b55bb629
 DIST patchbundle-libselinux-2.1.12-r3.tar.gz 1350 SHA256 19f711f2697a5283b3f8e67f87186afefc49cf4ff999d46a868571d7a57f015e SHA512 701fe2ec7888765a8ad2adfea58b866ec8c6a57b41d4a492b3258cc32e03abe95edc995c1b34f62025ee94a36bbb7fa6e08f85188e433a3f6c47a306010d8c9c WHIRLPOOL beb84334266a1951bb7ead70023e8a6e046c1133a397f46640fe354977e74823f0030328231a1473221f58037fea7b8140fd89c0b2bffdda9e1a4666f4cb361e
@@ -20,16 +19,12 @@ EBUILD libselinux-2.1.12.ebuild 2186 SHA256 8b794233d599ba5dad9c2b9e0a0589c4f4d5
 EBUILD libselinux-2.1.13-r1.ebuild 3299 SHA256 c12efb1771f1a55efff50e0ccc29887111aae4f7e1dbb1d3150b94aeae423b64 SHA512 bb3aab781877770a901da936f3d83a230933ad947a2ef67ce39ee581a10dad5233094977f63faf5219964b16d16af8a8225fb5368e53099656e0051cd9ccfd8f WHIRLPOOL d5d2a5233e5ea94b3d741e0b112c110cfc88d87427f75cafdb5f583db8f467ddd11a15fe522b53ed0f44bcc3a1b5b353133caa21e3067034fa0ad9deea3c6f09
 EBUILD libselinux-2.1.13-r2.ebuild 3297 SHA256 5ad7f7d5e2dfbf09cbf3bda0ab5cd79362a66f39e58aec6f101a9129fbb23440 SHA512 4697645ae6d07a5732304fdf6508e767ac1dfd4448abfbfb813c99b9dfc1375822e08c6259031de6490c08921fe6bb5d0234a3bb9659f6eb763f2a395b6aee53 WHIRLPOOL 63ca300ca18566752e06af6d9fb05501101d87cc197746d60d3863045cd4b9e201c4db7865e1174c862815bc1eb1b35b7d19cc8bae6ebd577e0b3b22f1dc7bb9
 EBUILD libselinux-2.1.13-r3.ebuild 3299 SHA256 82325ab152c473ae4b546a457aef638b1830702ead9696f47571430237da7cba SHA512 53af7e037b45e77e9f6c70ec1c36b0f7521d53e0a50417e3bb8dc0ead176f3dcf7a6c03ac352bd6efc5cdfb8325e92aa4ea68475b07de90af7f55ff86f049731 WHIRLPOOL f7f1bba95a2e45c3a4b2b5f4883da9e6b3648795fc3babfff47e25e8d2c1a88dcf8c3c0324a45d85b515f598f9c1aff942811f8f6a229e4a6d07c10ab2a62611
-EBUILD libselinux-2.1.9-r1.ebuild 2086 SHA256 d3acd67150515bd6c1a6e0e410d0eb536e1e838d5aa40d1e4c86f8f434916ed2 SHA512 33e17abc071687622cb13dc30537c006568873fce5acc2bc4a60be3d832a53282077392ddb409f83cd4ada2d99a39db36efc1b3db8955c576da6b07cc43cab3d WHIRLPOOL f622eec132bbe1c14cacc0de7a71c7a894503ed8f224563ecf0a7e510fdcc98f5e0791dc3823a96d41e0aef4df4cbfb983889287a2a5492687d246fee3a073b2
-EBUILD libselinux-2.1.9-r2.ebuild 2174 SHA256 1f9df4509631e5aacdf39a5800d8dad0b55b341e00618687875d20299b68a289 SHA512 4c04b330b093483947e10adb39e05585dd76cbb7fb4b33b2c7cbdcca534b24a183cba5b2079072e553550e348079885af36bbf10f14d40e5265977d57e9bfafc WHIRLPOOL 6966bd39a3ab99467c3a7304dd3cf3330ba4c2524b9cc09189a08ac4454bacd2b9e6c0957ddde906002ea8cab57148f0e38db278f60c3cc6496b3365c06031de
-EBUILD libselinux-2.1.9-r3.ebuild 2115 SHA256 b9aef387a97c8bce1918bf4bc9024843b64a7d25eeefd01b09990f42fbf11653 SHA512 63f20baa2e8bd887885a823a765b6d9a69500d7e9f753af5e313c574e3f635effd3503203788451cc580def6a9bf820362b3fe0cb39a2bbdf4f1ab626fe1e40d WHIRLPOOL 17fb4052ad817e927dbfa786cc232576650ebd789e26a35ca3deb9617d2abd21018691bee64c6173871d0f321b4820f0a746dc794028801568bb444a23ba9b92
-EBUILD libselinux-2.1.9.ebuild 2022 SHA256 a369e589e190d7a4e96adcac6288b72ae63e79a388fbaee095a3fcecbab47683 SHA512 de836c2fd0f0266886ba5b42c44eed79cfe1748f064409d9519aab6bae9896eb8427cefce6c3eee2523832f8bb9b3e7e027676da4be4efb068e3d7786e3242b2 WHIRLPOOL ae764c8c36b3b6756f4533c22f098cf74c2587372e8eb8cb2f8bd2741aa398aafbc7802d41c06984231b7f3a1d0076b6982aea5e728ccc3ea554234d513ef823
-MISC ChangeLog 13968 SHA256 41af82b93a1bc8282bfe6ceeff000e62ea0ba4f9af5d138c5798f40e9d56dbcc SHA512 82b1f6f72c810f559eaed2809ab82d542d6bcd5099a75fb05c55705024cd8e6840ab1a5eee573748aaca1a3c832434b882aa8ca3b9399018cba50fc9c310ad3a WHIRLPOOL 9c648fefb988aba9b4290076e7442571e5436d8ce12aeb858a2958240fe5baae0ed4d610b636b94388e7ee8fd7e8abc572ea2b3f613655603832a053fb0e35cd
+MISC ChangeLog 14153 SHA256 1d14a124f34921a88c77048caf7aa26c182905d51d72571b94c4a99c5ea2f5a6 SHA512 ec700a9ade913a670e5632205bb8a2535348eb77071ad65ff389108a9e97e2d8c19b25bd26ada831dc02cc5784b777b32a230ea213071901450d4db581d310f8 WHIRLPOOL 7d007ccac03da3a3909ff007be8129093506bd9808ffe8fd26daf3c7ad83e8581dd3eb84985ab9a118f2d94f4d1eccb2b08778db58d62b0e7fdb418fdaa9b46a
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHGsdUACgkQXfqz7M26L9s7AQCfWeVxMOSk4yOLpVt9qQ66us9i
-gvEAnRW/a+tH8MJ1OzDlEipGh/AdUVcQ
-=IJmf
+iEYEAREIAAYFAlHZrD4ACgkQXfqz7M26L9tR8wCgiVq+4UdbVxYAxEjt21s+CCil
+BbgAoJODWlUtpSvwNcetYuhkPPJr65T1
+=cxnt
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-2.1.9-r1.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r1.ebuild
deleted file mode 100644
index 3cf17bfdf44f..000000000000
--- a/sys-libs/libselinux/libselinux-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r1.ebuild,v 1.4 2012/08/06 07:46:08 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 2.5 2.6 3.*"
-
-inherit multilib python toolchain-funcs eutils
-
-SEPOL_VER="2.1.4"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${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 )
-	python? ( 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."
-	epatch "${FILESDIR}/${P}-mountsys.patch"
-}
-
-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)" PYPREFIX="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)" PYPREFIX="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/libselinux-2.1.9-r2.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild
deleted file mode 100644
index 72b9438f4897..000000000000
--- a/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild,v 1.3 2012/10/06 16:36:49 swift Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-inherit multilib python toolchain-funcs eutils ruby-ng
-
-SEPOL_VER="2.1.4"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python ruby"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${RDEPEND}
-	ruby? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-
-	if use ruby; then
-		ruby-ng_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	# fix up paths for multilib
-	sed -i \
-		-e "/^LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
-		src/Makefile utils/Makefile || die
-	epatch "${FILESDIR}/${P}-mountsys.patch"
-}
-
-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)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="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)" PYPREFIX="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/libselinux-2.1.9-r3.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
deleted file mode 100644
index b95cffa02b7d..000000000000
--- a/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild,v 1.2 2012/11/17 16:53:48 swift Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
-
-inherit multilib python toolchain-funcs eutils
-
-SEPOL_VER="2.1.4"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${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 )
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	# fix up paths for multilib
-	sed -i \
-		-e "/^LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
-		src/Makefile utils/Makefile || die
-	epatch "${FILESDIR}/${P}-mountsys.patch"
-	epatch "${FILESDIR}/${P}-support_ruby19.patch"
-}
-
-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)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="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)" PYPREFIX="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/libselinux-2.1.9.ebuild b/sys-libs/libselinux/libselinux-2.1.9.ebuild
deleted file mode 100644
index f400ceac3c12..000000000000
--- a/sys-libs/libselinux/libselinux-2.1.9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9.ebuild,v 1.3 2012/06/26 05:03:37 floppym Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit multilib python toolchain-funcs
-
-SEPOL_VER="2.1.4"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${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 )
-	python? ( 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)" PYPREFIX="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)" PYPREFIX="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/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
index 4b66d6e34528..d22d762b0a8f 100644
--- a/sys-libs/libsemanage/ChangeLog
+++ b/sys-libs/libsemanage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libsemanage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.56 2013/06/16 18:14:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.57 2013/07/07 17:59:46 swift Exp $
+
+  07 Jul 2013; Sven Vermeulen <swift@gentoo.org> -libsemanage-2.1.6.ebuild,
+  -libsemanage-2.1.6-r2.ebuild:
+  Summer cleaning
 
   16 Jun 2013; Sven Vermeulen <swift@gentoo.org> libsemanage-2.1.10.ebuild:
   Stabilization
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 283e2520230c..755e2603b920 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -2,20 +2,15 @@
 Hash: SHA256
 
 DIST libsemanage-2.1.10.tar.gz 136757 SHA256 de2e8077245581e94576276f54e80a53c23c28d6961d2dfbe2f004eaba452e91 SHA512 5f20863bdabb825ff53abea5b21b4a6c73e3e065f502969eb992f0e3403f2f8a1b85059f2bc036f3756aab8a4d8c62d6dbcbd46570330a2957d454589f4f8d8d WHIRLPOOL 45526503c61fb43c6ddbcb4a25756286c7c041abc0e6c1b276b17c0af4fbacc3c589a2d6ce50e95c466e5622411016519e8de26dbaa8884ed923cb269c9589ac
-DIST libsemanage-2.1.6-nolevel.patch.gz 335 SHA256 a8b340280c4bca90935fef12d5f212712627f91c207cf00daaa7b222962562ad SHA512 47580dc91c13ea76a3bcfb92101cb7e48c52b612f9f000eb4fec136a83e46696eed9b9bbecbbc91a924b7f8fe1f1237e155ca2e1e0da68842e6f30df37d8ac3b WHIRLPOOL caa3b393aca1bd66cfc2b7a72d4d6b1d7b564cdc7175fdb3cde83c3bad226bb4044882e9eecaa895b4d3e487113517b3cba6e3f5c150646b0583ba4dd984d014
-DIST libsemanage-2.1.6.tar.gz 135818 SHA256 64e6849fe50fb463ec0ba24653a26e3452fa4aaa7d7e192213d5c5a7c525aebb SHA512 69506a93aa41bd4bfa50ecf01d796627c6d9aa5af143470a93eb78b1fc288f8aed8d9cd08aef4bd96eaf8da407bb56e98d9de6efccbb7d78f0d9f4a4414fc609 WHIRLPOOL 29eea3367971ab780e74975dc6cb22ff4b04fe2124df5ef66e24580ec03203d1f12e2a3f46d1c486a007d9da3d7e22f65bafa30b1e0587609edfbce7db980989
 DIST libsemanage-2.1.9.tar.gz 136240 SHA256 6f01d17f9751412f7b76e6e7daafeb2faf301b9bfeea83506160c81becf035cc SHA512 71e097941a68a0cd7deed1a04e0db292e81bf43078fc234e54074952e83d70981f27f63db01832ad33bbb816fed774c57aa037f8c19959a9641c09cac93ad043 WHIRLPOOL 72487d200e52929611a7364c017444d9a2bceb36988acbc76e3f525323eb1df05f4d42272cc8f549c1b708b3c64393f27cf782b5999e5f0787e349efbd3c6b18
-DIST patchbundle-libsemanage-2.1.6-gentoo-r2.tar.gz 759 SHA256 c5c92710a7e27183dc6058cad4fe1a1587a9442ef30be791629e8034676840de SHA512 046180e312075b858a1a1319416d11af3b9424596d9c78f84127c0906de071b2502ed4f61d77297a6087bd5e0c994e477dcb2929a34472545c6852f9d8f56f04 WHIRLPOOL 8553861f8f25bf97e224559198a8d45873af83883a582acdb537bf50035b4191f0b1802f8e7362ae18bdfcf9b4c8c13a84d920e1a8acaafae281d7d294b9e893
 EBUILD libsemanage-2.1.10.ebuild 3884 SHA256 b0a3467e46df2105fa9d12561a1f1782874c92bbcf4d961ea94ad52a232ef0aa SHA512 cc97afe63df1dbfa3fa2b5809b09078a837c4d3f9c092b04e87e9ef598f2389a39eeab7e5b81224dff8c48b2970c5f5242615112a80fa0d1eb3069469f770144 WHIRLPOOL e7b6103c495be1f2449caac3497d769a453bd81b119aa420848d6ceaf0d1b6ce5013daed1eb2c037e74024b54cb9c058e5ce1b1b759d3d269f0a7f5ab2f921f5
-EBUILD libsemanage-2.1.6-r2.ebuild 4126 SHA256 b4b769cccdc6d0f3b95b055d4ff9147fe50b61c794d1084abc6745b6f1d57835 SHA512 b9e201883d979ac6af0a6e701ad75501e14a17329cbacb54eab7447ac23d9a3a01833d63da8e5747ac2143a96292c5070bfcc7ebbb63209f1846c4e700c0111b WHIRLPOOL 14b463cb7c91766b15dbc71f8dc8583895fad6fd384c25bcb5858153504507b47574a7471f36d860520c3d32cb6fc009d15513093294a1ca30671e4d45c08236
-EBUILD libsemanage-2.1.6.ebuild 4079 SHA256 4c2689ed88818a886f541c04e370bce1c36dfc8b111b41ac9f842b3778222163 SHA512 10cdc297bf7ba24ef5908b61e5647c12fbb47cbb576a4ee97a42513d4faf56986f0689282033b1817771ab45e47cad6205054fd4966a14e63ab271d61a874ec5 WHIRLPOOL fa119f43a04ed27285f98b8279a399ef1a225292ab068f97d7f625453023c5a5f0eeb962ffaf046cbb5524fd3e298ccc4f1bb046f40e8571e00c940f67ca0f7c
 EBUILD libsemanage-2.1.9.ebuild 3883 SHA256 13c741f391a307dcea139b8c229c8da2346422698d3a65bb3d69c71d956041eb SHA512 0a6d2b5f45e87cf89d5156805ea50201e20ddaa26007f37c83a129f8d78be3ed533305dd202b1ed70532430016330f19c92ff4d45fc2bbd7e439af3a39ce5f90 WHIRLPOOL 2a7fbc94408162c5d21a174e52972aaab5f7857cb3cbd58afd38d1606eefdac2abc8d2745788b0a4a8a40f42e378626796524568293ad5f392342a9879ddc1f0
-MISC ChangeLog 7655 SHA256 56de21c52af2cd437958ed074e0634f23769520bdc5e8e5d0b7d4b3c8456c876 SHA512 5fe21f0e575ba12dde4bd2fdf3e930439e89ec2e7a0f6d02dd631bd8bf15fb4b4f02d0a78e4a9817eb74c1ac4327ce78414d3ea7d013aa956ead852f4c812f65 WHIRLPOOL 889f22486f53dc7843cd81e80a792ccb5e61e2cd814efedfe215b0878faf7077fcb53b693bf57d95c17eea06ec1f26105504afaee0d2c1bee911d955ecdf7946
+MISC ChangeLog 7782 SHA256 93620c4fec2d95f94fffad2b8ce0bd085a0f5f973c009d0d16f37f2ca9f28ca7 SHA512 dda935d1a8da50518272651a1c1c447e847eae0ab8acb56ebcd5f479e3a4182a15cf65eb49de274fe0d51f56cccc456e44abe77ce323e38918874b22acb26ebb WHIRLPOOL 68b6a66d0d158df9452dd3c37e8ba45dde992f5b449c61651509ebef02309c8982528cd6e7f652919f982d4056e44183e33666cd235d5d02b18bb5ac5c33044d
 MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG+ABYACgkQXfqz7M26L9uytACfbgJM8GuOpe72CMORUkedhN5r
-HikAnjslB9tkcM84Zy9FwXZgsPIegAds
-=WoMj
+iEYEAREIAAYFAlHZrJAACgkQXfqz7M26L9uCnACdEf5AGZESJ5/xcJc1tyCdZG0L
+5hcAn1OYBhquSnVmv/dogR7B9mKG2aRJ
+=6K3c
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsemanage/libsemanage-2.1.6-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.1.6-r2.ebuild
deleted file mode 100644
index 89f2603f7d4d..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.1.6-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.1.6-r2.ebuild,v 1.2 2012/06/26 05:04:33 floppym Exp $
-
-EAPI="3"
-# Support for 4 depends on python.eclass
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit multilib python toolchain-funcs eutils
-
-SEPOL_VER="2.1.4"
-SELNX_VER="2.1.9"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
-		http://dev.gentoo.org/~swift/patches/libsemanage/patchbundle-libsemanage-2.1.6-gentoo-r2.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}
-	sys-devel/bison
-	sys-devel/flex
-	ruby? ( >=dev-lang/swig-2.0.4-r1 )
-	python? ( >=dev-lang/swig-2.0.4-r1 )"
-
-# 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"
-
-	EPATCH_MULTI_MSG="Applying libsemanage patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-}
-
-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)" PYPREFIX="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)" \
-				PYPREFIX="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/libsemanage-2.1.6.ebuild b/sys-libs/libsemanage/libsemanage-2.1.6.ebuild
deleted file mode 100644
index 15c4352740bc..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.1.6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.1.6.ebuild,v 1.4 2012/06/26 05:04:33 floppym Exp $
-
-EAPI="3"
-# Support for 4 depends on python.eclass
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit multilib python toolchain-funcs eutils
-
-SEPOL_VER="2.1.4"
-SELNX_VER="2.1.9"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
-		http://dev.gentoo.org/~swift/patches/libsemanage/libsemanage-2.1.6-nolevel.patch.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}
-	sys-devel/bison
-	sys-devel/flex
-	ruby? ( >=dev-lang/swig-2.0.4-r1 )
-	python? ( >=dev-lang/swig-2.0.4-r1 )"
-
-# 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"
-
-	# Apply patch to support non-leveled types (like strict or targeted)
-	epatch "${DISTDIR}/libsemanage-2.1.6-nolevel.patch.gz"
-}
-
-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)" PYPREFIX="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)" \
-				PYPREFIX="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/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index 2edb2c58c5c3..f856716473e4 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/libsepol
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.56 2013/06/16 18:11:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.57 2013/07/07 18:00:53 swift Exp $
+
+  07 Jul 2013; Sven Vermeulen <swift@gentoo.org> -libsepol-2.1.4-r1.ebuild:
+  Summar cleaning
 
   16 Jun 2013; Sven Vermeulen <swift@gentoo.org> libsepol-2.1.9-r1.ebuild:
   Stabilization
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 5fa4f928a322..40e7f5e915d7 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA256
 
 AUX libsepol-2.1.4-fix_role_fix_callback.patch 459 SHA256 fee102fdcf2e663c29deb12e4c6ee538d7607a5904f02459ff94b7489997c309 SHA512 b75610a35dd69b677be22296261fe7cac4f25226a0dbebf7a22fca1f249586acffd294aa32fc091695cbf9bde69882cfc269b5a41a649c7a39259fc945ea2b84 WHIRLPOOL 33c9ba3b4d4153fa63ddbbe1f581c2dd4b71af22428f9ff3fbfde79414fa07878aaee08097d1d71ea210209bd7aa92edbe8ba9bf3399e431ccfa19d0de25ab7f
-DIST libsepol-2.1.4.tar.gz 201713 SHA256 8f5ea42ae6cc00b21f0e5f31f354d19fcce3edfe9328971d266245718714b1e8 SHA512 3eba1b990ea0c69d1811efec72c407c4f80ffbddc5cefbce031af7ed74e6e7f5225b93435745c32e4d4f48b2b261838d0c84a913329e6e06aea5e8977be966bd WHIRLPOOL 61fe73340e5b738fae99fc5e7dfe7162b4ed2fe70eb254c5a6b67b424dfcdaf7a3f5a7b9a36beab86817623fdabf36017ea3d5455842bd9b3cb1a4ebb71ccf3e
 DIST libsepol-2.1.8.tar.gz 203545 SHA256 63eedd2e435658eedb14cf5eb803468b701f4a2404f1a4af4ab52858e9c068f0 SHA512 9e06f854b5d11dea016c8828616241dcbb44ec38afd0230399d1af788755e719d9ce98f6746d9080f3e389bd40194463a193fd6185a358ee0ccc8301865009ae WHIRLPOOL 7f12a0e7619146dc60390bb15146ad0dda4013c84c047dda310d68fb9a9d3d0d2d4fc089423c8f89dd73e516a30354aa00998ce42a3d8d32520c4617adbf1d6b
 DIST libsepol-2.1.9.tar.gz 204876 SHA256 290d17f583635a4a5d8a2141511272adf0571c4205cdea38b5a68df20d58a70b SHA512 9f01a6349b995310880a892d05e8783c1161739df0ff83f1d38f75a9c16707f40aedd5f078e726e4588120d49bdabba72bb9f9b5b93244b2ffb4e1a72a683651 WHIRLPOOL c570d5487324e2730247c66e25357f53bed7332ce2c82bcb3ab5178769f07fb511e9eb6aaf71688b8bd273d6bd9f4d8774783143ed454fa7cf264b2a0bf72216
 DIST patchbundle-libsepol-2.1.8-r1.tar.gz 534 SHA256 3a2bcba0c797ac960eb3883bdd5f22ce294f3560df86de0c198bc90233e8e54a SHA512 3d4d0f340fd24d48a867490ae1e24dafe821f69d78e68b7cdf67a310f3f46a4c086129d04e6a6d13fa44768e9bad8c3320a4c97a8af8809606099a09b9ef8aec WHIRLPOOL 7f7021b872ab9264d4d2ec51ff55f880612d5252323e8691e1008fd2d0d31ff92a235f25bb7ebf8dabf6ea304485199b8c575b47781ac1354a55de1ef31356f0
 DIST patchbundle-libsepol-2.1.9-r1.tar.gz 534 SHA256 3a2bcba0c797ac960eb3883bdd5f22ce294f3560df86de0c198bc90233e8e54a SHA512 3d4d0f340fd24d48a867490ae1e24dafe821f69d78e68b7cdf67a310f3f46a4c086129d04e6a6d13fa44768e9bad8c3320a4c97a8af8809606099a09b9ef8aec WHIRLPOOL 7f7021b872ab9264d4d2ec51ff55f880612d5252323e8691e1008fd2d0d31ff92a235f25bb7ebf8dabf6ea304485199b8c575b47781ac1354a55de1ef31356f0
-EBUILD libsepol-2.1.4-r1.ebuild 888 SHA256 188c2967d4e3fc7b59e2080d96f5a0ddf89b24fd1ac4ccd466bc94c35918952d SHA512 f94a13016114886b5e521760e12d1cc4ea00a731a242c9f91f42fa4cfec29abb1b69b80e940834a50890b9e1ebbb9362fb4e24b2c59bb6d814f8fa4131958440 WHIRLPOOL d0e046b834c970770cecc50a1208bd8f07754c2d7b4273a76ba35d3727eecdd0ef84e0dba4e39857d9d7440187977d00ceaecd11597e50ead69fce2469113b52
 EBUILD libsepol-2.1.8-r1.ebuild 1262 SHA256 e18d27a39318f53c24ec0f98c6207da5d2f0a16dbc232d931651dc70f70ed541 SHA512 45619d9614390155ad1315db67e1b29009bd7d52279ec759055736124e82bdee9a03234417129437e69bb8f117f63399f24da1626d7bcf66c7119f31eb2ffbbe WHIRLPOOL 10e9df977b723a2a06174fcac61b610f7c4953c49152a1a0ce6b7ab69529fd092c7f49fad03e112a56cee33d63f944ccbe6e046aed1c68fdb0acfe869d592028
 EBUILD libsepol-2.1.8.ebuild 1080 SHA256 56a91e00a3e7b0db02568a8ee5aa19b15d9180faa7cfd342e0c6b125b44185d9 SHA512 dd7b85650c125d24f236a982e1f4ef5222703bf29404e2e400933802665362d9d9bd1d57141f6f67d43e3ae411d3640b17f7425c5b4c5d741e5d7b7d7655edbb WHIRLPOOL 9092e4e729e2de5cd69e80e9306b9924db6ab1584cce441ca50082eee6c7474aba84f7ccdb60979ff8cc566e8a2e22f1458d6baca356948de82d160aba192609
 EBUILD libsepol-2.1.9-r1.ebuild 1262 SHA256 93a7e7e56343e38bad1ce98516bd15e154c9429ef3710b9b8c734b8812a50df7 SHA512 5e2092a7c1527d2cdc5360c746da1fa7a4c7e829f9993de0c47f2fa0e299759c0057574e0e063d0ef336aa193c2fee707ee6748323f3ea4787b0216bdd672d70 WHIRLPOOL b403d6d779e68b038ea9f666a1472dfe2f432cf515652824faeeee35b96819b978a3125c65e51283ee7469788de5a231aa88840702479572fd981abfd7177406
-MISC ChangeLog 7407 SHA256 ec4d64bf900b142d523a35044b84d8c1106690a651ea08e0ee5cc7dd120e456e SHA512 7a0d859187691a555641d4ffa7881ad8295d63ff8caa5edb378acf3efa52a759e75c26d5e6512b7a4ad3af8f0ea7314babc3804160881edc5d7872862ca6f813 WHIRLPOOL 1ee37f1bb3c7894b5540249a656e20316757f414bab94e607d4e422ce4b951214c26b70835ffd4e6e58f1064740c1aac76bf601225ff4a5dba9a9f4fd2db4987
+MISC ChangeLog 7502 SHA256 e5ab3d7e1fdcb5a1362877108368e0e813e89142a5be8c865d892a058cdf53bd SHA512 e01a3531282b0ad71c8b3d048929877e390b6188022d9be2ad7bbca29b28b8fa74d29e1e808185c7cfc67096dc642035ad93ee54e6c6fc0c0ed4886f4b4b0d99 WHIRLPOOL 0afcd665dcead102c7b93b0dc179192761fbee9fcb24e4c7c66d119010531e1f99130ea9f45622c8767021f3a45036d2f13363dd1b7a025d5ac0e8cdf6bf79c0
 MISC metadata.xml 255 SHA256 34be115c595485e6f130e95be8e55b8cad13a3a80a04b538c42f3544ad0936c9 SHA512 91b84276affda6ab0bc9245150d8004517342b7fad0b2f2804bb71eb6f7ef519f4631a3202a0fa48158421f1197a3ae21f20dc7fe2ded22de32767047d51fc4e WHIRLPOOL eece77047bd215015bb84ffe8c01b657f1c363a337cd129cb4c666ee51ebb8e842101428c4a149bce99683dad69e5848366cca356c2b145be7b811c818010129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG9/2cACgkQXfqz7M26L9vlzQCeNg/AaGSUjQTgZE6DuTK36P27
-3A8AnjRV0ooflFcoL3+syofYQTmL4iCW
-=UQyT
+iEYEAREIAAYFAlHZrNMACgkQXfqz7M26L9u4JgCaA5PwSVLVAihvUtQdd275V5rf
+rZAAnRZzOuib+JqFrRmunZhEE/VPN9W/
+=86nZ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsepol/libsepol-2.1.4-r1.ebuild b/sys-libs/libsepol/libsepol-2.1.4-r1.ebuild
deleted file mode 100644
index b3ca14b38c69..000000000000
--- a/sys-libs/libsepol/libsepol-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.1.4-r1.ebuild,v 1.3 2012/10/03 20:34:13 vapier Exp $
-
-EAPI="4"
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# 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)/" \
-		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
-		-e 's:\<ranlib\>:$(RANLIB):' \
-		src/Makefile || die
-	epatch "${FILESDIR}/libsepol-2.1.4-fix_role_fix_callback.patch"
-	tc-export AR CC RANLIB
-}