Added a kernel patch so --config can enable hdaps on my Z60m

Package-Manager: portage-2.1.1_pre1-r3

4 files changed, 38 insertions, 11 deletions

diff --git a/app-laptop/hdapsd/ChangeLog b/app-laptop/hdapsd/ChangeLog
index 30e0fd818f74..d8a05d8199d4 100644
--- a/app-laptop/hdapsd/ChangeLog
+++ b/app-laptop/hdapsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/hdapsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.1 2006/06/26 20:07:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.2 2006/06/27 09:51:45 uberlord Exp $
+
+  27 Jun 2006; Roy Marples <uberlord@gentoo.org> +files/hdaps-Z60m.patch,
+  hdapsd-20060409.ebuild:
+  Added a kernel patch so --config can enable hdaps on my Z60m
 
 *hdapsd-20060409 (26 Jun 2006)
 
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index de923479a786..84a38113d1a8 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,3 +1,7 @@
+AUX hdaps-Z60m.patch 352 RMD160 963be45785af235fa3e0d74d68d2e75fad663396 SHA1 317de158fdacdd379a94b0652b54ed48525a71bc SHA256 05b0def085f637bae8561a825d7ff3ffc51bdd33609b1520e2d30aa807f00016
+MD5 d2dc49b9cfea10c6e8b09fc8a3077bc4 files/hdaps-Z60m.patch 352
+RMD160 963be45785af235fa3e0d74d68d2e75fad663396 files/hdaps-Z60m.patch 352
+SHA256 05b0def085f637bae8561a825d7ff3ffc51bdd33609b1520e2d30aa807f00016 files/hdaps-Z60m.patch 352
 AUX hdapsd.conf 321 RMD160 5bb760d34bca3f5a12aeb057b78de7e2a9065bc3 SHA1 ade013dab6278a385b4658aad7e871b743380689 SHA256 22e1acf385427052a12858db005fd73d42d9f6818fb253b032cd326101df2e34
 MD5 ef4095f13d4c1a5363c3ed2e0528bd08 files/hdapsd.conf 321
 RMD160 5bb760d34bca3f5a12aeb057b78de7e2a9065bc3 files/hdapsd.conf 321
@@ -8,14 +12,14 @@ RMD160 c3034ecda4674ed3b6143b6dd7a93affe5d7ee3c files/hdapsd.init 1201
 SHA256 1d14fe6d0ade3651c259d4e438d5aa031aa9444086d3fbb0187dbcb7b3ce337e files/hdapsd.init 1201
 DIST hdaps_protect-patches-1.tar.bz2 6179 RMD160 5b173034eebbbee598e01d45e5e76e2859c0a829 SHA1 7d79652ddc884b6619944a0d9ed70557e9c56779 SHA256 ab4192fa3a26497fe9fed63bfaedfebc74d288a85e7283b1bc338984be1133dd
 DIST hdapsd-20060409.c.bz2 5253 RMD160 0b8d07a2612bd4888014913bd8810de664352bfb SHA1 df6c5bf28d4539e97bb1800a455a36cf690d4779 SHA256 e8e1788d485814cd294c33744b60265423d8971abf5ab50b037f05de2c710a21
-EBUILD hdapsd-20060409.ebuild 2283 RMD160 b467e18c55711e1bb9899df8a2304815983f6563 SHA1 d5fac4b62309e4ab30f9827a0a13bb6769906e2a SHA256 830539b8d0a3d31f078cbbe74b028f3f792ee19a22d0ab58add85d43a9521c22
-MD5 d161563872b244c43562d62fd4fd277f hdapsd-20060409.ebuild 2283
-RMD160 b467e18c55711e1bb9899df8a2304815983f6563 hdapsd-20060409.ebuild 2283
-SHA256 830539b8d0a3d31f078cbbe74b028f3f792ee19a22d0ab58add85d43a9521c22 hdapsd-20060409.ebuild 2283
-MISC ChangeLog 451 RMD160 e60ec7f1476828e16e3ec21f0aedddd30dabc21c SHA1 fcce84db70bc8009f3dadcfb7bc42dcec10adbb8 SHA256 fefd2571bf095a09bd168fb5b7397d5b5ddfd81c44242c87b3d3508fedf77e1d
-MD5 2effa4cd13172cdc56f1266777ad4e38 ChangeLog 451
-RMD160 e60ec7f1476828e16e3ec21f0aedddd30dabc21c ChangeLog 451
-SHA256 fefd2571bf095a09bd168fb5b7397d5b5ddfd81c44242c87b3d3508fedf77e1d ChangeLog 451
+EBUILD hdapsd-20060409.ebuild 2580 RMD160 066fcfe85272a021522affda7dcacf30ef4714d8 SHA1 fca506659733b4d68572d319258209fc7c9d6c13 SHA256 04fb2fab8e9577df428f2f50f8ddd05f59e3db5738b5166ea505c6a6750ac1e5
+MD5 7f00a58da59da0dbf4248b330cd41dea hdapsd-20060409.ebuild 2580
+RMD160 066fcfe85272a021522affda7dcacf30ef4714d8 hdapsd-20060409.ebuild 2580
+SHA256 04fb2fab8e9577df428f2f50f8ddd05f59e3db5738b5166ea505c6a6750ac1e5 hdapsd-20060409.ebuild 2580
+MISC ChangeLog 615 RMD160 4d8c7c1f31034518886c22621c0b0f7d7fa8e07d SHA1 875fe550ed74b3102ce244cce4ecb7c66debf37d SHA256 78e40afc63524490570d6d6eb05c9fef5c739aa8ae01172388a522c5f0f47e01
+MD5 c9e34f75dce9400b419d168f5c8d6cad ChangeLog 615
+RMD160 4d8c7c1f31034518886c22621c0b0f7d7fa8e07d ChangeLog 615
+SHA256 78e40afc63524490570d6d6eb05c9fef5c739aa8ae01172388a522c5f0f47e01 ChangeLog 615
 MISC metadata.xml 356 RMD160 140232e3535cb4f3eecb376611b3419519b4b260 SHA1 2563060180594d039fa175a73a8437bc13af5660 SHA256 29a57a39b3a1fdf3091c4012b4161c27b043da505743cf665860527545a9a1fa
 MD5 29203234d07d55e82b92c297ab988473 metadata.xml 356
 RMD160 140232e3535cb4f3eecb376611b3419519b4b260 metadata.xml 356
diff --git a/app-laptop/hdapsd/files/hdaps-Z60m.patch b/app-laptop/hdapsd/files/hdaps-Z60m.patch
new file mode 100644
index 000000000000..57c723c01b6a
--- /dev/null
+++ b/app-laptop/hdapsd/files/hdaps-Z60m.patch
@@ -0,0 +1,10 @@
+--- drivers/hwmon/hdaps.c	2006-06-26 09:37:31.131424200 +0100
++++ drivers/hwmon/hdaps.c	2006-06-26 09:39:49.000000000 +0100
+@@ -539,6 +539,7 @@
+ 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"),
+ 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),
+ 		HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"),
++		HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"),
+ 		{ .ident = NULL }
+ 	};
+ 
diff --git a/app-laptop/hdapsd/hdapsd-20060409.ebuild b/app-laptop/hdapsd/hdapsd-20060409.ebuild
index 588aeaf51877..67896d6a803b 100644
--- a/app-laptop/hdapsd/hdapsd-20060409.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20060409.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20060409.ebuild,v 1.1 2006/06/26 20:07:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20060409.ebuild,v 1.2 2006/06/27 09:51:45 uberlord Exp $
 
 inherit eutils linux-info
 
@@ -34,7 +34,7 @@ src_install() {
 	newinitd "${FILESDIR}"/hdapsd.init hdapsd
 
 	# Install our kernel patches
-	dodoc *.patch
+	dodoc *.patch "${FILESDIR}"/hdaps-Z60m.patch
 }
 
 kernel_patched() {
@@ -62,6 +62,15 @@ pkg_config() {
 
 	cd "${KERNEL_DIR}"
 	epatch "${docdir}/${p}"
+
+	# This is just a nice to have for me as I use a Z60m myself
+	if ! grep "Z60m" "${KERNEL_DIR}"/drivers/hwmon/hdaps.c ; then
+		epatch "${docdir}"/hdaps-Z60m.patch.gz
+	fi
+
+	echo
+	einfo "Now you should rebuild your kernel, its modules"
+	einfo "and then install them."
 }
 
 pkg_postinst(){