Fix bugs #467264 and #465846

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

3 files changed, 82 insertions, 3 deletions

diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
index 57f8f9997719..ce6a2e511f5a 100644
--- a/dev-python/sepolgen/ChangeLog
+++ b/dev-python/sepolgen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sepolgen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.31 2013/05/07 09:40:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.32 2013/05/18 18:03:42 swift Exp $
+
+*sepolgen-1.1.9-r2 (18 May 2013)
+
+  18 May 2013; Sven Vermeulen <swift@gentoo.org> sepolgen-1.1.9-r1.ebuild,
+  +sepolgen-1.1.9-r2.ebuild:
+  Fix bugs 467264 (correct Makefile path), 465846 (fix tests)
 
 *sepolgen-1.1.9-r1 (07 May 2013)
 
diff --git a/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild b/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild
index 1cd60beca832..5208271741b4 100644
--- a/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v 1.1 2013/05/07 09:40:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v 1.2 2013/05/18 18:03:42 swift Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -57,7 +57,8 @@ src_install() {
 
 	# Create sepolgen.conf with different devel location definition
 	local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
-	echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}/etc/selinux/sepolgen.conf";
+	mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+	echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
 }
 
 pkg_postinst() {
diff --git a/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild b/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild
new file mode 100644
index 000000000000..2fb921109dbb
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.1 2013/05/18 18:03:42 swift Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
+
+inherit python eutils
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20130423/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-${P}-r1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/libselinux-2.0[python]
+		app-admin/setools[python]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix up default paths to not be RH specific
+	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
+		"${S}/src/sepolgen/defaults.py" || die
+
+	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	epatch_user
+
+	python_src_prepare
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	if has_version sec-policy/selinux-base-policy; then
+		python_src_test
+	else
+		ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+	fi
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+	}
+	python_execute_function installation
+
+	# Create sepolgen.conf with different devel location definition
+	local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+	mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+	echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
+}
+
+pkg_postinst() {
+	python_mod_optimize sepolgen
+}
+
+pkg_postrm() {
+	python_mod_cleanup sepolgen
+}