version bump and ebuild clean up, drop old RC

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

15 files changed, 95 insertions, 669 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index a5604c3c5634..56f4d9b600a7 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.135 2014/12/04 10:50:14 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.136 2014/12/06 23:21:06 perfinion Exp $
+
+*libselinux-2.4_rc7 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org> +libselinux-2.4_rc7.ebuild,
+  -libselinux-2.4_rc2.ebuild, -libselinux-2.4_rc5.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *libselinux-2.3-r2 (04 Dec 2014)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 5132b9973f0e..647d8aa33d7b 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -5,35 +5,33 @@ AUX 0005-use-ruby-include-with-rubylibver.patch 634 SHA256 ca87111f9eb48b45b7271
 AUX 0006-build-related-fixes-bug-500674.patch 2846 SHA256 68084a13ed0366c279e37c6ce24703d0ddcbc46b2b4b88bb8af286b77df4212d SHA512 7eff094adfc4d276e72705735b3f73b2b8a4f78be153db749939cbf6c8df2246cf45d4eda0041696642ae22d3e1715f1fdc8b6351c13eb6003e48043fa38200b WHIRLPOOL dc2b99d5345e21f18de44dc56cb7996c5b567c932e4d3a2e6808a21233f582868333cc0d7c0eb2299b8d71a0cd46d2c0e88bfc6d351211b6374762b7863d72f6
 DIST libselinux-2.2.2.tar.gz 171013 SHA256 30ab363416806da907b86b97f1d31c252473e3200358bb1570f563c8312b5a3e SHA512 1270cba11ec0795a2cea3706ac5547655d0e65dcd2141932000526f3d0c781b6ae114051b2bb53950b8ef207a318335329280b9fc9fd81796e8e4a27cf6ae841 WHIRLPOOL a444e44225ced35b126bbd2e8924aaf5c9f4da7abb9663d20a32b97babe750245c22d75e2238de0958b73295cf582b8aec39e23312886b96417120c600ed37dc
 DIST libselinux-2.3.tar.gz 171254 SHA256 0b1e0b43ecd84a812713d09564019b08e7c205d89072b5cbcd07b052cd8e77b2 SHA512 8cfcd20ab0b43ffbb32389e0498b21e43cde643dcdf471a2354f1ca557f11641d250871ed5e71b9dde4c5f47ac1048746fe514f8f6cfad668fa179ed5136e802 WHIRLPOOL e975a391559aca3f8b251d2aa484cf8e344d09caa43ff56dd929e75a0ad195cf8d9a88b950679f589f4deb74aea0d22be4e7ad00b11eacc080288df0b5ac7ccb
-DIST libselinux-2.4-rc2.tar.gz 165817 SHA256 8b3b79247e6b93d49b6a9a38627e1e933cf96000117a36fe38af6a17a7d95b4d SHA512 60854a6b3efc52aa1b3f5d300aebaac889b26a51a58a8e4a5dce22a26707506b524b01706a10b6b3415e25c9eee1fbe5474e7bb7d83144ad1443c79562a565d7 WHIRLPOOL 7517be13cad652d921cf892a4e37a3e4d45676d512858a744bad5a0ed551bba210da17555845a82f14b5115c5879c813075633d76664b2bab2ade91df76a712b
-DIST libselinux-2.4-rc5.tar.gz 165951 SHA256 7e3a9a014a504ee066286c45e9b24ed90a1eb0d6abb62f972bf8a7aab3deca0f SHA512 fbc0e55ce336585818496030143ae8f43dd439868730554afd850692fd29b2022b632249d71fcbed09c8469bda97a01ab3c476fbccdc80e5c7baa5f67327d508 WHIRLPOOL f2f62dc3b801024c2b1b1bcbbfd62427d7600d00b654e578e491f584257fd9c4e71c7f64abfebb7e07403e7423ebb6b36c6169acac7ca6f008abb70ec4418020
 DIST libselinux-2.4-rc6.tar.gz 165956 SHA256 a8df5c615632b74240f4a27a9d91f7a63a73bdd7c899203d5add59fd3d24416c SHA512 a72444037294a9daab371b63b29979a3ceb4aaf2d6809bb6dabe8d4fae84dd35c141b6ecac76ef3df785b5da1c00aaefa9e648b564cfbebed517ccc8206b7dea WHIRLPOOL 101e1c9ac01b84168a4091ad67842efc9398f46ea54b22b9512a0c7a3b5354cd9c25ce2212d2da282b9e5d5a7c88a886b8eeb45dd305e127e6bf473e096a6e3c
+DIST libselinux-2.4-rc7.tar.gz 165958 SHA256 a48d03289cfbde051c59b9dcce39eabd36d14bf6093264fbb98c334e8b4f8ff8 SHA512 cb8613779e927c6920d5b0564cc4245ab7f02b88c938800ad3770c72acb00a2abcfa5f9eb2223d479ff586cbf8c2dff514c5719dcb2faceebe287f96e19df93b WHIRLPOOL 7a892ca5452cb3aa6187ccea4024b77cd5bd29d750ac14021cc88f05f2747736c8fc474c2d5f932ee7ee0d4f2e12dc80810de90620ef7f89ac10763dc50a5f5b
 DIST patchbundle-libselinux-2.2.2-r5.tar.gz 2304 SHA256 ad77f499c05ec3b5707cb9db518a891dd9c84ccb77db07e686c87e5799e1802c SHA512 a01db39a7aade27b0127dd0e2f3185587ff4d913b7b1be7beac36dc2d3e1007de5e6bae8a11bc84567385420fff064ba54892d8e113c8fd54ad3c598dde7648d WHIRLPOOL 5886d9de6fcf073d54ca5e0eac3f8b4754c44382e7044debb223f94ecc81ea0e26b7638037eef17eb6f8ce4cc5046a4bb9f93b9b7767480908ee5b2ced0413ac
 DIST patchbundle-libselinux-4.tar.gz 2631 SHA256 91bf43c84ce3d3178c8d21fdcf97380a635fa2465d1611fe4e0e3838a586c78c SHA512 bd2f9762f095e3dbc67e77ee04968cb8e87d460fdf10feff91cb1ce6027e19a660bb57617887e44608d39720e8f95500c451c4b284d58c0a756a04b08fa305c2 WHIRLPOOL 07a6a69d33c46c443907aae2ae4f3646a0360565e28d0a50cbcf81f8b5d8c259812d3e086841fc21c2a8104ce9863fc6c9c1d32e28ea08ebc7baf2d45af3509f
 EBUILD libselinux-2.2.2-r5.ebuild 2534 SHA256 a98b5b6f55cba51844b9307156d0174b5aa350092d998a7d7cb4ebef691b41ca SHA512 9c789b638cd8822cdd738906de5a0e52f2cdf5c5c88316048a790a775d9f41601ae49e971709f572dd3eca964af8ec262fcb41ed1387a6d6be1ece74ed879fe2 WHIRLPOOL 1b6800e9eb589da42f05e9d8eff6009aa4aff6e1b55bc0e81f1b8cef280726e2105a069accdf645e68f0213c02bbd610c068536a57a7e56ae42156192ef288b1
 EBUILD libselinux-2.3-r1.ebuild 3947 SHA256 ca0baaae337084e32d687b2c8d74c50b995d91e737a26ed3cddd4f51c121e68e SHA512 7e57b18370145fad0ffb13f0d121a3efe0f9bac0c51a1f5a9aa24e4bb8d8a42e25dfa2025252e43e05ac5ac020a1cff2ca2d0b842943d5746b269f0d22140f2c WHIRLPOOL 6686edc1ee477fd6495935b1038e6a0341727c2b9600098ed0deed8b8a8eced95f6b9466600b4846cf4ea78d091e3b9378daf1ddb109481e8d2c50160ff41fd7
 EBUILD libselinux-2.3-r2.ebuild 3985 SHA256 044233a7193c948555e16f133cdbc8fb75a5f674ff5bc0aed9eb267f24fe28da SHA512 b1f5e952730f7b2ed64310fec5d38d93ad8592bac713a22cf879f6d929694804aaed753ab57538f461ed246d8e7a15993d6b8e3d7f100e864af1dbb272a89ccf WHIRLPOOL 864ccf170076ef7c4e5772e6c9c645a7dda65ff290f4a2fb19c0978602636e10798658e46831cff8407349e18022eddf102e8d3b36826005410aed44a1d40f93
-EBUILD libselinux-2.4_rc2.ebuild 3846 SHA256 66c873baa7f32acfa7678b2896e7c83b16ecc8556e7ee4e40844e96af0afa653 SHA512 029b993d39c8c883caf5175014223caff857fcff391c69134a8d194c0a941118ebf7907767f8c5bc71aa80432ac482254ab1451500a3ac256ad6f779e4bf5206 WHIRLPOOL 00bf289ec7574d34bfbf572dfa178ce47b94e104ba84c8c3e29cc7a7d48516987eb8e83596e68a966bbddc63e1e849bc1a8c807639cf5812cbf36065ef7e148c
-EBUILD libselinux-2.4_rc5.ebuild 3846 SHA256 c9ef55f1c52617ddfc379b35bbb3f822eec368043a7ffa1fca11d5da0078c628 SHA512 3f7fd109c5020908f8e73456c87bd35a42a634fb0f55a4cffb1677749666c1b66451a2d695f197bacb6768c228baf2a1aa5a9e808b0c2355d017a1fde2c2a539 WHIRLPOOL 27244c8226d48370cfa18439bc907ca8dc7886b42ac12dfd4bdc00751b41f3aab451d9efc7a2e53a2806a92d0aea25f4556e906ea4fa492f971638f40126c9ed
 EBUILD libselinux-2.4_rc6.ebuild 3892 SHA256 f940baddb05300826f14ef9d578639349500e76a83d502823971aff2da2374a4 SHA512 6b09d884c9e1d9a01e7a3ea0ec291210fa64eccb6116d8beb5836548c29ec65b3fa165cf6ada7de87567c16922393433a25a2975d6be3ec8a69ae044aad6bf10 WHIRLPOOL de16bc05c9a6c73f507e5f5b17780203b0d82da537899bbc8a91dcd8d4ea8e8401fe0081d8333469565894fd1d7e6d5abe1061b5f976fd954adecad3ed228c7d
-MISC ChangeLog 20318 SHA256 ff87ae2099003075aea6d70dc10ebd2bf96fe872fbb2ceb82f7b41ac195dd9ed SHA512 15033fb7215cd4b9c0796a6e9e764849c09919bf3a872eac414bc2eabdb1f30251b8ffbd1a1d3c32c1fcdd72c8cce0b512cc62b9958afa6bf910cc18d25dc6a6 WHIRLPOOL 401ff71c93997ed3e5d0bc18b2cfc586b3de8248e9bd89fa02d137e5c1a62f5dbf498dc04f26859275e33ce01716e89c4258aeda1a44fc89c9a55b8f86a63154
+EBUILD libselinux-2.4_rc7.ebuild 3872 SHA256 97969d1e843aac13ca8660f243a34c43a29a93afef5a04c31410fbd3e323c086 SHA512 6bcae1e3055fcfd2344eb5c8a5e8f658f7f061067e0ea2c16abb6fc72f64fde51a192aca2a3ea92474050f4fe3a4710d846c5a0e7fa4a3d6c6108063db497e91 WHIRLPOOL 40e4884e0c9a75c232d8c2177de026b5edb5122238704a2dbc6174ab4bc6f270922374f25d88a43fc4d9f0c8ecc01497e31c85b7ae110e3b63b60e7d8bfee1b0
+MISC ChangeLog 20538 SHA256 48b5f1466454e377004e9441bb741e93c79fba1490a58fd0a9d9e325b83ad8c5 SHA512 e3e7ed204ae753a0308bc68c06c0b125ebba412043504f7b72b4fa1e7f1a41d69b33a82036151b37e78a5008ccd00279dce4f1334a83aa7ca03495dd34572626 WHIRLPOOL fc516aa390b2b4cdd9b4976189b32b6f2d0fbdafd2ea3a69b7b2f3bfa51315b5acc92b46ca1ce4711557ca0bebc0c385377bc984799c227f9a88d53f1fb4e939
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUgDxvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUg49jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VoZQQAJyg3v8djwoFrk8c8sRFZX/5
-H37utLXv8g0MQsU7Ja0oBGune5f8rw3hJrK/g9CVkMGMtyzfpXN0YTdHpWjymdhH
-tUdQ3npkWXmy6/Oo9tzDSiqzZOKte7pmIxnA0BKzhfJJQOKYhzx4BqQXO2op14Vf
-ettMnx+hbREMPyLSAWxId+JWCqNDx/fPdGmIv8yZIEgoYROB6zvfaFx/L9K3+g/G
-4hGUvJ8aoaLU3Ow3U0eEd8DzPHkwCG46HIYkELm13v9fFsp+H1LIwZugFDN8sTha
-rM6Yra6O1JV8a/4F9fJBs7nvmxvM020Hj62p9t15JKQXm/Ta4UcZnrq6iClAjak5
-I8Gp2ywxezjbuHCcnLzEiqXbPBgBNoUHuxluzV4sV6duyY6zoC8roJEUOe7bF7qH
-phZ7KY40R123dPy7dSLLV32/TvhMz88Kjd+ZR/cPGeTYQckRIfstnOpDgw75dRmT
-nX9kGugZmy+h1CFuXx8ltTG8YWEKC6dn1gjnJfT/vSK3u0VYxqNw81+UU+8dg9dh
-WgBEbMygE1tUaHA4i8JjcdB+eBsByJtV8EJo9FBeoppQVMAMWIVOvV/b4zaqO2pS
-cdunt+/R9N7mp2zLAxFHRoIY55dN5WriovaDaFldrbdt/ZRMbQEL/+WFaOow0UFc
-v+USDP0BDTyat+WBIkYZ
-=pvJQ
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VmX4QALtV3hsrS/o4S+R4ihRCzgmf
+/U1tWOVZg22KWzAbmyQ72k9Jq0tWGF3nZyiqmraSnn6sqvuBEJbZ9vKTKgCokNze
+Y2TC8qhgTnjjUvtrLUcME0Hyl9nvZ2/prTDVKyPZtgiQTiV9gPnxOm7fQLdYmh9R
+oG09Fxk4KbHXyPZUikuZ0JJqPiXXo9XXaLOBRDOv6m4nF6R0HW5MC7Sm4p+WW7Hc
+n0DXDDjS5/Ts89ndCmACNsM1pVE4Btg8whLlosnGFMixa5dJu27JkOHpUTCyWUeV
+3kJF4T4u0/ZaQuuuj33a1DLBT5x9fL/qkPE8NZ3vTWw3WZFelqN5/RDzC63wvVpL
+uzH7jLqTCZIGGiwNE0OGYe/NkYk87BMuLcCgiw4y30mBt2QapMyuYrVFE1MI1q6F
+QwMs8hybF+NdZjpFfOi9JGiWRnOhF+2mtn6aixl3XRh2UdrNK3ucZpBGrylfB4GY
+WjC4CxDCNLqV978r/Va7KGrE87GIwxrbsfjmYIguikvgYFd4tX5vf7u+pV0hpSSy
+KCXOHMCQ/5hskrJyy0g/SgQ/pbERa19WJnMRXh/5YfcMfx9NgqOaK9foz9ojh9I6
+C9T4xTYpm7pt+bEfTGIuWVJKUuCy0+bglMglmPa9eGAdv4wyNs0aiEZQ12fQ9esN
+zTTyJFtAaG61iJWMfg/8
+=IvQ5
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-2.4_rc5.ebuild b/sys-libs/libselinux/libselinux-2.4_rc5.ebuild
deleted file mode 100644
index cb21fa0b263d..000000000000
--- a/sys-libs/libselinux/libselinux-2.4_rc5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc5.ebuild,v 1.1 2014/10/29 17:30:23 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-USE_RUBY="ruby19 ruby20"
-
-PATCHBUNDLE="5"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-SEPOL_VER="2.4_rc4"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-		ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch"
-	epatch "${FILESDIR}/0006-build-related-fixes-bug-500674.patch"
-
-	epatch_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export PKG_CONFIG RANLIB
-	local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags)
-	local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs)
-	export PCRE_{CFLAGS,LIBS}
-
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake \
-				CC="$(tc-getCC)" \
-				PYINC="-I${PYTHON_INCLUDEDIR}" \
-				PYTHONLIBDIR="${PYTHON_LIBPATH}" \
-				PYPREFIX="${EPYTHON##*/}" \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
-			emake \
-				CC="$(tc-getCC)" \
-				RUBY=${1} \
-				RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \
-				RUBY=${1} \
-				RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
-		done
-	done
-}
diff --git a/sys-libs/libselinux/libselinux-2.4_rc2.ebuild b/sys-libs/libselinux/libselinux-2.4_rc7.ebuild
index 8e7599f06705..d11d2bf1d27e 100644
--- a/sys-libs/libselinux/libselinux-2.4_rc2.ebuild
+++ b/sys-libs/libselinux/libselinux-2.4_rc7.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc2.ebuild,v 1.1 2014/09/21 10:17:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc7.ebuild,v 1.1 2014/12/06 23:21:06 perfinion Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
 USE_RUBY="ruby19 ruby20"
 
-PATCHBUNDLE="5"
-
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
 
 MY_P="${P//_/-}"
-
-SEPOL_VER="2.4_rc2"
+SEPOL_VER="${PV}"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -102,6 +99,7 @@ multilib_src_install() {
 	if multilib_is_native_abi && use python; then
 		installation() {
 			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
+			python_optimize # bug 531638
 		}
 		python_foreach_impl installation
 	fi
diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
index 6ead9a167433..b8134c379ad4 100644
--- a/sys-libs/libsemanage/ChangeLog
+++ b/sys-libs/libsemanage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libsemanage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.84 2014/12/04 11:00:43 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.85 2014/12/06 23:23:32 perfinion Exp $
+
+*libsemanage-2.4_rc7 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org> +libsemanage-2.4_rc7.ebuild,
+  -libsemanage-2.3-r2.ebuild, -libsemanage-2.4_rc2.ebuild,
+  -libsemanage-2.4_rc5.ebuild, -libsemanage-2.4_rc6-r1.ebuild,
+  -libsemanage-2.4_rc6.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *libsemanage-2.3-r4 (04 Dec 2014)
 
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index e654ada66ab3..a729c97e6152 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -4,36 +4,31 @@ Hash: SHA256
 AUX 0002-semanage_migrate_store-Python3-support.patch 10287 SHA256 685bab1de2fdc80952592fe7347f599b3a0dc8c5410606cd96d31275d48fae4d SHA512 4d0dd2b0b9ca81ab7a6b3bfdb89307fd33c8e7f4808ad28eda93246d01f6c91b3a73cb116a84736aa79cd7eaf7563d6aa9bffb38f974d1d445a49fc8c8d77db0 WHIRLPOOL e40042934df6c0747b36a8da53125fe91c07f1b7087f29e93f55ca8103021ff1fbb07d080b6bc5b1ca5b91ef6fdae08d6b0dddfb3e15567ff8a901397041565b
 DIST libsemanage-2.2.tar.gz 138208 SHA256 11f60bfa0f1c6063cd9bd99ce0cb4acc9d6d9e9b8d7743d39e847bcd7803bd75 SHA512 09032b1b322fec7346164939ade118034812cb538ebc72121640d4ac5c89d2a66b59caa465027cfbebb590dee039a26d4345eafedf365d7f6ad0b5e90377d50f WHIRLPOOL 49170c5ee9ff57dcc4a15aa72386f37993f76436f0da25808c60dab2d03ba52932d0d4fa753c326900d83d2fae30f8bcf659251f17327783f2e2be3deb4842f4
 DIST libsemanage-2.3.tar.gz 138231 SHA256 03e09e35e611c286e446bef92b6023ef2623815996f5a53394bb02e49a312e4b SHA512 defe3bbdbe51abdaa13a39f693c33446d8a1a8509ac1eb25c7770da2df6487bcb0ca31259d02b4531d4c81db5e221e94e95bec97f6a1a155e1de2f65e6f0da34 WHIRLPOOL 943d4d300aa8ad49c411b10b41c0c3e751c46dbcbbe129bdd1d2e975e231c58391d6ecdee6b27699fff9f6e6facf5b48fc8d57c2ff68692694c7de430750fac9
-DIST libsemanage-2.4-rc2.tar.gz 151013 SHA256 1e759200a4ef10943b3992b86d98004ad5751cf3a43b286cfa0500659debd815 SHA512 b9cfb0483481b68e5771dbb7c08413dbb7f41cfead45971ea98072aaa973723d45f6edf2ff67e909f7376de0c3d0d1e34abf1046e8f1db4607edbf0a310fc52a WHIRLPOOL f9d0abd6ff4f17d71a8c0ea74b3e4b9c3b312517d3ca8a76a4ff5a2c85d92c18f51fe25e069164691031bd121e315a86b75c37ae8281b00422400d265559349c
-DIST libsemanage-2.4-rc5.tar.gz 151083 SHA256 9596de9328fa55acaf22e3c356d201818fe1d6247d7fcc7dd3f2f8e2e894a4d8 SHA512 d1b3ffb0d40830f3a91b9b4ab520608052b23e0334aa037688ffb703e96bd061686a21256124efd207a4ae24fb53831f1a231b0c11f7a0d64f31f9a961957cf4 WHIRLPOOL 9d75f0b4cd9dad6e858c2f429f740150c946cb5c4b4c120757870473888b001d52b5249a0b68ba6a3a98c487c01d26387a64b3d0d9df06bfc04499e56cda0239
 DIST libsemanage-2.4-rc6.tar.gz 151087 SHA256 92fc0fa14dbc297de41941cb90c02225b7fc9591df29129725751f98a41c5d93 SHA512 0c3fdbce56a0b3794c451d88330d8b32da462681b4d6b9f14a2c885a6eb4b32d2510ab6bc3a830a79304ec66511c57c33ec41da030d75d3f80d51e14ac529f2b WHIRLPOOL 6ee96b1164133b480e9d1855293b6ed468b3b0ae249a457a7f5b5bd5846fc806c7efb82e3a75ea55b285966cdfbbd1603fd2e9afd9d6c82c4e5053d716f01969
+DIST libsemanage-2.4-rc7.tar.gz 151193 SHA256 7ea902f829fa76856292c0fcc09334c528bd25db5bd95224aa1a00b32cee7f60 SHA512 6330af6bda8ea6da3caba9d006542db2b9a5d25ceeefb0a1058b9b50ddc604bf9b148214c1b1450bda042b4c7c9779cb4cb6b378c5eb205f567a6c221ac51fd5 WHIRLPOOL 4a4d9f147e492926714e72eb42e6ae9a47fc8153aabacb80fe153d9cdca06a8ad5afaf8164c5b79e9aa095ef5eb7b49761a9c74b2b8804309fa9f0fe84a684f5
 EBUILD libsemanage-2.2-r2.ebuild 3210 SHA256 97027d0ced1e3aa603feb38cd4974d43e9d559519b9ff83bdb52d831080d01b2 SHA512 4f543459d29f85c42ef0370e51bb5055342e04382f4b13ca018d47da3af4acf0073bfbe0d8c340dfa00a4f2d69f7acf64df3471da543e46ed7888323b00236f8 WHIRLPOOL c8963d06b370e61c8313c0c6cd4b67ad9a28c994887266817aaa1af7a6d8761c51d9383ebd202560cdf17699d765bbcab70ed7adaa85aacf7645d8d5f656de9c
-EBUILD libsemanage-2.3-r2.ebuild 3451 SHA256 c7a81769d7838df565c99ee28fad062dbdf02311ff41579d060bae7ee878d994 SHA512 3c13ea458d3e803d6ef27c1abb13e5262674291a16a5681007a8f82e32660b907a129403bf20f131e2b2eaf27ecce8b007e7ee032c0e588a43c7f0158ceb1be1 WHIRLPOOL 15a2968969ad36f4213d81c15151a6ea620eec5f21af5ec8de2a6f3357ff9b1446d23e8f2cc17beecd8a75ba593e1ff67fd7f947af703a58851e225882e5e22f
 EBUILD libsemanage-2.3-r3.ebuild 3537 SHA256 00c6826ae6646ec7ddcf6c176035a7058962d8ba25ba2cd9febbcd4d290b3a88 SHA512 86401b345346d23e7a874bf1fd68636bd79c33e2937f9885a2a1c0c1d043c7a7bbc73b183b0687882164a6d50f70b8c5c04c38dd60dd2d6f060e764cb607fef5 WHIRLPOOL ccada4c09dfd01dc7d85f1e551438a8e8c7f7cb65a2908fb6d128c0dde447b4bf9c9ae53fc273b8466d117b7b9a170fa442977e15ebcf255f6e941239f3ac731
 EBUILD libsemanage-2.3-r4.ebuild 3575 SHA256 18d64ebc4ad9a01b934dfffcdee1bfa873cc8c08b2b96516463908ab14ac427b SHA512 c369842a3509e57ec18fec98fd6c6ef1e9033d3c47c1dc8be8c6d84b3fddf7ba927beefaf2702bcdd6ed083b3eedaf64cfae6a75e5c0819163961dcdd01abbdf WHIRLPOOL 85f1438736e4368fc17ca6319f3fded376ebee2ecd80e1d5766bddc3f9451915b6e4687e16ae3a6ccf6dc8ac24a981d31e71f9ddbc1dd293fe2917415740ef0e
-EBUILD libsemanage-2.4_rc2.ebuild 3549 SHA256 282783f8df0962d5035954cedaed996c119ae8806fdb40d6e9656543e0b3943c SHA512 dc265873655347c4aed4da4072df9ae047a781b1d0aff042d0fc750f58211c7163081d8a3df12ee28e9e45925fa2de5f43957ad17c0a8f76e4bc819902a4b61b WHIRLPOOL 84058341789f3fe9bec16c2f18d8f67f4cf0a983244da199737d04dc4af1750b8dc5d50e9b1a7a5b2ed08255dae0961df722a45103b576c1a396c1233f9647d8
-EBUILD libsemanage-2.4_rc5.ebuild 3549 SHA256 6a473e9697e607c3b03cc40c1ee1562716128daf099dcec82444af64a250e0ad SHA512 c57689f340b6174ac41edb75517197827cdb6cc0511e0968f6431355c6dc43b412c0628ea63a58fe084433c184e343312af9dc92a0435d5ca34ed2aeeba3a465 WHIRLPOOL 1464e71d68a32f854515d211f141f070e8a84f7d309823e3b9f84869fdc293f8d9b0198c6a3741afcdab56152799969a5437c7736bc594d448a668e4ff954fcb
-EBUILD libsemanage-2.4_rc6-r1.ebuild 3652 SHA256 8d0804838976890c6ae68c73ec221eb831ee03d9e5330bfe9dc303ab39948348 SHA512 66ef53255ff51cec3d6ab1e7e34a432d24e9d72777a2020de96f8ff0c31a4e99c728deaee664f3c306ad1e0fdc42c6baa6656986902572b537efa248597817ce WHIRLPOOL b98d3494a644324a264074427ba2ecd37c0898ad89d3b16146ae515d777dcc7178aed73c7ff091a1f50738bbb5cf49ab8e7e6a38bd28912ed20e3dbbf8026a64
 EBUILD libsemanage-2.4_rc6-r2.ebuild 4055 SHA256 0c4694bdf0e905ea308c252a98766c59053956d8c5a7892826c4841abf9a039a SHA512 de9a42e759891bc1ab04d70839bdaa959129455aa7510706888b40acec7f1d4b8ad187403af1b9355b6fc5986a7b890e7898cc5ff76c75dfa39fd42e33c09c67 WHIRLPOOL 735dae66a7f6a977d9331b82b988f81eda67f203cdc264e7d5a651f048e3e23c8fb6240b0f2b2d2b5ad3b5d41cac9cdbd6aecbcf9a8da85d9c8af0a2cffcc400
-EBUILD libsemanage-2.4_rc6.ebuild 3559 SHA256 74bfae2b3a00d2f8867aa8b01418ab66192a6f0e95154a39c5be276a8e07e28b SHA512 b5f9ba1d57a13d2fe91ce5f6a027bfbe29dd07a205c303e8a1c35cd97dadff22fc81f81c02e160133f5ee65ae1fe8eb5c697a48d9328fdfb6a2d73de6f3a8f84 WHIRLPOOL 514e7fe1d288525f0a13ac71c98823a26ae9580de4ecf8725a18a3a97cce351c44d0828acd061d475d03d02843c01bb9d7bd18e43b7a9c23df8a984c48b3aac6
-MISC ChangeLog 12210 SHA256 10b95ac4326de5040aba852c69c9025402c8d9742a5527cf72d93ab25fc14573 SHA512 c9adeada361e9a831827271bc26cc07cf84efcf14d922f1717272d9f4abd55b163579d4fb65cfc306be2f5eee9de32006e3f33b7045f38e2a09f023fe3c6dddf WHIRLPOOL bcbfe8e93a7f53356a43ffd8c60daf62d90732790c54df795884849f10570f608cbb7ee36daaaeb0ae4539712fda57be031cc34ab3940be0afb0c07d8d23714f
+EBUILD libsemanage-2.4_rc7.ebuild 3962 SHA256 32c2c51cd4b57e6c964cba25ae3879e288493f43a78ca72e11d06cf9e702d962 SHA512 3ee7ebe2866239a1e44ddf0ec4e91ed0dbae77173c905ec8db9b54a4d0ca89990bf4c9b36536b9c751e30b8d75adee0d85c4a6a79abb17b1513a0cfc94efb681 WHIRLPOOL c58212e4b4e6ff99dc6847b90a4bdb0da83a1d54b16db581865a1e7d3315a08e91eb03ce47d86ed1d88c6aaead90d8fe15b6b9b017557beb35f8010ad7a25d01
+MISC ChangeLog 12527 SHA256 5aa4e9760ceb302d1963b320febe409009c2d16beb1d1b7b3bc6e10bdaa38fcc SHA512 314c339d8bcc73d27090fa462c6c18f45de5d6ba5879cd849886e4bb5203db197af21c19397728ef5061ab89b338ba8718284680c723cecffdcfcc92e333b97d WHIRLPOOL 5016d2243309d6f5748ef133bb1540955ce782fcada9bff6a93e858e64226c82747c0b8e738ae53fcf700c1f77eb1dd3f1c86765d1fd8c1d1586532de5a34a96
 MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUgD7dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUg4/1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vt/EQAKSu5+0Hw5tQ+i0v0AJSH2BW
-qjXtH6umGZQ4I/p91pvLc+NaZPLyy369uKY6CxK5OLJnN2xg94kt8pk75lN7EjED
-QARZJgX2c1QvJ0Y5C9QTLfL5aAnoUKGOMly3T3Yqk0YDw1v3XsgpGlgj3KbG5iRV
-oFs9E4wqUmlzttmr9hdI7UqZU4pGG0ChgUnneSqGgwGBX3sYzB6YcghsUOB8YaPa
-d2e2E36Hap7gWVNGVbdpv6fYw1JHvOKrZRA/DJT3DJI9PVuhPG5n1zZw40VWcPbu
-2ThqI9YHYn/aGMfmoirDJnCp7OfctvnHjFMKoJKjG1EDX5PhRD8tPRrMiDscNk24
-aZ/23YAER8zQ9ezrueF4h32xyK54uufRVlMFbvF308jjUH/h9t9mOcbBqMnmeDKY
-Qk34efimRphDOY4vRgeKBEIMweLFrYktp0/49tBz98hCREUMf3kvaxrHt+vbRnf0
-DIIEkg3KbOc2D1rC9OLqKU8pViY56nfNqNoVXJ7/46Gioq/LUOZCZs4Bu4DoGsuG
-Qh0rZZNyO3OZmg3uC7fruxAzglSj9cLTb9QD/meKYdPKbC4uSBub5I1CR1grHs3z
-tcqopdIeFpr1YgrrEolF2oRXdHRLngQkJA4564RBea2VHAJmnD0snNzqrqxCen9I
-TKR2ElUakqS51CchfL6A
-=iHBi
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VvMgP+gNpYUN/fwqkCiVfAA0lohYB
+7xzATLNyLOMGubfUB9ghRVDcLGQQsEQ6XJQzgKcm1rgVK4oApARQ8aDKlaTm9alq
+E2fRtV9uQ7IHl6XCt8WrP6rUBqCCul0x5Cl+JtfkeHwC2BmQvZj8zpJC6ddH3ay1
+8EIya0RWkWBNs2CtsQ/HndtoYjcavVh8y2k5+xtfgMnyhUwmV1yYIs1EasNMJI8O
+q58AQo3F0dpCfC4Jn7tP+JuDRr7typ6ysZppFSZPMCCsOlJc7DHDH2mxg69jylYm
+QbFzwunJVSlcQpeMxGnT6PpmmH2S8+2qJSual1KW0r1MjmSxVjTGHFs3ocqxPPk0
+s8NcyT4fFI+EIbdfDIorYkYjwWfg47OQHHEzXq+JgjpMvOcfY0oM5YqNa+BXfgJG
+PjXv6sB6Y3MBKrAtd8vgMc2D1OO5dP8BcvCgMbcA/36zipnBRXUk/92Vo3VtEVuK
+cikgyNlTMpS17Gt/SNrgCiYvCHI4lUqoLTLH6LEbLdNvrnD3l/pTqqqKHKHyam7g
+gA0iiVgszuJ7ufActBbQpzyaknILmmyiDpF24509T2axcG9MO8ivmqYZ+50Lr3/U
+Rc61fy6Dpc5i/dcg/DzI0Ovah0bJ0//bulHuS/xB7/Cgp0XOG2htqcKnkEhVam/f
+b6Q/MH8N1nZ84A0nOAUD
+=0nJ/
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
deleted file mode 100644
index a2c080dfe7e8..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild,v 1.4 2014/09/21 10:20:09 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-SEPOL_VER="2.3"
-SELNX_VER="2.3"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-		${PYTHON_DEPS}
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${D}" install-pywrap
-		}
-		python_foreach_impl installation_py
-	fi
-}
diff --git a/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild b/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild
deleted file mode 100644
index 2f2b29eeb20c..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild,v 1.1 2014/09/21 10:20:09 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-SEPOL_VER="2.4_rc2"
-SELNX_VER="2.4_rc2"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-		${PYTHON_DEPS}
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
-				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
-		}
-		python_foreach_impl installation_py
-	fi
-}
diff --git a/sys-libs/libsemanage/libsemanage-2.4_rc5.ebuild b/sys-libs/libsemanage/libsemanage-2.4_rc5.ebuild
deleted file mode 100644
index 33cf2a581f78..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.4_rc5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc5.ebuild,v 1.1 2014/10/29 17:31:43 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-SEPOL_VER="2.4_rc4"
-SELNX_VER="2.4_rc4"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-		${PYTHON_DEPS}
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
-				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
-		}
-		python_foreach_impl installation_py
-	fi
-}
diff --git a/sys-libs/libsemanage/libsemanage-2.4_rc6.ebuild b/sys-libs/libsemanage/libsemanage-2.4_rc6.ebuild
deleted file mode 100644
index 3cb9f599a8de..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.4_rc6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc6.ebuild,v 1.1 2014/11/14 19:19:00 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
-
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-SEPOL_VER="2.4_rc6"
-SELNX_VER="2.4_rc6"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-		${PYTHON_DEPS}
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
-				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
-		}
-		python_foreach_impl installation_py
-	fi
-}
diff --git a/sys-libs/libsemanage/libsemanage-2.4_rc6-r1.ebuild b/sys-libs/libsemanage/libsemanage-2.4_rc7.ebuild
index 59e4b4a1adf1..fd6ae4978274 100644
--- a/sys-libs/libsemanage/libsemanage-2.4_rc6-r1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.4_rc7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc6-r1.ebuild,v 1.1 2014/11/22 13:27:42 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc7.ebuild,v 1.1 2014/12/06 23:23:32 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -9,8 +9,8 @@ inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
 
 MY_P="${P//_/-}"
 
-SEPOL_VER="2.4_rc6"
-SELNX_VER="2.4_rc6"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
 
 DESCRIPTION="SELinux kernel and policy management library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -65,8 +65,6 @@ src_prepare() {
 	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
 	echo "bzip-small=true" >> "${S}/src/semanage.conf"
 
-	epatch "${FILESDIR}/0002-semanage_migrate_store-Python3-support.patch" # bug 529252
-
 	epatch_user
 
 	multilib_copy_sources
@@ -99,7 +97,18 @@ multilib_src_install() {
 		installation_py() {
 			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
 				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
+			python_optimize # bug 531638
 		}
 		python_foreach_impl installation_py
 	fi
 }
+
+pkg_postinst() {
+	# Run the store migration without rebuilds
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		if [ ! -d "${ROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
+			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
+			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
+		fi
+	done
+}
diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index c7e305939a70..8fe6c1edfca9 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libsepol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.71 2014/11/14 19:15:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.72 2014/12/06 23:19:21 perfinion Exp $
+
+*libsepol-2.4_rc7 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org> +libsepol-2.4_rc7.ebuild,
+  -libsepol-2.4_rc2.ebuild, -libsepol-2.4_rc5.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *libsepol-2.4_rc6 (14 Nov 2014)
 
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index cd08db331832..b93119f9631f 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -3,30 +3,30 @@ Hash: SHA256
 
 DIST libsepol-2.2.tar.gz 209622 SHA256 77a4b27006295805bdbd7f240038cb32a49be1d60847d413899501702933fc0f SHA512 96e489eb29f5256fbcb1a522d3738e0c5f05fff55041989c7c26331987abc71d80ed8fdbe228aadb60248869552c5d62fa5721b6218fb093ad027bfb44fac772 WHIRLPOOL 4d1eeaa0e1964461b0b28de9e3d19e38bb28e386413280c8ef45919906c25abaf575a3ecd0f40dce0de82800d34b5e1c3d5060f1e93d0270e5fe3c3105964305
 DIST libsepol-2.3.tar.gz 209570 SHA256 cc8d8642c3b7b95d6928d65dcbca2ab0627abc1c05166637851e63c1a6eae68f SHA512 5155645642f7f09c7e1d17736d7ce1654c973d1feb9401ee67aad0a96f9bd561105b4ab1f564c60362821985023ac523d20ed40da0e5a52973f7984217ad0d03 WHIRLPOOL 15b19d021c4a52cfdae118a7a1ddd7057722286553a0e1dccfe5d92f0b8c5b1291388b8bb8d37b8f5e51fd162f57708746ccde67d0d9ae035506839cf9ba3bc0
-DIST libsepol-2.4-rc2.tar.gz 569842 SHA256 43303df588d8531d686e76724b597d0d02b7dcd10205201424ed6a3fa0da8632 SHA512 cd22ac9aff7d3bc3d4d462955eb5994f112cf9436e35ceb6f06057cfb1f45d62355f20d33a27409d28d2a4fc08ce5eea1b432f4d4df50b43b4d7388bd61cc889 WHIRLPOOL 5e7ed7c6c2c5222532c60c4dde516e82d06c97e3ed3b3907b9ab4d6c9c55629ffbad4a69e3204c41876c4279e593a157f225bd70e4ebca66eb44ddf07bc484a6
-DIST libsepol-2.4-rc5.tar.gz 570069 SHA256 19e52e92de29b26efeb8c029586d110ba77c1ddf03c2f146a89edb658174ff87 SHA512 af02f0ead43fc4b2d76aaf6b268ff03da42b4510ba74e0f2dce2321e686ed5304f4739d3e8293cb0b8cccd99780cd96747f29a912c9769456513b76732766577 WHIRLPOOL bacf9fad7e53b529a799dcfa9b22bad1963c25bbd0f930ea85cc6a62dd3962da962565854253ba642e771dde476757abc0e517844167f66203759fdbcbededc4
 DIST libsepol-2.4-rc6.tar.gz 570080 SHA256 2e54a136dd0eeecd0829664cf1f79d30b26a5f771b39d7cfdf8034708d7aff90 SHA512 9d87358cd3ff45d3674355d446176df1f6114afe8105958094e47fc9d55e402e8fec761093c40ac01fb0ef4f30ee75fe00e047db0bcf18aab00c9580f2cbc4fb WHIRLPOOL c2b86f389c4ef96d5e513cbdfdbbc8e270913d2b12e2c05066f8ba23639b382b520fbc077ceab6e0c81965a5b2dcd6a0e15eb4ee7271501056c29da004053974
+DIST libsepol-2.4-rc7.tar.gz 570495 SHA256 e84c29025ab6a455fe233bfe64e8154c827c6770cf34017fc273cb65b22807c5 SHA512 c0ac78d3f05d97938323fd00f092ba955c4ce878a64e709c37af708b1b4fbf7c0d8ddf65bcaa2c9fc4ecaffba1a4693fe6121e7425b15d1c556dd185c603726d WHIRLPOOL 6323120ff1a78e46f7cd8156cb669380e53f220d9cb0ed752013ae6e58c7cdda7c503d4fc77249306851cca3e1fabb321ed73a098c02fd142c3b7688c7a2dea5
 EBUILD libsepol-2.2.ebuild 1222 SHA256 08c723ba250cd5f8ddd6b01010270d3072a7be7589fc7e25549d8603c0c98d98 SHA512 3e3bcd6304e473b051168ab45d53d191d25e854adf0956cee5e0a7903d123c10caffe1b279a7f42c48dc84d5d1871c39559a96a1473971bae310fc28db12444f WHIRLPOOL 5fc3833e733ee06c892d0a62dd457256ca680e44bbd953f8042346d45df0383d2a339f133b6e5491e1947f53497c27dd21e1e8fe9cd6cdf05efdef9951a501a9
 EBUILD libsepol-2.3.ebuild 1226 SHA256 6dac824eb4add323ca26044c508caf12de9a93a332fa7e5c565648961b54c2d7 SHA512 219630436dd903175b5337b7b2b746d47db4877537fff4d60c8df1cb06bcc6f7f837949ec7ed5747357bd05f1c5d6878650e65572aaceec3516a18d333bb54ca WHIRLPOOL b102e0c1eff77c265505d1b96b5f38cb64c1cd00789faae455971069fdab38d6188d576820c1aa54fdb47135a7b4a9e0ed16b1e827ca0aa6448c534cb946f03c
-EBUILD libsepol-2.4_rc2.ebuild 1084 SHA256 f09545febfa9ec70e1a47ac87b8a26e9ba882e8017da57d0908d0ded2ff329a5 SHA512 4fc2d93e4cefc78db6625ef6e56ef288265f044780735ee5f85cd62390fb2c882d82aaa34fa5c78817116c47ef65993895be0082af31978de4cceeeae01b21da WHIRLPOOL 1670171d3b51ddbcc20c9aa374118bb8944a6b1e6c7cb3a94f271b37cd1d7f19c5c20cca4c3f20ff22749f0f93a5a864ca4848ab1bac4dd895cc71284e018eb4
-EBUILD libsepol-2.4_rc5.ebuild 1084 SHA256 02025dd6b189170aa4ffe6240df9135de04cd0b9e0e2788917da5461f60a1e03 SHA512 81a62891e48350fd88888034d4c549da99f16494dd7336c9118cf077a6840fc6a48060d96633e9d385b7c45ff72f98e8dab2a55bbfbdc865cfa9acc1e1d4765f WHIRLPOOL da444e7efc54833a7fd1e12f85a334d7418e535dea06c28bba0ed8ae2a501a52175b77de1dcbdae3f137ad28259a520f72f5a393a3c1f6f8db31d02bfa72e651
 EBUILD libsepol-2.4_rc6.ebuild 1084 SHA256 12e107b0a4a1c8c5d7834d9e444e400cbf9b44fd076e7c70086a62caba7245bb SHA512 d2bb61bc8153a122f0ca724c6f6c49fbad2cffd3da1d531b1f2a22edddad3e19739c2dd2c799d5d25cf250d2c95a6fc194d60f04b80732ce29507ab74a905b00 WHIRLPOOL df79c90d64a9ce0776ef38c97132f06b87af8f6d32064fcd41b2aa434fc16d8e04a725d2952363ed65e16497ad63bf302b9c65abcf93cbff0402709207b5a35a
-MISC ChangeLog 9622 SHA256 addd5eae5250f6a1eaf209bfc14e0bd13c7dc50893962816bc167ad63cc9c931 SHA512 c93618cea8b7129dc3bb38920adcbfc56147b020ed1378fb407ced35e98bc7f99a1e1a7072e49b375dedbcaafdc1e1ae86ddb4dd8508ee5c85911c6c2731c738 WHIRLPOOL 6a7cc66597e1441a3ebcd8df9c17610846798fa59ea71e10519a95b98700694b58dc35e906589cbb6e96f39bb4e5900474770dde3efb49e8926cf4af1de23f61
+EBUILD libsepol-2.4_rc7.ebuild 1088 SHA256 b498f21d806d2ae898b9c43e65ababaa54fe6384505ef9fd12705d5d37e6963a SHA512 e549838d73494970c73bb67acb998c38477ae4f634db857227df1d0a5cd0b76cec38726ff78f0569332dae1709b129bed94d55d37295b66399b0b1c6036b6c10 WHIRLPOOL b9af7f03b684514b5733d6ca5ae8407fba72872a63c1038ea8426fc32bc467dbdcdd0fbbf1c42cf2f3339b3cfa93af1f38ba7205255494f499e2e098c048ba88
+MISC ChangeLog 9838 SHA256 4e6cc231cd29718236b4d24ea62b03c2d4164692cef12f632afbbbe843260a01 SHA512 d26ef40bc827645601422a7f747fb6adb9b201fd24fe9fd946f923c65a76b3bc063b531f5a23aee412992e57d082dfc07f540242c185c7f27270d0988fda3a79 WHIRLPOOL 7f9c07b4511c65e3c4cd2955cb510c1b5c730fcd6410730411972bc04acf83ea3bb4825900c62b23c27298e5b3fc4754c457c64b795c066844af5a2c39370444
 MISC metadata.xml 255 SHA256 34be115c595485e6f130e95be8e55b8cad13a3a80a04b538c42f3544ad0936c9 SHA512 91b84276affda6ab0bc9245150d8004517342b7fad0b2f2804bb71eb6f7ef519f4631a3202a0fa48158421f1197a3ae21f20dc7fe2ded22de32767047d51fc4e WHIRLPOOL eece77047bd215015bb84ffe8c01b657f1c363a337cd129cb4c666ee51ebb8e842101428c4a149bce99683dad69e5848366cca356c2b145be7b811c818010129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUZlTLAAoJEC7dUkA7aK9HXFcP/3awF979aygbHkLONOdEFWYC
-WH5rmVnZROWN0vaXMV/ouB6SXiIp/mFqZkvtEpbRq+v1pk4N2TtAof0kSPEewpjF
-+Pgv4AKZeWS0BWR9aDJXUOXJPzWBzv+sGiyTh5nzm2ZU0Oq5Q3l366IWRmJuJRrC
-KbAduRf9PckS6tgzMMTrxsfbELsTBXrsTUm2hNIWufiQz7p+0glZjx2QR8cz/HzF
-YIAt5n1btOn0PocsauLyHPsuZrE1AvF9n7sP7uNkrGJ3h47AmQmNo3gHQq5+grdW
-w8KxbR8Vk8CH0I7durYdVaxTldELE5QZFpuqKKtL0/NmrR/wb9qAvs33BAarNcsg
-wAw5KaaWOVT/2Ny78CC9el00uQTz1IhuWds72vWAVm8r8AuAQBawJPxy/NIRaKNO
-qNNaeo3srZ9JPxLMCdPnZO3qACUBuB+fU8cXAr57Z+kFcXNmaoHIINmcer8n11jF
-u0CQ0tu6IBDfZaWDakOItY23iftHqpXDcAAaeJY9C1nAGdpXv1zPs+QMLuO9jHK5
-dRoAU1lb24Z/E1mLrQSC+Rcteax7g9CEKuVmJwsNpAnqvwNnuVhUEH5PlAobltwd
-DB73o3wJB/vkkNTnK1ZA+2AGKPaW2qUp+rfbvNVTuQ9yyW90PsXh7iZhVIBugeEE
-WqjHKvsHAzbv528s99tB
-=cjNK
+iQJ8BAEBCABmBQJUg47/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VUaoP/iLnCyZsd3kCeoj6iLvmvWei
+FXV9vhc5URA8pYJwd74DabDQOL+axrPrRCklozEAEmiNFAsXjjer3VyRqFQP2bCJ
+CU4bfmfy1PHJTqwrZMLiGukB0KqppA7aDrECbtR37wnXeOoHjPjSCY1LAkfZFc+B
+xXXsFsiKGjQQ+RXixnRNkw7I8MwFC7HOnfU+LNeG9QSDtCiV8bWEWJTMxeOLTAuS
+rjcdduuO4NTUAAIOnDYBz17ebq9vm4hcex5PQw9e/4oQYUKK+OZa2GjgEY21Q5wd
+VSaOvqMSt4yNpNjA0PjKeI3Sk+3m8OMljXQP0GALpx68oBpQwcUZEKrXwBkSZTFY
+RFrWCfWigGoTtdbW7Rk2d11vPnqtVtlTXuGsas4rfMQN2fzaXQMDqmIM0GGAmDgf
+MJXYcdSAn99mTcHvexXwJdrsrHR+FGLzF9Bsj6B5DQzLv+SG0UCnLmg0VXghvrf8
+Ua9VeHbIdnJHOPC3BjhmpDQOcOCeSBbQVgFr6u9K+Au+g96tR6vyIbm3bNCzuFiT
+TXowrsBjvnXUk9othc3laCEB5dN0ffxkgncFKKJlNv2kOglPGe57C37W6gkjJy4j
+KGvdwTxJ2ohNcpg+CjhffY6kjVALyouONj1U83JMi5DXHx6MtrusAXiNWp635GZB
+VkSvM1ILunE0N/lqkxW2
+=RdZ1
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsepol/libsepol-2.4_rc5.ebuild b/sys-libs/libsepol/libsepol-2.4_rc5.ebuild
deleted file mode 100644
index 014f9043e105..000000000000
--- a/sys-libs/libsepol/libsepol-2.4_rc5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.4_rc5.ebuild,v 1.1 2014/10/29 17:32:26 swift Exp $
-
-EAPI="4"
-
-inherit multilib toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export RANLIB;
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
-}
diff --git a/sys-libs/libsepol/libsepol-2.4_rc2.ebuild b/sys-libs/libsepol/libsepol-2.4_rc7.ebuild
index e5b5237e79f7..a2431368b7f7 100644
--- a/sys-libs/libsepol/libsepol-2.4_rc2.ebuild
+++ b/sys-libs/libsepol/libsepol-2.4_rc7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.4_rc2.ebuild,v 1.1 2014/09/21 10:21:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.4_rc7.ebuild,v 1.1 2014/12/06 23:19:21 perfinion Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit multilib toolchain-funcs eutils multilib-minimal