Version bump, ported to use linux-mod.eclass. Fixes bug #39943 and bug #69669.

5 files changed, 94 insertions, 9 deletions

diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog
index 138bfb9822c3..62e34af9ca01 100644
--- a/app-laptop/thinkpad/ChangeLog
+++ b/app-laptop/thinkpad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/thinkpad
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.8 2005/01/01 14:49:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.9 2005/01/08 21:38:39 brix Exp $
+
+*thinkpad-5.8 (08 Jan 2005)
+
+  08 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/thinkpad-5.8-cpu_ptr.patch, +thinkpad-5.8.ebuild:
+  Version bump, ported to use linux-mod.eclass. Fixes bug #39943 and bug #69669.
 
   01 Oct 2004; Scott W Taylor <swtaylor@gentoo.org> thinkpad-5.7.ebuild:
   fix typo
diff --git a/app-laptop/thinkpad/Manifest b/app-laptop/thinkpad/Manifest
index f73b7af6fcab..5fbcc5f3be63 100644
--- a/app-laptop/thinkpad/Manifest
+++ b/app-laptop/thinkpad/Manifest
@@ -1,15 +1,18 @@
-MD5 874fd916dc5c2c29140636815337650e ChangeLog 2744
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 bb7237bcad0c65485331a72a3a7b5a4f thinkpad-3.2.ebuild 1112
-MD5 6361db80ee7a02086fd0499463b079fb thinkpad-4.1.ebuild 1382
 MD5 7f1ac0323cb5c09a14105276c400f5f3 thinkpad-4.3-r1.ebuild 2017
-MD5 9aa1f77e2dc49c4cefe1b61bffe2d506 thinkpad-4.3.ebuild 1914
-MD5 5a5d9bcd8a38e81c820fca56d6e9f7c2 thinkpad-4.8.ebuild 2014
 MD5 90b9583a2802625b94b2673fba2856af thinkpad-5.7.ebuild 1866
+MD5 6361db80ee7a02086fd0499463b079fb thinkpad-4.1.ebuild 1382
+MD5 5a5d9bcd8a38e81c820fca56d6e9f7c2 thinkpad-4.8.ebuild 2014
+MD5 9aa1f77e2dc49c4cefe1b61bffe2d506 thinkpad-4.3.ebuild 1914
+MD5 bb7237bcad0c65485331a72a3a7b5a4f thinkpad-3.2.ebuild 1112
+MD5 874fd916dc5c2c29140636815337650e ChangeLog 2744
+MD5 d180798471c6edd602701632a239a57b thinkpad-5.8.ebuild 1136
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 67a420196c59076408625a82b1b0f3eb files/digest-thinkpad-3.2 63
 MD5 f6711c6d29ed136c770235acf6bebf4a files/digest-thinkpad-4.1 63
 MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3 63
-MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3-r1 63
 MD5 feffa2e3a3d70a62bd850ad019807206 files/digest-thinkpad-4.8 63
-MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545
 MD5 94ca61fed5cf33f3a408cca8edad7d0b files/digest-thinkpad-5.7 63
+MD5 87bb1964098b9b0fd2093bc245c16699 files/digest-thinkpad-5.8 63
+MD5 53ea99e36366006d376acc68b63762eb files/thinkpad-5.8-cpu_ptr.patch 634
+MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545
+MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3-r1 63
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-5.8 b/app-laptop/thinkpad/files/digest-thinkpad-5.8
new file mode 100644
index 000000000000..6930ddfbc689
--- /dev/null
+++ b/app-laptop/thinkpad/files/digest-thinkpad-5.8
@@ -0,0 +1 @@
+MD5 288ab19587bb3a8a4d6097448059b4c6 thinkpad_5.8.tar.gz 75879
diff --git a/app-laptop/thinkpad/files/thinkpad-5.8-cpu_ptr.patch b/app-laptop/thinkpad/files/thinkpad-5.8-cpu_ptr.patch
new file mode 100644
index 000000000000..b9f7f6f40d55
--- /dev/null
+++ b/app-laptop/thinkpad/files/thinkpad-5.8-cpu_ptr.patch
@@ -0,0 +1,14 @@
+diff -urp thinkpad-5.8/2.6/drivers/thinkpadpm.c thinkpad-5.8-cpu_ptr/2.6/drivers/thinkpadpm.c
+--- thinkpad-5.8/2.6/drivers/thinkpadpm.c	2004-09-19 11:32:57.000000000 +0200
++++ thinkpad-5.8-cpu_ptr/2.6/drivers/thinkpadpm.c	2005-01-08 21:50:29.136392080 +0100
+@@ -171,8 +171,8 @@ static inline void apm_restore_cpus(cpum
+ #define get_gdt_table()	(cpu_gdt_table[get_cpu()])
+ #define put_gdt_table()	put_cpu()
+ #else
+-#define get_gdt_table()	(get_cpu_ptr(cpu_gdt_table))
+-#define put_gdt_table()	put_cpu_ptr(cpu_gdt_table)
++#define get_gdt_table()	(per_cpu_ptr(cpu_gdt_table, get_cpu()))
++#define put_gdt_table()	put_cpu()
+ #endif
+ 
+ /**
diff --git a/app-laptop/thinkpad/thinkpad-5.8.ebuild b/app-laptop/thinkpad/thinkpad-5.8.ebuild
new file mode 100644
index 000000000000..d9c5e206f395
--- /dev/null
+++ b/app-laptop/thinkpad/thinkpad-5.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-5.8.ebuild,v 1.1 2005/01/08 21:38:39 brix Exp $
+
+inherit eutils linux-mod
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Thinkpad system control kernel modules"
+
+HOMEPAGE="http://tpctl.sourceforge.net"
+SRC_URI="mirror://sourceforge/tpctl/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+
+BUILD_PARAMS="KSRC=${KV_DIR}"
+
+MODULESD_THINKPAD_DOCS="README"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	case ${KV_MINOR} in
+		4)
+			BUILD_TARGETS="all"
+			;;
+		6)
+			BUILD_TARGETS="default"
+			;;
+		*)
+			die "Unsupported kernel version."
+			;;
+	esac
+
+	MODULE_NAMES="thinkpad(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
+				smapi(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
+				superio(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
+				rtcmosram(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
+				thinkpadpm(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cpu_ptr.patch
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc AUTHORS ChangeLog SUPPORTED-MODELS TECHNOTES
+
+	doman man/*
+}