bump of policycoreutils-extra, fixes bugs 544598, 517456, 517450

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

4 files changed, 209 insertions, 39 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 975152c22997..2440466c3f0e 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.154 2015/06/09 15:38:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.155 2015/07/04 12:43:43 perfinion Exp $
+
+*policycoreutils-2.4-r1 (04 Jul 2015)
+
+  04 Jul 2015; Jason Zaman <perfinion@gentoo.org>
+  +policycoreutils-2.4-r1.ebuild, policycoreutils-9999.ebuild:
+  bump of policycoreutils-extra, fixes bugs 544598, 517456, 517450
 
 *policycoreutils-9999 (09 Jun 2015)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 95f5e62bf236..a3069029218c 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0001-policycoreutils-pp-add-roletype-statements-for-both-.patch 2157 SHA256 799b93fde622a168e0c7b1a0a1ec1a0a65873379e1245ec42859c00a06ca1372 SHA512 fb96bcf8bf045092be98dfce3c2d010984428f2a302e53c72af236eb1466465a27c6fba00e0912cafb28159e3d233fd82220c2456a2b8df36ba2d1286b9752fa WHIRLPOOL e1a829e0710e045c7a7ba622f4c79e8ff9d59c370b838e45ccca95416845d92a6d690cd65be2c99aa020ec7a6db2692988db7b5d72823d42f977124b35abcb17
 AUX 0010-remove-sesandbox-support.patch 747 SHA256 af6969721dede49f4de4e1db8e98e8400a8f0e3ec0b55aee9295aea0d6ba3b9a SHA512 b7b54191d2b8703393dd23a7fcccbdc3e2b7234acd962e994c8549eebae6cae3b6f62055b47a2d5db94510739abfb2fa365090c452422b6fbc02ad625ebe4859 WHIRLPOOL 1ed396c3346123af9fc8a5e911a6c241e2b64d7424b2d5194b0cc7c6b44a960c70afde3d04a508ecf525af038a52c739bc424230db34fcb52096304b2cda2771
@@ -16,28 +16,30 @@ DIST policycoreutils-2.3.tar.gz 4984980 SHA256 864cfaee58b5d2f15b140c354e59666e5
 DIST policycoreutils-2.4.tar.gz 5004280 SHA256 b819f876f12473783ccce9f63b9a79cd77177477cd6d46818441f808cc4c3479 SHA512 0eb0ea569c1699ed78e5e9798d9f182b3a8bfa6dcd387bcc78923755b3a1cad982673db88857745154d3769d44402b87e52d5fe3024874001f61f783aa25cce6 WHIRLPOOL d101080973ef6248617b5bca9d8b76e59008061b3411aec4ed95343af09b941a34acb3bb0001da5468595c4c37684ab6f34204e18ccb3cbbd5b3d31df0cb5e7f
 DIST policycoreutils-extra-1.31.tar.bz2 16080 SHA256 ad0a78d96fd01aa51fe774e1701bd23934cd72182b2bad68112006f0ea17cc7b SHA512 520f93f1a2ce3c60a1d192b09cb9a968d207fbc6ab1f01861be95a50b65264f706335620ccbca48ce38f81581a4cf5128e5db9e5b0564460c9f05f04038abfba WHIRLPOOL 56e713b9bd8f1af1496f383f45f1ef8d373b3f45148237bfd28c016f4becaa87d932b363d165b46c657ea3a08503e7bc60b1c5a5a2a814a659770bedf33d4202
 DIST policycoreutils-extra-1.33.tar.bz2 16191 SHA256 743c3930277102f5545907314b21e98955e88be7972e30264c6cb5dca370b788 SHA512 3f6f19ae33d5b1043f2979fb3e79bc061767f7051cbd0981e5c5663b4391fa29544b2184b384c9fce7b4100623bc776748d77a01865dcee78b0756d73ee10886 WHIRLPOOL e74b9c3a6dff563b81bf3ce85119fbdfc658191ac063763f2916a7dcd90584f98cbccd1d6cd5ef3aecb00366a82c949c62ab9b907cb98800cb53d3e9ab63b492
+DIST policycoreutils-extra-1.34.tar.bz2 12107 SHA256 56ae2aac57bf104d6a8a7837b25de7978b25e0642744ef95e6e6d483201aa4ca SHA512 b1db6d70cf864023f22583e5bd24c85e796f1541f9c1bc878dd55309464b27346e05e414db3ef81bef2dfe8c8d7d7063ee7e0422878f38a3db56c67d9468b89d WHIRLPOOL 8b094818bed0e438ce4258428afa054cb561f53e303d84e171881add5952cfc0fa577bce2765294905dac8ddd5560906904958f35c96afce0f357feb5333646d
 EBUILD policycoreutils-2.2.5-r4.ebuild 4708 SHA256 2287c153ef9ce72a15e1fb0d681942c79c26393dfa00436b414389334606b5e4 SHA512 d69a0cd51e9e995f59535e6e72a3e62d4a5e3f75aeb8a98f9e6dd6ce7f02b4ca19d479395bcfccdeba7b932c484bc90308a3f563d621c0f3f626c4aa5b927c5a WHIRLPOOL c34a44c55bc221274f3f19e8f72fbf1d649b16978d6d080ff66ba47185b0bc7e069431a818ebce1fd23ef590f656fa23e86ebef42bca870050ff2a792bf20072
 EBUILD policycoreutils-2.3-r3.ebuild 4388 SHA256 2b87e99e95421c093aed5fca66c6506261ded68dccc11d309f7e106947664093 SHA512 b00da0cb9bae1f3aa4149b178bf904a90133b7aa7985635c342cb0f5a9e135b3ebb82e14cfdc224684820c1d4085cb8532023793440eaa5e1df8f3f130887b35 WHIRLPOOL 3c8fb7ed0c0ca20985b2f6556a95e623cd04bf83c53822cacfd7702bab50ac55f025ddb15d20799292f4dfdeee702112abf80e269b5493eac128eb9f2df3dfa7
+EBUILD policycoreutils-2.4-r1.ebuild 4712 SHA256 a282afc12dd93e08cc15abd175754ffcb8bfc9c2e8eb57471c7431f8fc86dc36 SHA512 8daf68ba29175eca69ec587048f7a3088cca8473e04c3f7e72ab3f3e238fe7b1ee81727bd0ebf2088af526913df6206e1d6ec2861f13172ac15ea198a213da40 WHIRLPOOL 7424e3fc833bfcff0f6cdd3c5e14683014fca23eec4de1d4827bd30b43b589c82472f1aabeffed3ab44dea17b75b3ffb9d1a18f0537bc066cdd29e0176928d4d
 EBUILD policycoreutils-2.4.ebuild 4495 SHA256 f58265fbd9bd64bba47eef2ef7f65d6a7a62c1fea0b6754f6a48bb879156dc36 SHA512 43a099ac242de40c42132f697e248da84cde5c38ca64be38c4cb8729153a8921597a082d095a6d312b0e6422b6345099460039798c0f626533141e1bf841138b WHIRLPOOL 8d5757ae72043247b9501510bb561d6f8ae516ae54ee97a9b3e9ad68f61626cef9463b73a278d043b472988f7499baf26ef16e3619f7a7efb0e1c9264125f74d
-EBUILD policycoreutils-9999.ebuild 5262 SHA256 0bf3f18e901197cfecd321bee41a7eff1e041a657a4e1824d3678728e11d1117 SHA512 e00c2cc009bfd413267723f08e265ef3f5746591d639f5273a4d50ffc601cd60f7db63aa54803bcc536cb543ccc4a78033bdd044ad0ae15d72191603de923189 WHIRLPOOL 218f9ee27401591352d69daf1d3a7ccaa596fc2c5ebd32842fcea33d96f15e90de0ce81346bbb671d9b8f9222f91dbad17a9535af35e06d5f453e2323ebaf4db
-MISC ChangeLog 26573 SHA256 ed7d9b9bc3fd89f29cb06c58cd1274191dd2e530a3b8dd83cb2da259d09d1824 SHA512 5e326782bd849516aa8afeed38c0bb9ec52049fc15dda4ab45d5ea84a54f576bf998b02bbe5f73b8c26c26eb388c064dc1e81fa2208f5989b4203ab4cf7adb6b WHIRLPOOL 8b57bc4114ca783c3bd492bfae5875124fd07c4225e64b5ccd7974d0c6e1e576e88bbbd8dde9ae5c0fb0a8aa7850124074c6bc634da87c0d05678c145be2ef00
+EBUILD policycoreutils-9999.ebuild 5359 SHA256 7df3ffc880460e8b3f1cc95c19580b73c26762d7af8593fc28af889351a75e03 SHA512 05f391437dd8c99c4cc5b4e7e17e50ffe3a3f1a959895c5b79547d5dd520e2c98eafce491b3d4a77e66a84c4a39df6863aee76f1a88957241d1641e46c0a018b WHIRLPOOL c55d3769a5c80d9a364aa59168eb228c66eacb3db700eb8722aa904d9dd11fff47f92d662ddc8cb562263c8c5ec7e3e1ea8b5ae234e89bf58b5a853c13c31c0d
+MISC ChangeLog 26797 SHA256 16996587e8f4fd49cfea9f3b8f746818971a46903472beba1007e91111be80bf SHA512 1126e03a47ded97677f25e66b88106a5bad41972583e9e2a30005581d14d7883b66e244b33e1693bf53a34d590f186dd511c49137038e7ffc6e9a90fae2a871c WHIRLPOOL e9f73bba7e0b76ec7679d96b9c74bf46a7674f741d559d14a5aae83865b2b512dc5e0e1a5fe4bdb86eddb4d9f7e92db8b57899b079a6eafac2256e10548bd31f
 MISC metadata.xml 1031 SHA256 06b7505520a24771b371e3e969ec42a0d0235618c091f82d3c41fbcd313246ea SHA512 61c998ee18c95ff4b69b6c6d8b3b255801d8e15da326b5f0800adc76e0c264965303e0af56dc10b31ed484baa7b1f2d425f02e0454912480ad0ed6e3cc80ffed WHIRLPOOL d25970c2f991f0c6022a92248f749effe1d987425788353083ad8eb1d6aba29d97a6daed2115692c462cb66e8c441752466670c6b099a649b5ed177112970543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVfySwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZdoP/RMFcNOoP+7m2UQ0NvvLC+/6
-jxN5f+2hmhbNIzq6ebvbWYcJxPI0juRokV2QnVJNSHQFCBoRWp8bjwSlEeLZzAJ6
-MQLZ3UOCyqQ4wM897g3d85FAaBPRT1RHLyNo/GsuhgRhIRtPpfYVr+qnbB3C+XDC
-faik+Pe/4cdjAewp7a6WN7MXiG91P9t9/qNpJSTLm1H70CzCgDLrp/+3Yp2TOgkl
-XtuYJ+Uy1u/zljxWOGgMKU4Vrz6eU48THFo6MpfatkWX4hkQt/TowCHFmQi6djRV
-/jsIUybwCDo+CadMaqfhtFQvBHMju6zcD/bCyp2y2VdFlhCeUp1qVF0iO6VD5xXo
-2DCPb7QQMAKtFmb2GI0KoaTFjt4Z5kFPfuwfqCmHlIf6a3nijVHFNVrz5nhK0gqx
-ed1TEaN++f3gXor1xEUtCyqIUSyIsDSi1OlpstVudLnFf0guphSmKZHN33vfb2ou
-AMYx/3TOW8SLZdt1bqyzlwHTKzTUUuhB9eHHkrhbdT8pWZVi2YS+MzeLwJF4FzI3
-SsOD9P/bSBiA0ZIsBCHUVScc1jbw44sBkA9ASazvXqwwQZoZvrFnO2TmCM8KrB0G
-pIRGQwk0VsBE9V16IctG6Oq9RWzZL0BHgGc2lVf9mzMTzcnDBP67iAwib8nTq47y
-2cXhVWXMXttYpsJHgcOK
-=/8mn
+iQJ8BAEBCABmBQJVl9UHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VKosQALSyvDQnqqxiqig0yYCq5WuD
+zKcbXROtVkiRN1eLz1jf+Ad4wtVkpGVUf+Ozaq8Y8I12gIDu9qSU6ujzWqSq3ioW
+oZ6nWNJa6V4XMib9ZrQV4wh1F/scYN3QOgjfTpuzJBJNsxehFIpUPh6FF/cDOw3S
+v0+gOP7KcNcjOBl3G3cfDFs/IqhEdgAxP89Xl95CeJbUV3rqKBJFXV0vXPZy0wor
+tjJ7xWAivjYQIyJGFM1IU98ieDjbP65gPzNJFvPnCncSHMPVKaGgL47FycoIFi/a
+5d68WGnQ6jMRv+Q06/WmSm7bKGsq7+RwXYijrGnhK+YW7AykiJcn/uO/hKNuaz5+
+GRpFU8HOBhW8dmCe/t4GpVd+a7w+Q4LxNA055/Y/M2PTQu1GiPrdSbpsW9bdfcq0
+pbIgKlIP66aU/m+UMIcXZ25oiIdAsazWbu/qbMGbA3vuh5oyHMV5xerbPEqCiiVp
+NaMfJq3XA8/4QYwoh+gi1uF947UPPa9G/qjRTlrabZc93OZDT7fxRwDBOCG7YSLM
+GBSu4kPMDmThJBOAKCfu/Ws++6FZpV2IIwx0OL2vencxXk7mVg/V0GwYXPTaZcjw
+P8I1l6Dy2fD+seJh4wj1r7MKEWI4KFmF2B+rQmuMKGjRJeIRJepeCczBzFUMg5y+
+ftLN3tsWos6w+vyCjfmz
+=nhmq
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
new file mode 100644
index 000000000000..af17d52140be
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild,v 1.1 2015/07/04 12:43:43 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs eutils bash-completion-r1
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20150202"
+EXTRAS_VER="1.34"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
+
+IUSE="audit pam dbus"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
+	http://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
+	>=sys-libs/glibc-2.4
+	>=sys-libs/libcap-1.10-r10:=
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+	sys-libs/libcap-ng:=
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	sys-devel/gettext
+	dev-python/ipy[${PYTHON_USEDEP}]
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib:=
+	)
+	audit? ( >=sys-process/audit-1.5.1 )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	dev-python/sepolgen
+	app-misc/pax-utils
+	!<sys-apps/openrc-0.14"
+
+S1="${WORKDIR}/${MY_P}"
+S2="${WORKDIR}/policycoreutils-extra"
+S="${S1}"
+
+src_prepare() {
+	epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
+	epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
+	epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
+	epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
+	epatch "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
+	epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
+	epatch "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	epatch_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit)" \
+			PAMH="$(usex pam)" \
+			INOTIFYH="$(usex dbus)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			PYLIBVER="${EPYTHON}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDITH="$(usex audit)" \
+			PAMH="$(usex pam)" \
+			INOTIFYH="$(usex dbus)" \
+			SESANDBOX="n" \
+			AUDIT_LOG_PRIV="y" \
+			PYLIBVER="${EPYTHON}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" SHLIBDIR="${D}$(get_libdir)/rc" install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+	  python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	dodir /usr/share/doc/${PF}/mcstrans/examples
+	cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples" || die
+}
+
+pkg_postinst() {
+	# The selinux_gentoo init script is no longer needed with recent OpenRC
+	elog "The selinux_gentoo init script has been removed in this version as it is not required after OpenRC 0.13."
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index a83119396f50..e8d8e58c5ac4 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-9999.ebuild,v 1.1 2015/06/09 15:38:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-9999.ebuild,v 1.2 2015/07/04 12:43:43 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit multilib python-r1 toolchain-funcs eutils
+inherit multilib python-r1 toolchain-funcs eutils bash-completion-r1
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20150202"
 
-EXTRAS_VER="1.33"
+MY_RELEASEDATE="20150202"
+EXTRAS_VER="1.34"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
@@ -25,35 +25,35 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	SRC_URI="mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	S="${WORKDIR}/${MY_P}/${PN}"
 	S1="${WORKDIR}/${MY_P}/${PN}"
 	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz
-		mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
+		http://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}[python]
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
 	>=sys-libs/glibc-2.4
-	>=sys-libs/libcap-1.10-r10
-	>=sys-libs/libsemanage-${SEMNG_VER}[python]
-	sys-libs/libcap-ng
-	>=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libcap-1.10-r10:=
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+	sys-libs/libcap-ng:=
+	>=sys-libs/libsepol-${SEPOL_VER}:=
 	sys-devel/gettext
 	dev-python/ipy[${PYTHON_USEDEP}]
 	dbus? (
 		sys-apps/dbus
-		dev-libs/dbus-glib
+		dev-libs/dbus-glib:=
 	)
 	audit? ( >=sys-process/audit-1.5.1 )
-	pam? ( sys-libs/pam )
+	pam? ( sys-libs/pam:= )
 	${PYTHON_DEPS}"
 
 ### libcgroup -> seunshare
@@ -62,7 +62,8 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}[python]
 # pax-utils for scanelf used by rlpkg
 RDEPEND="${DEPEND}
 	dev-python/sepolgen
-	app-misc/pax-utils"
+	app-misc/pax-utils
+	!<sys-apps/openrc-0.14"
 
 src_unpack() {
 	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
@@ -97,6 +98,8 @@ src_prepare() {
 
 	epatch_user
 
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
 	python_copy_sources
 	# Our extra code is outside the regular directory, so set it to the extra
 	# directory. We really should optimize this as it is ugly, but the extra
@@ -153,11 +156,11 @@ src_install() {
 	S="${S1}" # back for later
 
 	# remove redhat-style init script
-	rm -fR "${D}/etc/rc.d"
+	rm -fR "${D}/etc/rc.d" || die
 
 	# compatibility symlinks
 	dosym /sbin/setfiles /usr/sbin/setfiles
-	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
+	bashcomp_alias setsebool getsebool
 
 	# location for policy definitions
 	dodir /var/lib/selinux
@@ -172,10 +175,10 @@ src_install() {
 	done
 
 	dodir /usr/share/doc/${PF}/mcstrans/examples
-	cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples"
+	cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples" || die
 }
 
 pkg_postinst() {
 	# The selinux_gentoo init script is no longer needed with recent OpenRC
-	elog "The selinux_gentoo init script will be removed in future versions since it is not needed with OpenRC 0.13."
+	elog "The selinux_gentoo init script has been removed in this version as it is not required after OpenRC 0.13."
 }