Revision bump, with patch that adds support for Toshiba Satellite M30X series.

(Portage version: 2.0.51.22-r2)

5 files changed, 192 insertions, 2 deletions

diff --git a/app-laptop/omnibook/ChangeLog b/app-laptop/omnibook/ChangeLog
index 4be732ed4995..260142d1a9ad 100644
--- a/app-laptop/omnibook/ChangeLog
+++ b/app-laptop/omnibook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/omnibook
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.8 2005/06/12 16:28:33 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.9 2005/09/02 07:36:09 s4t4n Exp $
+
+*omnibook-20050217-r2 (02 Sep 2005)
+
+  02 Sep 2005; Michele Noberasco <s4t4n@gentoo.org>
+  +files/omnibook-toshiba-m30x.patch, +omnibook-20050217-r2.ebuild:
+  Revision bump, with patch to add support for Toshiba Satellite
+  M30X series...
 
 *omnibook-20050217-r1 (12 Jun 2005)
 
diff --git a/app-laptop/omnibook/Manifest b/app-laptop/omnibook/Manifest
index 742401421f38..da5d5b237847 100644
--- a/app-laptop/omnibook/Manifest
+++ b/app-laptop/omnibook/Manifest
@@ -1,7 +1,10 @@
 MD5 30cb2293af222fa772eeba6a183b0631 omnibook-20050217-r1.ebuild 1058
 MD5 f58dd95b2c1af2f9e9a8861abb497153 omnibook-20050217.ebuild 993
-MD5 0054e8971a46e804b1519ff2c9c316f2 ChangeLog 2358
+MD5 96098c2945df2278ba4e9423def83042 ChangeLog 2598
 MD5 f17c483cfcc1efe580afd0b737d3f2c3 metadata.xml 264
+MD5 dac29da74887e18545e2ac42e9b150d6 omnibook-20050217-r2.ebuild 1018
 MD5 2d8576708b1ba220c34b3844d5a9e7ec files/digest-omnibook-20050217-r1 70
+MD5 2d8576708b1ba220c34b3844d5a9e7ec files/digest-omnibook-20050217-r2 70
 MD5 2d8576708b1ba220c34b3844d5a9e7ec files/digest-omnibook-20050217 70
+MD5 1748e5d79d758b497e9c232d292e857d files/omnibook-toshiba-m30x.patch 4577
 MD5 5f8b7eeae3ca3cc3a29c274546cba038 files/omnibook-fix-obtest-segfault.patch 1426
diff --git a/app-laptop/omnibook/files/digest-omnibook-20050217-r2 b/app-laptop/omnibook/files/digest-omnibook-20050217-r2
new file mode 100644
index 000000000000..9139f57a657a
--- /dev/null
+++ b/app-laptop/omnibook/files/digest-omnibook-20050217-r2
@@ -0,0 +1 @@
+MD5 4bc497f9fca691f4ff5dc3d7eae7da83 omnibook-2005-02-17.tar.gz 53017
diff --git a/app-laptop/omnibook/files/omnibook-toshiba-m30x.patch b/app-laptop/omnibook/files/omnibook-toshiba-m30x.patch
new file mode 100644
index 000000000000..4217c4d1250a
--- /dev/null
+++ b/app-laptop/omnibook/files/omnibook-toshiba-m30x.patch
@@ -0,0 +1,130 @@
+diff -Naur omnibook-2005-02-17/init.c omnibook-2005-02-17-new/init.c
+--- omnibook-2005-02-17/init.c	2005-02-17 14:27:32.000000000 +0100
++++ omnibook-2005-02-17-new/init.c	2005-09-01 17:07:15.000000000 +0200
+@@ -191,6 +191,7 @@
+   { "TOSHIBA",  "Satellite P10*",            NULL,                             NULL,    "Toshiba Satellite P10",       TSP10 },
+   { "TOSHIBA",  "Satellite P15*",            NULL,                             NULL,    "Toshiba Satellite P15",       TSP10 },
+   { "TOSHIBA",  "Satellite P20*",            NULL,                             NULL,    "Toshiba Satellite P20",       TSP10 },
++  { "TOSHIBA",  "Satellite M30X",            NULL,                             NULL,    "Toshiba Satellite M30X",      TSM30X },
+   { "TOSHIBA",  "Satellite M35X",            NULL,                             NULL,    "Toshiba Satellite M35X",      TSM35X },
+   { "COMPAL",   NULL,                        NULL,                             "ACL00", "Compal ACL00",                XE3GF },
+   { "COMPAL",   NULL,                        NULL,                             "ACL10", "Compal ACL10",                XE3GF },
+diff -Naur omnibook-2005-02-17/omnibook.h omnibook-2005-02-17-new/omnibook.h
+--- omnibook-2005-02-17/omnibook.h	2005-02-17 14:28:41.000000000 +0100
++++ omnibook-2005-02-17-new/omnibook.h	2005-09-01 17:07:40.000000000 +0200
+@@ -41,6 +41,7 @@
+ 	AMILOD,	/* Fujitsu Amilo D */
+ 	TSP10,	/* Toshiba Satellite P10 */
+ 	TSM35X,	/* Toshiba Satellite M35X */
++	TSM30X,	/* Toshiba Satellite M30X */
+ };
+ 
+ extern struct __init proc_dir_entry *omnibook_proc_root;
+diff -Naur omnibook-2005-02-17/temperature.c omnibook-2005-02-17-new/temperature.c
+--- omnibook-2005-02-17/temperature.c	2005-02-17 14:27:32.000000000 +0100
++++ omnibook-2005-02-17-new/temperature.c	2005-09-01 17:07:58.000000000 +0200
+@@ -47,6 +47,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		if ((retval = omnibook_ec_read(XE3GF_CTMP, &temp)))
+ 			return retval;
+ 		retval = temp;
+@@ -110,6 +111,7 @@
+ 	case AMILOD:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		pmode = S_IFREG | S_IRUGO;
+ 		proc_temperature = create_proc_read_entry("temperature", pmode, omnibook_proc_root, omnibook_proc_temperature, NULL);
+ 		break;
+diff -Naur omnibook-2005-02-17/ac.c omnibook-2005-02-17-new/ac.c
+--- omnibook-2005-02-17/ac.c	2005-02-17 14:27:32.000000000 +0100
++++ omnibook-2005-02-17-new/ac.c	2005-09-01 22:54:00.000000000 +0200
+@@ -47,6 +47,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		if ((retval = omnibook_ec_read(XE3GF_ADP, &ac)))
+ 			return retval;
+ 		retval = (ac & XE3GF_ADP_MASK) ? 1 : 0;
+@@ -114,6 +115,7 @@
+ 	case AMILOD:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		pmode = S_IFREG | S_IRUGO;
+ 		proc_ac = create_proc_read_entry("ac", pmode, omnibook_proc_root, omnibook_proc_ac, NULL);
+ 		break;
+diff -Naur omnibook-2005-02-17/battery.c omnibook-2005-02-17-new/battery.c
+--- omnibook-2005-02-17/battery.c	2005-02-17 14:27:32.000000000 +0100
++++ omnibook-2005-02-17-new/battery.c	2005-09-01 22:52:08.000000000 +0200
+@@ -49,6 +49,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		if (num >= 2)
+ 			return -EINVAL;
+ 		if ((retval = omnibook_ec_read(XE3GF_BAL, &bat)))
+@@ -90,6 +91,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		offset = 0x10;
+ 		retval = omnibook_battery_present(num);
+ 		if (retval < 0)
+@@ -196,6 +198,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		offset = 0x10;
+ 		retval = omnibook_battery_present(num);
+ 		if (retval < 0)
+@@ -400,6 +403,7 @@
+ 		max = 3;
+ 		break;
+ 	case TSM35X:
++	case TSM30X:
+ 		max = 1;
+ 		break;
+ 	}
+@@ -464,6 +468,7 @@
+ 	case AMILOD:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		pmode = S_IFREG | S_IRUGO;
+ 		proc_battery = create_proc_read_entry("battery", pmode, omnibook_proc_root, omnibook_proc_battery, NULL);
+ 		break;
+diff -Naur omnibook-2005-02-17/lcd.c omnibook-2005-02-17-new/lcd.c
+--- omnibook-2005-02-17/lcd.c	2005-02-17 14:27:32.000000000 +0100
++++ omnibook-2005-02-17-new/lcd.c	2005-09-01 22:49:55.000000000 +0200
+@@ -48,6 +48,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		if ((retval = omnibook_ec_read(XE3GF_BRTS, &brgt)))
+ 			return retval;
+ 		retval = brgt &= XE3GF_BRTS_MASK;
+@@ -82,6 +83,7 @@
+ 	case XE3GF:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		if ((retval = omnibook_ec_write(XE3GF_BRTS, brgt)))
+ 			return retval;
+ 		break;
+@@ -161,6 +163,7 @@
+ 	case AMILOD:
+ 	case TSP10:
+ 	case TSM35X:
++	case TSM30X:
+ 		pmode = S_IFREG | S_IWUSR | S_IRUGO;
+ 		if (omnibook_userset)
+ 			pmode = pmode | S_IWUGO;
diff --git a/app-laptop/omnibook/omnibook-20050217-r2.ebuild b/app-laptop/omnibook/omnibook-20050217-r2.ebuild
new file mode 100644
index 000000000000..3a951753735a
--- /dev/null
+++ b/app-laptop/omnibook/omnibook-20050217-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20050217-r2.ebuild,v 1.1 2005/09/02 07:36:09 s4t4n Exp $
+
+inherit linux-mod eutils
+
+MY_P="${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+DESCRIPTION="Linux kernel module for (but not limited to) HP Omnibook support"
+HOMEPAGE="http://www.sourceforge.net/projects/omke"
+SRC_URI="mirror://sourceforge/omke/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 -ppc"
+IUSE=""
+S="${WORKDIR}/${MY_P}"
+
+MODULE_NAMES="omnibook(char:)"
+BUILD_TARGETS=" "
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNEL=${KV_MAJOR}.${KV_MINOR} KSRC=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/omnibook-fix-obtest-segfault.patch
+	epatch ${FILESDIR}/omnibook-toshiba-m30x.patch
+	convert_to_m Makefile
+}
+
+src_compile() {
+	cd misc/obtest
+	emake || die "make obtest failed"
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	dosbin misc/obtest/obtest
+	dodoc doc/*
+	docinto misc
+	dodoc misc/*.patch misc/*.txt
+	docinto hotkeys
+	dodoc misc/hotkeys/*
+
+	linux-mod_src_install
+}