Stabilize SELinux userspace for amd64 and x86

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

7 files changed, 15 insertions, 327 deletions

diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
index 99ff07b163aa..430c7c9d7fcf 100644
--- a/dev-python/sepolgen/ChangeLog
+++ b/dev-python/sepolgen/ChangeLog
@@ -1,6 +1,16 @@
 # 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.39 2013/11/04 21:57:10 swift Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.40 2014/01/20 20:06:02 swift Exp $
+
+  20 Jan 2014; Sven Vermeulen <swift@gentoo.org> -sepolgen-1.1.5.ebuild,
+  -sepolgen-1.1.5-r2.ebuild, -sepolgen-1.1.5-r3.ebuild, -sepolgen-1.1.8.ebuild,
+  -sepolgen-1.1.8-r1.ebuild, sepolgen-1.2.1.ebuild:
+  Stabilize for amd64 and x86
+
+  23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -sepolgen-1.1.5.ebuild,
+  -sepolgen-1.1.5-r2.ebuild, -sepolgen-1.1.5-r3.ebuild, -sepolgen-1.1.8.ebuild,
+  -sepolgen-1.1.8-r1.ebuild:
+  Cleanup old versions
 
 *sepolgen-1.2.1 (04 Nov 2013)
 
diff --git a/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild b/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild
deleted file mode 100644
index 3edee7359d6b..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild,v 1.3 2012/07/10 20:05:44 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/sepolgen-1.1.5-gentoo-r2.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
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-}
-
-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
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild b/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild
deleted file mode 100644
index 8f62d50cf60f..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild,v 1.2 2012/09/29 07:41:37 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/sepolgen-1.1.5-gentoo-r3.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
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-}
-
-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
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.5.ebuild b/dev-python/sepolgen/sepolgen-1.1.5.ebuild
deleted file mode 100644
index 0c3a426d3ea3..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.5.ebuild,v 1.4 2012/06/26 05:00:43 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit python
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-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
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-}
-
-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
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild b/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild
deleted file mode 100644
index 4074fbcb510c..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.8-r1.ebuild,v 1.2 2013/04/11 17:52:00 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-sepolgen-1.1.8-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
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch_user
-}
-
-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
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.8.ebuild b/dev-python/sepolgen/sepolgen-1.1.8.ebuild
deleted file mode 100644
index 904f751291d1..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.8.ebuild,v 1.3 2012/11/17 16:52:06 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-sepolgen-1.1.8-r0.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
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch_user
-}
-
-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
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.2.1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1.ebuild
index 4fd68be4a4a6..67384aaded80 100644
--- a/dev-python/sepolgen/sepolgen-1.2.1.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1.ebuild,v 1.1 2013/11/04 21:57:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1.ebuild,v 1.2 2014/01/20 20:06:02 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=sys-libs/libselinux-2.0[python]