Revision bump, with patch to fix compilation against kernels >=2.6.19. See bug #158529

Package-Manager: portage-2.1.1-r2

5 files changed, 100 insertions, 5 deletions

diff --git a/app-laptop/omnibook/ChangeLog b/app-laptop/omnibook/ChangeLog
index 9dc3ea254176..636359b467f3 100644
--- a/app-laptop/omnibook/ChangeLog
+++ b/app-laptop/omnibook/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/omnibook
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.15 2006/11/27 15:37:50 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.16 2006/12/20 09:30:10 s4t4n Exp $
+
+*omnibook-20060817-r1 (20 Dec 2006)
+
+  20 Dec 2006; Michele Noberasco <s4t4n@gentoo.org> +omnibook-20060817-r1.ebuild:
+  Revision bump, with patch to fix compilation against kernels >=2.6.19.
+  See bug #158529.
 
   27 Nov 2006; Michele Noberasco <s4t4n@gentoo.org> omnibook-20060817.ebuild:
   Stable for x86. Closes bug #156396.
diff --git a/app-laptop/omnibook/Manifest b/app-laptop/omnibook/Manifest
index 7846edb0d0de..4e17039393d4 100644
--- a/app-laptop/omnibook/Manifest
+++ b/app-laptop/omnibook/Manifest
@@ -1,12 +1,20 @@
+AUX omnibook-2.6.19.patch 827 RMD160 b326dd5516fa288860bfd5317d84eb660e1ec9df SHA1 84400b7c357b4eb50a95578cc6bf31ec1957df2d SHA256 f0b45fde15ed812f0e70c40175862bbdd56aa1af60fe7d9d82260fc1b8793a28
+MD5 e0449741d1bc98c93ed0b645623e7d9c files/omnibook-2.6.19.patch 827
+RMD160 b326dd5516fa288860bfd5317d84eb660e1ec9df files/omnibook-2.6.19.patch 827
+SHA256 f0b45fde15ed812f0e70c40175862bbdd56aa1af60fe7d9d82260fc1b8793a28 files/omnibook-2.6.19.patch 827
 DIST omnibook-2.20060817.tar.gz 56007 RMD160 b5d7ded487155e0bc9dcecdb913c6d0622a0c74a SHA1 e91071fb61796bade2101016745e0e750ae8c004 SHA256 a22aac0cc653954df65442cff7195de08c96d3f33e96d670baba1e3605391c28
+EBUILD omnibook-20060817-r1.ebuild 1186 RMD160 97c100ec3c58437528e3112604878a9065c47d3e SHA1 e0f3edf4f6c609d88cee04ad3779e9876ed6d238 SHA256 e8de31bbf34680f938bbabe403d0e5503a56883e074ae7c0ff94936951c91f7e
+MD5 35f75dc18d13b09006c46b1c5750ea0f omnibook-20060817-r1.ebuild 1186
+RMD160 97c100ec3c58437528e3112604878a9065c47d3e omnibook-20060817-r1.ebuild 1186
+SHA256 e8de31bbf34680f938bbabe403d0e5503a56883e074ae7c0ff94936951c91f7e omnibook-20060817-r1.ebuild 1186
 EBUILD omnibook-20060817.ebuild 957 RMD160 80b1bcb5ea68be6cf779452735c6152a935cb4c9 SHA1 86d6b98d7d861a46ce758f67a924167fe7e8a44f SHA256 64e7f94ea925d5947e7f9ad1b660e8c326b5eaa91501397f86b095546d705dcf
 MD5 0bce0d6167c9169d3e548810893466eb omnibook-20060817.ebuild 957
 RMD160 80b1bcb5ea68be6cf779452735c6152a935cb4c9 omnibook-20060817.ebuild 957
 SHA256 64e7f94ea925d5947e7f9ad1b660e8c326b5eaa91501397f86b095546d705dcf omnibook-20060817.ebuild 957
-MISC ChangeLog 4186 RMD160 2da811653252423c9bfabef21c882837ae64b382 SHA1 bd9957b263937909afb2e4f4fa4a2fa74c183cb9 SHA256 109eb74961c6cb5297e8b7967d93ea35596cbcdd02bdf618f75e960fd080b871
-MD5 45c6efd613b68963e9f8708c1ad48824 ChangeLog 4186
-RMD160 2da811653252423c9bfabef21c882837ae64b382 ChangeLog 4186
-SHA256 109eb74961c6cb5297e8b7967d93ea35596cbcdd02bdf618f75e960fd080b871 ChangeLog 4186
+MISC ChangeLog 4398 RMD160 3ca45863138dfb7d430a6efdf169f3278a35330e SHA1 8c8e2be9b853509f5c6df6bc7757c913c5de49b2 SHA256 4137d564c8fc61aa076d9413ff065ae7e2f005da49f80dd3207a37cefcbf754c
+MD5 5741e98da48d923bd4935f21be577547 ChangeLog 4398
+RMD160 3ca45863138dfb7d430a6efdf169f3278a35330e ChangeLog 4398
+SHA256 4137d564c8fc61aa076d9413ff065ae7e2f005da49f80dd3207a37cefcbf754c ChangeLog 4398
 MISC metadata.xml 263 RMD160 9823453879bbb8b4e21bf8ef000ea466af72b82c SHA1 342f944838c604ecd01a0da899da58839107f805 SHA256 9e335c962f80867a497bdc60b2dc0b7506da79414ee0a4aa359ea7300fdd7eb5
 MD5 d7a9995a4a6279e77855e4ea631e6b11 metadata.xml 263
 RMD160 9823453879bbb8b4e21bf8ef000ea466af72b82c metadata.xml 263
@@ -14,3 +22,6 @@ SHA256 9e335c962f80867a497bdc60b2dc0b7506da79414ee0a4aa359ea7300fdd7eb5 metadata
 MD5 51b3634d0829a670c4fc1758a7cdbee1 files/digest-omnibook-20060817 256
 RMD160 a27edce1e2cceacf8146beedb17922dc5b70d39b files/digest-omnibook-20060817 256
 SHA256 df2aa52af4e283aeed777eb863a4b082ceff38c818f9047240403db4e9a5ecf5 files/digest-omnibook-20060817 256
+MD5 51b3634d0829a670c4fc1758a7cdbee1 files/digest-omnibook-20060817-r1 256
+RMD160 a27edce1e2cceacf8146beedb17922dc5b70d39b files/digest-omnibook-20060817-r1 256
+SHA256 df2aa52af4e283aeed777eb863a4b082ceff38c818f9047240403db4e9a5ecf5 files/digest-omnibook-20060817-r1 256
diff --git a/app-laptop/omnibook/files/digest-omnibook-20060817-r1 b/app-laptop/omnibook/files/digest-omnibook-20060817-r1
new file mode 100644
index 000000000000..d4d22a24fcff
--- /dev/null
+++ b/app-laptop/omnibook/files/digest-omnibook-20060817-r1
@@ -0,0 +1,3 @@
+MD5 62ca391fe9c99942603991b719156f53 omnibook-2.20060817.tar.gz 56007
+RMD160 b5d7ded487155e0bc9dcecdb913c6d0622a0c74a omnibook-2.20060817.tar.gz 56007
+SHA256 a22aac0cc653954df65442cff7195de08c96d3f33e96d670baba1e3605391c28 omnibook-2.20060817.tar.gz 56007
diff --git a/app-laptop/omnibook/files/omnibook-2.6.19.patch b/app-laptop/omnibook/files/omnibook-2.6.19.patch
new file mode 100644
index 000000000000..2e58b66b6c21
--- /dev/null
+++ b/app-laptop/omnibook/files/omnibook-2.6.19.patch
@@ -0,0 +1,24 @@
+diff -Nrau omnibook-2.20060817.a/ec.c omnibook-2.20060817.b/ec.c
+--- omnibook-2.20060817.orig/ec.c	2006-08-17 18:16:44.000000000 +0200
++++ omnibook-2.20060817/ec.c	2006-12-19 13:51:16.000000000 +0200
+@@ -19,7 +19,7 @@
+ #include <linux/types.h>
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/spinlock.h>
+ #include <linux/acpi.h>
+ #include <linux/version.h>
+diff -Nrau omnibook-2.20060817.a/omnibook.h omnibook-2.20060817.b/omnibook.h
+--- omnibook-2.20060817.orig/omnibook.h	2006-08-17 19:12:11.000000000 +0200
++++ omnibook-2.20060817/omnibook.h	2006-12-19 13:51:04.000000000 +0200
+@@ -18,7 +18,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ 
+ /*
diff --git a/app-laptop/omnibook/omnibook-20060817-r1.ebuild b/app-laptop/omnibook/omnibook-20060817-r1.ebuild
new file mode 100644
index 000000000000..5926a14de723
--- /dev/null
+++ b/app-laptop/omnibook/omnibook-20060817-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20060817-r1.ebuild,v 1.1 2006/12/20 09:30:10 s4t4n Exp $
+
+inherit linux-mod eutils
+
+
+MY_PV="2.${PV}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Linux kernel module for (but not limited to) HP Omnibook support"
+HOMEPAGE="http://www.sourceforge.net/projects/omnibook"
+SRC_URI="mirror://sourceforge/omnibook/${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}
+
+	# Patch to fix compilation against kernels >=2.6.19, see bug #158529
+	[ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 6 -a ${KV_PATCH} -gt 18 ] && \
+		epatch ${FILESDIR}/omnibook-2.6.19.patch
+}
+
+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
+}