Version bump, remove older unstable

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

5 files changed, 16 insertions, 111 deletions

diff --git a/sys-kernel/rsbac-sources/ChangeLog b/sys-kernel/rsbac-sources/ChangeLog
index 9dc7425ff29f..10e80dc45425 100644
--- a/sys-kernel/rsbac-sources/ChangeLog
+++ b/sys-kernel/rsbac-sources/ChangeLog
@@ -1,4 +1,12 @@
 
+*rsbac-sources-3.10.7 (20 Aug 2013)
+
+  20 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +rsbac-sources-3.10.7.ebuild, -rsbac-sources-3.1.5.ebuild,
+  -rsbac-sources-3.2.19.ebuild, -rsbac-sources-3.3.8.ebuild,
+  -rsbac-sources-3.4.1.ebuild:
+  Version bump, remove older unstable
+
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
 
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-3.1.5.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild
index 0adf28d5615d..90c71fb13b79 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-3.1.5.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-3.1.5.ebuild,v 1.2 2013/03/09 21:07:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild,v 1.1 2013/08/20 15:52:22 blueness Exp $
 
 EAPI="5"
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
+K_GENPATCHES_VER="13"
 
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-${HGPV}.extras.tar.bz2"
+RSBC_VER="1.4.7"
+RSBC_PATCH="patch-linux-${PV}-rsbac-${RSBC_VER}.diff.xz"
+
+HGPV_URI="http://download.rsbac.org/patches/${RSBC_VER}/${RSBC_PATCH}"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/${RSBC_PATCH}"
 UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
 
-DESCRIPTION="Hardened + RSBAC kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+DESCRIPTION="RSBAC kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE=""
 
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-3.2.19.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-3.2.19.ebuild
deleted file mode 100644
index e8e7884e05e1..000000000000
--- a/sys-kernel/rsbac-sources/rsbac-sources-3.2.19.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-3.2.19.ebuild,v 1.2 2013/03/09 21:07:33 tomwij Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="15"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch 4520_pax-linux-3.2.18-test49.patch"
-
-DESCRIPTION="Hardened + RSBAC kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	ewarn
-	ewarn "Note: the pax patches have not been applied however they are included"
-	ewarn "in the patchset.  If you want to try to apply them, edit UNIPATCH_EXCLUDE"
-	ewarn "in this ebuild.  Expect breakage ;)"
-	ewarn
-}
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-3.3.8.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-3.3.8.ebuild
deleted file mode 100644
index 76051a163321..000000000000
--- a/sys-kernel/rsbac-sources/rsbac-sources-3.3.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-3.3.8.ebuild,v 1.2 2013/03/09 21:07:33 tomwij Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="9"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch 4520_pax-linux-3.3.7-test18.patch"
-
-DESCRIPTION="Hardened + RSBAC kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	ewarn
-	ewarn "Note: the pax patches have not been applied however they are included"
-	ewarn "in the patchset.  If you want to try to apply them, edit UNIPATCH_EXCLUDE"
-	ewarn "in this ebuild.  Expect breakage ;)"
-	ewarn
-}
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-3.4.1.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-3.4.1.ebuild
deleted file mode 100644
index 20ae8d1dbb0e..000000000000
--- a/sys-kernel/rsbac-sources/rsbac-sources-3.4.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-3.4.1.ebuild,v 1.2 2013/03/09 21:07:33 tomwij Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch 4520_pax-linux-3.4-test7.patch"
-
-DESCRIPTION="Hardened + RSBAC kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	ewarn
-	ewarn "Note: the pax patches have not been applied however they are included"
-	ewarn "in the patchset.  If you want to try to apply them, edit UNIPATCH_EXCLUDE"
-	ewarn "in this ebuild.  Expect breakage ;)"
-	ewarn
-}