diff -u /usr/portage/app-laptop/tp_smapi/tp_smapi-0.30.ebuild /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.30.ebuild
--- /usr/portage/app-laptop/tp_smapi/tp_smapi-0.30.ebuild	2007-04-20 06:35:25.000000000 -0700
+++ /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.30.ebuild	2008-04-25 11:19:05.000000000 -0700
@@ -31,7 +31,7 @@
 	fi
 
 	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
 	BUILD_TARGETS="default"
 
 	if use hdaps; then
@@ -46,6 +46,9 @@
 
 	# Ug, sudo in a Makefile
 	sed -i 's,sudo ,,' Makefile
+
+	# don't redefine CFLAGS as per kernel requirements
+	sed -i 's,CFLAGS := $(CFLAGS),EXTRA_CFLAGS :=,' Makefile
 }
 
 src_install() {
diff -u /usr/portage/app-laptop/tp_smapi/tp_smapi-0.31.ebuild /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.31.ebuild
--- /usr/portage/app-laptop/tp_smapi/tp_smapi-0.31.ebuild	2007-10-10 10:35:39.000000000 -0700
+++ /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.31.ebuild	2008-04-25 10:44:43.000000000 -0700
@@ -31,7 +31,7 @@
 	fi
 
 	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
 	BUILD_TARGETS="default"
 
 	if use hdaps; then
@@ -46,6 +46,9 @@
 
 	# Ug, sudo in a Makefile
 	sed -i 's,sudo ,,' Makefile
+
+	# don't redefine CFLAGS as per kernel requirements
+	sed -i 's,CFLAGS := $(CFLAGS),EXTRA_CFLAGS :=,' Makefile
 }
 
 src_install() {
diff -u /usr/portage/app-laptop/tp_smapi/tp_smapi-0.32.ebuild /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.32.ebuild
--- /usr/portage/app-laptop/tp_smapi/tp_smapi-0.32.ebuild	2007-11-16 10:27:10.000000000 -0800
+++ /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.32.ebuild	2008-04-25 11:19:12.000000000 -0700
@@ -31,7 +31,7 @@
 	fi
 
 	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
 	BUILD_TARGETS="default"
 
 	if use hdaps; then
@@ -46,6 +46,9 @@
 
 	# Remove usage of `sudo` in Makefile.
 	sed -i 's,sudo ,,' Makefile
+
+	# don't redefine CFLAGS as per kernel requirements
+	sed -i 's,CFLAGS := $(CFLAGS),EXTRA_CFLAGS :=,' Makefile
 }
 
 src_install() {
diff -u /usr/portage/app-laptop/tp_smapi/tp_smapi-0.33.ebuild /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.33.ebuild
--- /usr/portage/app-laptop/tp_smapi/tp_smapi-0.33.ebuild	2007-12-31 10:30:43.000000000 -0800
+++ /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.33.ebuild	2008-04-25 11:24:29.000000000 -0700
@@ -31,7 +31,7 @@
 	fi
 
 	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
 	BUILD_TARGETS="default"
 
 	if use hdaps; then
diff -u /usr/portage/app-laptop/tp_smapi/tp_smapi-0.37.ebuild /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.37.ebuild
--- /usr/portage/app-laptop/tp_smapi/tp_smapi-0.37.ebuild	2008-03-31 01:38:03.000000000 -0700
+++ /usr/local/portage/app-laptop/tp_smapi/tp_smapi-0.37.ebuild	2008-04-25 11:25:51.000000000 -0700
@@ -31,7 +31,7 @@
 	fi
 
 	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
 	BUILD_TARGETS="default"
 
 	if use hdaps; then