version bump and ebuild clean up, drop old RC

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)

7 files changed, 72 insertions, 248 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 46f075d0657c..76db39aec345 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.146 2014/11/22 12:59:49 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.147 2014/12/06 23:28:23 perfinion Exp $
+
+*policycoreutils-2.4_rc7 (06 Dec 2014)
+*policycoreutils-2.3-r3 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org>
+  +policycoreutils-2.3-r3.ebuild, +policycoreutils-2.4_rc7.ebuild,
+  -policycoreutils-2.4_rc2.ebuild, -policycoreutils-2.4_rc5.ebuild,
+  -policycoreutils-2.4_rc6.ebuild,
+  files/0020-disable-autodetection-of-pam-and-audit.patch,
+  files/0030-make-inotify-check-use-flag-triggered.patch,
+  policycoreutils-2.4_rc6-r1.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *policycoreutils-2.4_rc6-r1 (22 Nov 2014)
 
diff --git a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch b/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
index cac92dc36ea1..a3eeaed901d5 100644
--- a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
+++ b/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
@@ -7,8 +7,8 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
  LOCALEDIR = /usr/share/locale
 -PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
 -AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= n
-+AUDITH ?= n
++PAMH ?= no
++AUDITH ?= no
  # Enable capabilities to permit newrole to generate audit records.
  # This will make newrole a setuid root program.
  # The capabilities used are: CAP_AUDIT_WRITE.
@@ -17,7 +17,7 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
  override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
  LDLIBS += -lselinux -L$(PREFIX)/lib
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
  	override CFLAGS += -DUSE_PAM
  	EXTRA_OBJS += hashtab.o
  	LDLIBS += -lpam -lpam_misc
@@ -26,7 +26,7 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
  	LDLIBS += -lcrypt
  endif
 -ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
  	override CFLAGS += -DUSE_AUDIT
  	LDLIBS += -laudit
  endif
@@ -44,7 +44,7 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
  	install -m $(MODE) newrole $(BINDIR)
  	install -m 644 newrole.1 $(MANDIR)/man1/
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
  	test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d
  ifeq ($(LSPP_PRIV),y)
  	install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole
@@ -57,14 +57,14 @@ diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run
  LOCALEDIR ?= /usr/share/locale
 -PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
 -AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= n
-+AUDITH ?= n
++PAMH ?= no
++AUDITH ?= no
  
  CFLAGS ?= -Werror -Wall -W
  override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
  LDLIBS += -lselinux -L$(PREFIX)/lib
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
  	override CFLAGS += -DUSE_PAM
  	LDLIBS += -lpam -lpam_misc
  else
@@ -72,7 +72,7 @@ diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run
  	LDLIBS += -lcrypt
  endif
 -ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
  	override CFLAGS += -DUSE_AUDIT
  	LDLIBS += -laudit
  endif
@@ -81,7 +81,7 @@ diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run
  	install -m 644 run_init.8 $(MANDIR)/man8/
  	install -m 644 open_init_pty.8 $(MANDIR)/man8/
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
  	install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
  endif
  
@@ -93,7 +93,7 @@ diff -uNr policycoreutils-2.2.1.orig/setfiles/Makefile policycoreutils-2.2.1/set
  MANDIR = $(PREFIX)/share/man
  LIBDIR ?= $(PREFIX)/lib
 -AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+AUDITH ?= n
++AUDITH ?= no
  
  PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }')
  ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')
@@ -102,7 +102,7 @@ diff -uNr policycoreutils-2.2.1.orig/setfiles/Makefile policycoreutils-2.2.1/set
  LDLIBS = -lselinux -lsepol -L$(LIBDIR)
  
 -ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
  	override CFLAGS += -DUSE_AUDIT
  	LDLIBS += -laudit
  endif
diff --git a/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch b/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
index d48d25487912..6a31e255a952 100644
--- a/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
+++ b/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
@@ -5,10 +5,10 @@ diff -uNr policycoreutils-2.4-rc2.orig/Makefile policycoreutils-2.4-rc2/Makefile
  SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
  
 -INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-+INOTIFYH ?= n
++INOTIFYH ?= no
  
 -ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-+ifeq (${INOTIFYH}, y)
++ifeq (${INOTIFYH}, yes)
  	SUBDIRS += restorecond
  endif
  
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
index aca9d8a524fe..350f0cfc72d1 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.3-r3.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-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild,v 1.2 2014/10/29 17:33:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild,v 1.1 2014/12/06 23:28:23 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -11,16 +11,17 @@ inherit multilib python-r1 toolchain-funcs eutils
 MY_P="${P//_/-}"
 
 EXTRAS_VER="1.33"
-SEMNG_VER="2.4_rc2"
-SELNX_VER="2.4_rc2"
-SEPOL_VER="2.4_rc2"
-PATCHBUNDLE="4"
+SEMNG_VER="2.3"
+SELNX_VER="2.3"
+SEPOL_VER="2.3"
+PATCHBUNDLE="3"
 
 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/20140826/${MY_P}.tar.gz
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz
+http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -34,7 +35,7 @@ COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
 	sys-libs/libcap-ng
 	>=sys-libs/libsepol-${SEPOL_VER}
 	sys-devel/gettext
-	dev-python/ipy[${PYTHON_USEDEP}]
+	dev-python/ipy
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
@@ -58,20 +59,18 @@ S1="${WORKDIR}/${MY_P}"
 S2="${WORKDIR}/policycoreutils-extra"
 
 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_MULTI_MSG="Applying policycoreutils patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
 	epatch_user
 
 	python_copy_sources
@@ -116,11 +115,13 @@ src_install() {
 	installation-policycoreutils() {
 		einfo "Installing policycoreutils"
 		emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+		python_optimize
 	}
 
 	installation-extras() {
 		einfo "Installing policycoreutils-extra"
 		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+		python_optimize
 	}
 
 	S="${S1}" # policycoreutils
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild
index 51018a520e0d..e37cc263a32f 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.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-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v 1.1 2014/11/22 12:59:49 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v 1.2 2014/12/06 23:28:23 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -85,14 +85,14 @@ src_prepare() {
 }
 
 src_compile() {
-	local use_audit="n";
-	local use_pam="n";
-	local use_dbus="n";
-	local use_sesandbox="n";
+	local use_audit="no";
+	local use_pam="no";
+	local use_dbus="no";
+	local use_sesandbox="no";
 
-	use audit && use_audit="y";
-	use pam && use_pam="y";
-	use dbus && use_dbus="y";
+	use audit && use_audit="yes";
+	use pam && use_pam="yes";
+	use dbus && use_dbus="yes";
 
 	building() {
 		emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
@@ -104,14 +104,14 @@ src_compile() {
 }
 
 src_install() {
-	local use_audit="n";
-	local use_pam="n";
-	local use_dbus="n";
-	local use_sesandbox="n";
-
-	use audit && use_audit="y";
-	use pam && use_pam="y";
-	use dbus && use_dbus="y";
+	local use_audit="no";
+	local use_pam="no";
+	local use_dbus="no";
+	local use_sesandbox="no";
+
+	use audit && use_audit="yes";
+	use pam && use_pam="yes";
+	use dbus && use_dbus="yes";
 
 	# Python scripts are present in many places. There are no extension modules.
 	installation-policycoreutils() {
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild
deleted file mode 100644
index 757ade350e04..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild,v 1.1 2014/11/14 19:20:37 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils
-
-MY_P="${P//_/-}"
-
-EXTRAS_VER="1.33"
-SEMNG_VER="2.4_rc6"
-SELNX_VER="2.4_rc6"
-SEPOL_VER="2.4_rc6"
-PATCHBUNDLE="4"
-
-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/20140826/${MY_P}.tar.gz
-	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
-	>=sys-libs/glibc-2.4
-	>=sys-libs/libcap-1.10-r10
-	>=sys-libs/libsemanage-${SEMNG_VER}[python]
-	sys-libs/libcap-ng
-	>=sys-libs/libsepol-${SEPOL_VER}
-	sys-devel/gettext
-	dev-python/ipy[${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="${COMMON_DEPS}
-	dev-python/sepolgen
-	app-misc/pax-utils"
-
-DEPEND="${COMMON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-S1="${WORKDIR}/${MY_P}"
-S2="${WORKDIR}/policycoreutils-extra"
-
-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
-
-	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() {
-	local use_audit="n";
-	local use_pam="n";
-	local use_dbus="n";
-	local use_sesandbox="n";
-
-	use audit && use_audit="y";
-	use pam && use_pam="y";
-	use dbus && use_dbus="y";
-
-	building() {
-		emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
-	}
-	S="${S1}" # Regular policycoreutils
-	python_foreach_impl building
-	S="${S2}" # Extra set
-	python_foreach_impl building
-}
-
-src_install() {
-	local use_audit="n";
-	local use_pam="n";
-	local use_dbus="n";
-	local use_sesandbox="n";
-
-	use audit && use_audit="y";
-	use pam && use_pam="y";
-	use dbus && use_dbus="y";
-
-	# Python scripts are present in many places. There are no extension modules.
-	installation-policycoreutils() {
-		einfo "Installing policycoreutils"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
-	}
-
-	installation-extras() {
-		einfo "Installing policycoreutils-extra"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
-	}
-
-	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"
-
-	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
-	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
-
-	# location for permissive definitions
-	dodir /var/lib/selinux
-	keepdir /var/lib/selinux
-
-	# 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"
-}
-
-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 when OpenRC 0.13.x is stabilized."
-
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
-	if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. In order to continue with"
-		ewarn "the 2.4 userspace, please migrate the necessary files by executing"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store. Warnings about 'else'"
-		ewarn "blocks can be safely ignored."
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild
index 4b6fa1691283..78885a25c04c 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-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-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild,v 1.1 2014/10/29 17:33:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild,v 1.1 2014/12/06 23:28:23 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -11,10 +11,9 @@ inherit multilib python-r1 toolchain-funcs eutils
 MY_P="${P//_/-}"
 
 EXTRAS_VER="1.33"
-SEMNG_VER="2.4_rc4"
-SELNX_VER="2.4_rc4"
-SEPOL_VER="2.4_rc4"
-PATCHBUNDLE="4"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
 
 IUSE="audit pam dbus"
 
@@ -27,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPS=">=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]
@@ -47,12 +46,10 @@ COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
 ### dbus -> restorecond
 
 # pax-utils for scanelf used by rlpkg
-RDEPEND="${COMMON_DEPS}
+RDEPEND="${DEPEND}
 	dev-python/sepolgen
 	app-misc/pax-utils"
 
-DEPEND="${COMMON_DEPS}"
-
 S="${WORKDIR}/${MY_P}"
 S1="${WORKDIR}/${MY_P}"
 S2="${WORKDIR}/policycoreutils-extra"
@@ -84,17 +81,8 @@ src_prepare() {
 }
 
 src_compile() {
-	local use_audit="n";
-	local use_pam="n";
-	local use_dbus="n";
-	local use_sesandbox="n";
-
-	use audit && use_audit="y";
-	use pam && use_pam="y";
-	use dbus && use_dbus="y";
-
 	building() {
-		emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
+		emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="$(usex audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}"
 	}
 	S="${S1}" # Regular policycoreutils
 	python_foreach_impl building
@@ -103,24 +91,17 @@ src_compile() {
 }
 
 src_install() {
-	local use_audit="n";
-	local use_pam="n";
-	local use_dbus="n";
-	local use_sesandbox="n";
-
-	use audit && use_audit="y";
-	use pam && use_pam="y";
-	use dbus && use_dbus="y";
-
 	# Python scripts are present in many places. There are no extension modules.
 	installation-policycoreutils() {
 		einfo "Installing policycoreutils"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="$(usex audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install
+		python_optimize
 	}
 
 	installation-extras() {
 		einfo "Installing policycoreutils-extra"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" SHLIBDIR="${D}$(get_libdir)/rc" install
+		python_optimize
 	}
 
 	S="${S1}" # policycoreutils
@@ -136,7 +117,7 @@ src_install() {
 	dosym /sbin/setfiles /usr/sbin/setfiles
 	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
 
-	# location for permissive definitions
+	# location for policy definitions
 	dodir /var/lib/selinux
 	keepdir /var/lib/selinux