Spring cleanup

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

5 files changed, 6 insertions, 160 deletions

diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index 8c834b016ea7..2e0dbac6afd2 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libsepol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.64 2014/05/09 20:28:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.65 2014/05/10 14:03:07 swift Exp $
+
+  10 May 2014; Sven Vermeulen <swift@gentoo.org> -libsepol-2.1.9-r1.ebuild,
+  -libsepol-2.1.9-r2.ebuild, -libsepol-2.3_rc1.ebuild,
+  -files/libsepol-2.1.4-fix_role_fix_callback.patch:
+  Spring cleanup
 
 *libsepol-2.3 (09 May 2014)
 
diff --git a/sys-libs/libsepol/files/libsepol-2.1.4-fix_role_fix_callback.patch b/sys-libs/libsepol/files/libsepol-2.1.4-fix_role_fix_callback.patch
deleted file mode 100644
index 256cc52090f3..000000000000
--- a/sys-libs/libsepol/files/libsepol-2.1.4-fix_role_fix_callback.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr libsepol-2.1.4.orig/src/expand.c libsepol-2.1.4-fix_role_fix_callback/src/expand.c
---- libsepol-2.1.4.orig/src/expand.c	2012-02-25 14:34:37.408341044 +0100
-+++ libsepol-2.1.4-fix_role_fix_callback/src/expand.c	2012-02-25 14:35:58.345341216 +0100
-@@ -688,6 +688,11 @@
- 		return 0;
- 	}
- 
-+	if (!is_id_enabled(id, state->base, SYM_ROLES)) {
-+		/* Identifiers scope is not enabled */
-+		return 0;
-+	}
-+
- 	if (role->flavor != ROLE_ATTRIB)
- 		return 0;
- 
diff --git a/sys-libs/libsepol/libsepol-2.1.9-r1.ebuild b/sys-libs/libsepol/libsepol-2.1.9-r1.ebuild
deleted file mode 100644
index 4ba5ee90df4d..000000000000
--- a/sys-libs/libsepol/libsepol-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.1.9-r1.ebuild,v 1.2 2013/06/16 18:11:28 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/20130423/${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.9-r2.ebuild b/sys-libs/libsepol/libsepol-2.1.9-r2.ebuild
deleted file mode 100644
index 421ecac3bd67..000000000000
--- a/sys-libs/libsepol/libsepol-2.1.9-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.1.9-r2.ebuild,v 1.1 2013/08/15 18:22:22 swift Exp $
-
-EAPI="4"
-
-inherit multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20130423/${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
-
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export RANLIB;
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
-}
diff --git a/sys-libs/libsepol/libsepol-2.3_rc1.ebuild b/sys-libs/libsepol/libsepol-2.3_rc1.ebuild
deleted file mode 100644
index 3e168142080a..000000000000
--- a/sys-libs/libsepol/libsepol-2.3_rc1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.3_rc1.ebuild,v 1.1 2014/04/28 19:38:15 swift Exp $
-
-EAPI="4"
-
-inherit multilib toolchain-funcs eutils multilib-minimal
-
-MY_P="${P//_/-}"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/2.3-rc1/${MY_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=""
-
-S="${WORKDIR}/${MY_P}"
-
-# 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
-
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export RANLIB;
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
-}