Stabilize SELinux userspace for x86 and amd64

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

4 files changed, 13 insertions, 96 deletions

diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index ab5fcbae1c12..12305b1e7d05 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libsepol
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.61 2013/11/04 21:50:32 swift Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.62 2014/01/20 20:02:17 swift Exp $
+
+  20 Jan 2014; Sven Vermeulen <swift@gentoo.org> -libsepol-2.1.8.ebuild,
+  -libsepol-2.1.8-r1.ebuild, libsepol-2.2.ebuild:
+  Stabilize for x86 and amd64
+
+  23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -libsepol-2.1.8.ebuild,
+  -libsepol-2.1.8-r1.ebuild:
+  Cleanup old versions
 
 *libsepol-2.2 (04 Nov 2013)
 
diff --git a/sys-libs/libsepol/libsepol-2.1.8-r1.ebuild b/sys-libs/libsepol/libsepol-2.1.8-r1.ebuild
deleted file mode 100644
index 67981f0d1cff..000000000000
--- a/sys-libs/libsepol/libsepol-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.1.8-r1.ebuild,v 1.2 2012/12/30 15:19:13 swift Exp $
-
-EAPI="2"
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	EPATCH_MULTI_MSG="Applying libsepol patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	# fix up paths for multilib
-	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \
-		|| die "Fix for multilib LIBDIR failed."
-	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \
-		|| die "Fix for multilib SHLIBDIR failed."
-
-	epatch_user
-}
-
-src_compile() {
-	tc-export RANLIB;
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/sys-libs/libsepol/libsepol-2.1.8.ebuild b/sys-libs/libsepol/libsepol-2.1.8.ebuild
deleted file mode 100644
index 55c49a23ce3d..000000000000
--- a/sys-libs/libsepol/libsepol-2.1.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.1.8.ebuild,v 1.3 2012/11/17 16:56:46 swift Exp $
-
-EAPI="2"
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	# fix up paths for multilib
-	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \
-		|| die "Fix for multilib LIBDIR failed."
-	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \
-		|| die "Fix for multilib SHLIBDIR failed."
-	epatch "${FILESDIR}/libsepol-2.1.4-fix_role_fix_callback.patch"
-
-	epatch_user
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/sys-libs/libsepol/libsepol-2.2.ebuild b/sys-libs/libsepol/libsepol-2.2.ebuild
index cbfd43ce8778..644930870a7a 100644
--- a/sys-libs/libsepol/libsepol-2.2.ebuild
+++ b/sys-libs/libsepol/libsepol-2.2.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/sys-libs/libsepol/libsepol-2.2.ebuild,v 1.1 2013/11/04 21:50:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.2.ebuild,v 1.2 2014/01/20 20:02:17 swift Exp $
 
 EAPI="4"
 
@@ -13,7 +13,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=""