Remove old version, add an error message when using a Linux kernel equal or after 2.6.24. Closes bug #207561.

(Portage version: 2.1.4.4)

3 files changed, 18 insertions, 64 deletions

diff --git a/sys-apps/realtime-lsm/ChangeLog b/sys-apps/realtime-lsm/ChangeLog
index 9a826d628aa4..e37f2a7628c4 100644
--- a/sys-apps/realtime-lsm/ChangeLog
+++ b/sys-apps/realtime-lsm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/realtime-lsm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/ChangeLog,v 1.19 2007/12/22 17:38:58 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/ChangeLog,v 1.20 2008/02/22 10:34:27 flameeyes Exp $
+
+  22 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  -realtime-lsm-0.8.5-r1.ebuild, realtime-lsm-0.8.5-r2.ebuild:
+  Remove old version, add an error message when using a Linux kernel equal or
+  after 2.6.24. Closes bug #207561.
 
   22 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   realtime-lsm-0.8.5-r2.ebuild:
diff --git a/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild b/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild
deleted file mode 100644
index 7093da6e7242..000000000000
--- a/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild,v 1.4 2007/02/25 09:24:37 genstef Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Enable realtime capabilties via a security module."
-
-HOMEPAGE="http://www.joq.us/"
-#HOMEPAGE="http://www.sourceforge.net/projects/realtime-lsm/"
-SRC_URI="http://www.joq.us/realtime/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86 amd64"
-
-IUSE=""
-
-MODULE_NAMES="realtime(extra:)"
-BUILD_TARGETS="all"
-MODULESD_REALTIME_DOCS="AUTHORS ChangeLog README"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} TOUT=${TMP}/tmp-gas-check"
-}
-
-src_unpack() {
-	if ! linux_chkconfig_present SECURITY
-	then
-		eerror ""
-		eerror "${PN} requires you to compile in the 'different security models option."
-		eerror "In your .config: CONFIG_SECURITY=y"
-		eerror "                 CONFIG_SECURITY_CAPABILITIES=m"
-		eerror "Through 'make menuconfig': Security options-> [*] Enable different security models"
-		eerror "                           Security options-> <M> Default Linux Capabilties"
-		eerror ""
-		die "Security support not detected."
-	fi
-
-	if ! linux_chkconfig_module SECURITY_CAPABILITIES
-	then
-		eerror ""
-		eerror "${PN} requires that 'Default Linux Capabilities' be compiled as a module."
-		eerror "In your .config: CONFIG_SECURITY_CAPABILITIES=m"
-		eerror "Through 'make menuconfig': Security options-> <M> Default Linux Capabilties"
-		eerror ""
-		die "Default Linux capabilities (security) not detected."
-	fi
-
-	if ! kernel_is 2 6
-	then
-		die "A Linux kernel of version 2.6 is required."
-	fi
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/kmisc.patch-0.8.2_pre20041022
-	convert_to_m Makefile
-}
diff --git a/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r2.ebuild b/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r2.ebuild
index 043a5f0bb3a3..eddeef2835d3 100644
--- a/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r2.ebuild
+++ b/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r2.ebuild,v 1.7 2007/12/22 17:38:58 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r2.ebuild,v 1.8 2008/02/22 10:34:27 flameeyes Exp $
 
 inherit linux-mod eutils
 
@@ -25,6 +25,15 @@ pkg_setup() {
 }
 
 src_unpack() {
+	if kernel_is ge 2 6 24; then
+		eerror "Since version 2.6.24 of the Linux kernel, security capabilities can't be"
+		eerror "made into a module, and external security modules can't be compiled any"
+		eerror "longer."
+		eerror "Please refer to the Realtime Guide to set up a PAM-based realtime group."
+		eerror "http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
+		die "Unsupported kernel version."
+	fi
+
 	if ! kernel_is 2 6; then
 		die "A Linux kernel of version 2.6 is required."
 	fi