Revision bump to migrate intiscripts from bashisms. Punt older overshadowed stuff.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

15 files changed, 75 insertions, 602 deletions

diff --git a/app-laptop/tp_smapi/ChangeLog b/app-laptop/tp_smapi/ChangeLog
index 96b7147f7649..1d6fdb9a1cd3 100644
--- a/app-laptop/tp_smapi/ChangeLog
+++ b/app-laptop/tp_smapi/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-laptop/tp_smapi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/ChangeLog,v 1.39 2011/06/14 15:31:20 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/ChangeLog,v 1.40 2011/06/17 13:27:42 scarabeus Exp $
+
+*tp_smapi-0.40-r3 (17 Jun 2011)
+
+  17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -tp_smapi-0.20.ebuild,
+  -tp_smapi-0.21.ebuild, -tp_smapi-0.27.ebuild, -tp_smapi-0.30.ebuild,
+  -tp_smapi-0.31.ebuild, -tp_smapi-0.32.ebuild, -tp_smapi-0.33.ebuild,
+  -tp_smapi-0.37.ebuild, -tp_smapi-0.39.ebuild, -tp_smapi-0.40.ebuild,
+  -tp_smapi-0.40-r2.ebuild, +tp_smapi-0.40-r3.ebuild,
+  files/tp_smapi-0.40-initd, -files/thinkpad_ec_semaphore.patch:
+  Revision bump to migrate intiscripts from bashisms. Punt older overshadowed
+  stuff.
 
 *tp_smapi-0.40-r2 (14 Jun 2011)
 
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index fca067c1d0e2..6f17e4c0846d 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,29 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fix_header_check.patch 701 RMD160 c1a79ee4d8501831b3f7522848f979993be5eb8d SHA1 17941fc5583c4740618627d4c1c925e6217dcedd SHA256 5cfc979ac6f9f3f1fb94625b3bf3a31fc6132d3ad8670d38cff2b2116400015c
-AUX thinkpad_ec_semaphore.patch 353 RMD160 18d03b2db5816f0e560a70f56d85637f9df7fb08 SHA1 7016136350372382a8883fa0ca8eaee851fe31f1 SHA256 c6a398dae67f84069dcb5482c96d8f97391c2f6699c1267b0a180cbb17822e29
 AUX tp_smapi-0.40-2.6.37.patch 1181 RMD160 602ba1598ee7175abfda516fe61ab96b80e2691e SHA1 ed3fbf2e06def4572e8dd2b9ee16e6aac8f500ed SHA256 b36523686dd1710ee8dae2b9ba6598572afe0d564c2278a7105a0fa27fe3d4d5
 AUX tp_smapi-0.40-confd 785 RMD160 55d174b025625dd51e128baaaad2271fbddc3cab SHA1 a2a6d5198230da99dfbd3f451406ec9989b3ae49 SHA256 3996b08957adea6f14e5a0e394212026dc73e6802a8dcd5aa9a3b413530c3fdb
-AUX tp_smapi-0.40-initd 1712 RMD160 28af942ca42cbc425203a6d813d97da2b7c8825d SHA1 2931a8a94a49397cf34c59edf691c3319c0e2b0f SHA256 fa787cd06631d182bfad6f3a5ceb082e6ae8545a095a0dc6a0b8234916fbe381
-DIST tp_smapi-0.20.tgz 34365 RMD160 7798ff7da37717333475189c63488ba3d040171a SHA1 bfa0092aefbe989c2f21705bd5fef26833d755c5 SHA256 fd3e538e4f9abcd19177330293beeeb56f7f22c8d1ee3819f53276a911044634
-DIST tp_smapi-0.21.tgz 27500 RMD160 ac6858d93e3db4e98e2a2e9df1a0ed0c848f4e30 SHA1 7915953d6bd64f6c6e76df5cde725fee83049f49 SHA256 b02d494e4a25f55a77bebe1c6d6b22c3357c9fba08cfc24362feaac55ea766b9
-DIST tp_smapi-0.27.tgz 36124 RMD160 15ae9215c91d5ec3aac6110aa47da71bd66cb0d3 SHA1 dd0ce1b335ad98b08c49bfcc1dc881b35dc4f346 SHA256 a0687e565c3598ca3f343c36ed2df63802965961dbae5ab92202eaee9c8e0369
-DIST tp_smapi-0.30.tgz 36980 RMD160 fdb808a33b6c2b6251e344e89bde38afd6a5da3c SHA1 9a4c1ec215ad70dd8d2956de7c5a4ed17b76057a SHA256 6f1d16bffb2bb7fec6aa607b193d5a844a1342fa4004549997033b2107c48285
-DIST tp_smapi-0.31.tgz 35692 RMD160 cdcd032cbb2c315b9336694c8c196b0e563a36af SHA1 6eb29c8f7504666a7d644df886329da31eb50de3 SHA256 aa575491ec07c774eaa0258d6490d3ff5e4780272692e7b8bea043469e4087db
-DIST tp_smapi-0.32.tgz 35042 RMD160 c9a0725361ce8e7ac2c7f84219cc821f5ff1aec3 SHA1 6a7a8564ce43d05331afd54bc40493c43b8d98fa SHA256 1fe05da5c1e77137b85a2f4d358c022be3eaf8bada9c5a27b8bd33e08b23c853
-DIST tp_smapi-0.33.tgz 36407 RMD160 20be782d2b8e684867177c3f8617c5971277225c SHA1 2253f8e95bda1ae003443ab6e12588a35d5b9559 SHA256 715d8e234f60814a98756062a02cdf922445d806093fbb1ca6af8be402169d81
-DIST tp_smapi-0.37.tgz 38261 RMD160 003d575a83351060703f8f8c5dd096f5c2f6173b SHA1 cebc7c0912aac997b99ecbd81b2afeb6ee7c0876 SHA256 2455a12c0c7a7e1cc36ff47a6f92036e11da87f10caef86a206688498b4d1fb5
-DIST tp_smapi-0.39.tgz 38322 RMD160 b31f2000412f6f7d90c2ecc4f845c34136b431cb SHA1 fa709a963f3629d973eda1409a5e3390157d4bae SHA256 43b9407a66af935a278e78df4e4c83543060e5232efbd8a2e1cac3cfcdaa1b8a
+AUX tp_smapi-0.40-initd 1832 RMD160 d35a85347e9a7c6f772e25006366c9bd63a56ff7 SHA1 421f61e560f8657a373f4cf8ec66c4d940d0a579 SHA256 f3eb9fce5ea1b1b7f90f62d190446a53046e8319749c605491d030ead00240e1
 DIST tp_smapi-0.40.tgz 39002 RMD160 8b564396afe6255476e73c9c78bd47294eeb8d53 SHA1 bc1bd1c6558d1972501e816308234d48ac530fc6 SHA256 ccb0965684cad076160750f2ac380f99373fa73f0bcc1091ffce2492f56349ab
-EBUILD tp_smapi-0.20.ebuild 892 RMD160 9852de284536628153556dbaff844a3b0d274a62 SHA1 3d60b479760af3a4c307e7329b8e85a2631c5d1a SHA256 c729b885e75968728f3fcaf3556ceda59e8ff0bb354ff0ac7c9ad180c0efed88
-EBUILD tp_smapi-0.21.ebuild 893 RMD160 220f17c45b64fa85d7e48bada1787f98fb349aba SHA1 724f03da7746c143f0616b81bea309d0b504a003 SHA256 767618945524237fb34dcddf7503fe2f09ba396cf8303e5e0365b07a4588af87
-EBUILD tp_smapi-0.27.ebuild 1134 RMD160 77484c93600772d95a4595ab3c480f7a8e7380a8 SHA1 1f49ce4d4fe47f6c50bcac0da290561c6f8b4624 SHA256 a06da93ba75e9499c32bb8a9b723b682e69dbae22c5c62c77f6c1810729b7330
-EBUILD tp_smapi-0.30.ebuild 1151 RMD160 45c69c1854b1cc88bc14e8bef826e0b1ddb90b22 SHA1 3b5b2b152c71973f1d4efef845acb89af22b59a4 SHA256 f3af44efbcbc40280f64a4ee14dd64fef76e4bab93badd63c0a122ea1541f62a
-EBUILD tp_smapi-0.31.ebuild 1152 RMD160 fd526d88188e9da3525129a6457683c39b609126 SHA1 fd0fc262bcc68732df6d6040b5e0085e07dcd7c7 SHA256 98ef46b1a5cb1936bad68993613363178bb9547427385ee3a010b4eabcbd426b
-EBUILD tp_smapi-0.32.ebuild 1167 RMD160 a32a9411e60417383f94419295b96eca68605e03 SHA1 53ab027a7d14535510a75ced064fd684edc3275b SHA256 846fc1bcfe026ce3aacafec8c87667c8047f402de7e7895484d786923ce2fb4f
-EBUILD tp_smapi-0.33.ebuild 1167 RMD160 eac737b19ef975cc4d04ad95fde8722ba464efeb SHA1 c418b35a73853f38a1f2f428e50fc120b3b41f19 SHA256 8abe261259b20cde5f6e4ac10ed2fcc547bbcf05ddb1b7db3aa7b355d5042c29
-EBUILD tp_smapi-0.37.ebuild 1375 RMD160 d20a8e5f0f97cc71c351468ca7da8f2bd8146736 SHA1 442f08132388a61d1397eca9c8116f4373194abb SHA256 3de6b136c3100493a92c64d4634ec052a583b24448cc16607b431b2ede284baa
-EBUILD tp_smapi-0.39.ebuild 1324 RMD160 fff44dd40738853eff0a21110324074604b3d569 SHA1 2c004e29d77639976c0ad7f31828d791ad7f2218 SHA256 964c3e9eb382f8ce487c161948dd72165bc0a5ed6960e0c5ada057f7b98766ac
 EBUILD tp_smapi-0.40-r1.ebuild 1501 RMD160 6eadfe6e1205e1f30c90a251662a2b373e45cf91 SHA1 c98e259307d567708d156682b6c67cf0672b2e9d SHA256 6efbd77801a486c6633e9aa0a6e9c264514ad4fffac80b2c1dcc7519ab50de56
-EBUILD tp_smapi-0.40-r2.ebuild 1606 RMD160 7e91a33ccfb5aa5514f9ff14fff81137711327c4 SHA1 832534cc1f30220bb2e8c35b8945657d5f9ebd98 SHA256 bb1c22c246ccb5bdc34be5a67255b0c2755353e2edffa66f14247b1ffd0b46cf
-EBUILD tp_smapi-0.40.ebuild 1374 RMD160 352e516ffa2e6e9bb3fa1e296e61d959e1c665e6 SHA1 61842583c863f84e19f540b100e6c0ad254054e5 SHA256 646d34df5aed0b49a4566c074f6ef41edfafca0b5c52a8d69928c96dee8b9652
-MISC ChangeLog 5024 RMD160 063bd757e1815dfed2b21f018dc9741d187f8f66 SHA1 d31bed992cb9c129b4920122298694e70090c91a SHA256 bce3d7c4fc4d10b3b16fcf0b94906c67c2c5416e5e88e9363beb954e660f89a8
+EBUILD tp_smapi-0.40-r3.ebuild 1662 RMD160 77345eefd5a2b5d3310581b55231b62250e211d1 SHA1 311b0743a8cd0e80332c51c1ef24ad603df3ec6c SHA256 21828e1a98052d38275622f48d2f14a68514d4e09b435cdd414d61459383b94b
+MISC ChangeLog 5559 RMD160 efcc730335e2d13cf67501f3b2ff61e5473b5bbb SHA1 828dac7a200b4dd30449cd4c1b1ca18b548796e8 SHA256 6fdc79278cdfc2b2ca7167c1c994d1318b6112ed28211c7f2d31d8290734c84f
 MISC metadata.xml 242 RMD160 ae266e9b31780c5bf3de48ff64cb377c484be043 SHA1 1e42ee4142d75d4d5a98ebe944b225178ec57680 SHA256 c4b5ad1432ce813ea0f307e9ff1c1bad05cc4aed39c0344be243259400a45372
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk37VlQACgkQHB6c3gNBRYco+gCfWFpoiQTiqK8YABFCyrfK+JPY
+H8YAn1cEYuh5R3EfYqA4Xm/mU88ZDOHj
+=OCIv
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/tp_smapi/files/thinkpad_ec_semaphore.patch b/app-laptop/tp_smapi/files/thinkpad_ec_semaphore.patch
deleted file mode 100644
index d18fb5f3a319..000000000000
--- a/app-laptop/tp_smapi/files/thinkpad_ec_semaphore.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tp_smapi-0.37/thinkpad_ec.c.orig	2008-09-22 22:12:09.000000000 +0200
-+++ tp_smapi-0.37/thinkpad_ec.c	2008-09-22 22:12:16.000000000 +0200
-@@ -36,7 +36,7 @@
- #include <linux/delay.h>
- #include <linux/thinkpad_ec.h>
- #include <linux/jiffies.h>
--#include <asm/semaphore.h>
-+#include <linux/semaphore.h>
- #include <asm/io.h>
- 
- #define TP_VERSION "0.37"
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.40-initd b/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
index 417e7021bec9..de4f3a9a44e2 100755
--- a/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
+++ b/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
@@ -14,13 +14,22 @@ depend() {
 }
 
 start() {
+	local state1
+	local state2
+
 	ebegin "Making sure that module 'tp_smapi' is loaded"
 	modprobe tp_smapi
-	eend $? || return $?
+	state1=$?
+	eend ${state1}
+
+	ebegin "Checking for \"${SMAPI_SYSFS}\""
+	test -d "${SMAPI_SYSFS}"
+	state2=$?
+	eend ${state2}
 
-	ebegin "Checking for ${SMAPI_SYSFS}"
-	test -d ${SMAPI_SYSFS}
-	eend $? || return $?
+	if [ "${state1}" -ne "0" ] || [ "${state1}" -ne "0" ]; then
+		return 1
+	fi
 
 	ebegin "Starting ${SVCNAME}"
 	set_all ${SMAPI_THRESH_START} ${SMAPI_THRESH_STOP}
@@ -28,51 +37,56 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping ${SVCNAME}"
-	eend $?
+	einfo "Nothing required to be done to stop ${SVCNAME}"
 }
 
 require_started() {
-	service_started && return 0
-
-	ewarn "WARNING: ${SVCNAME} is not running"
-	return 1
+	if ! service_started; then
+		"${RC_SERVICE}" start || return $?
+	fi
 }
 
 high() {
-	require_started || return $?
+	require_started
 
-	ebegin "Switching ${SVCNAME} to high thesholds"
+	einfo "Switching ${SVCNAME} to high thesholds"
 	set_all ${SMAPI_HIGH_THRESH_START} ${SMAPI_HIGH_THRESH_STOP}
-	eend $?
 }
 
 low() {
-	require_started || return $?
+	require_started
 
-	ebegin "Switching ${SVCNAME} to low thesholds"
+	einfo "Switching ${SVCNAME} to low thesholds"
 	set_all ${SMAPI_LOW_THRESH_START} ${SMAPI_LOW_THRESH_STOP}
-	eend $?
 }
 
 set_all() {
 	local tstart=$1
 	local tstop=$2
+	local bat
+
 	for bat in ${BATS}; do
 		ebegin "  setting thresholds for ${bat}: $tstart $tstop"
-		echo $tstart > ${SMAPI_SYSFS}/${bat}/start_charge_thresh && \
-		echo $tstop > ${SMAPI_SYSFS}/${bat}/stop_charge_thresh
+		echo ${tstart} > ${SMAPI_SYSFS}/${bat}/start_charge_thresh
+		echo ${tstop} > ${SMAPI_SYSFS}/${bat}/stop_charge_thresh
 		eend $?
 	done
 }
 
 info() {
-	require_started || return $?
+	local presence
+	local tstart
+	local tstop
+	local bat
+
+	require_started
 
 	for bat in ${BATS}; do
-		local tstart=$( cat ${SMAPI_SYSFS}/${bat}/start_charge_thresh)
-		local tstop=$( cat ${SMAPI_SYSFS}/${bat}/stop_charge_thresh)
-		local presence=$( [[ $(cat ${SMAPI_SYSFS}/${bat}/installed) = 1 ]] && echo '  [installed]')
+		tstart=$(cat ${SMAPI_SYSFS}/${bat}/start_charge_thresh)
+		tstop=$(cat ${SMAPI_SYSFS}/${bat}/stop_charge_thresh)
+		if [ "$(cat ${SMAPI_SYSFS}/${bat}/installed)" -eq "1" ]; then
+			presence="  [installed]"
+		fi
 		einfo "${bat}: ${tstart} ${tstop}${presence}"
 	done
 }
diff --git a/app-laptop/tp_smapi/tp_smapi-0.20.ebuild b/app-laptop/tp_smapi/tp_smapi-0.20.ebuild
deleted file mode 100644
index 33455002b6ff..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.20.ebuild,v 1.2 2006/06/26 22:05:05 brix Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="hdaps"
-
-BUILD_TARGETS="default"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 15; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.15 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="tp_base(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.21.ebuild b/app-laptop/tp_smapi/tp_smapi-0.21.ebuild
deleted file mode 100644
index 4455ec16d07a..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.21.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.21.ebuild,v 1.1 2006/06/21 17:52:23 brix Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="hdaps"
-
-BUILD_TARGETS="default"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 15; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.15 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="tp_base(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.27.ebuild b/app-laptop/tp_smapi/tp_smapi-0.27.ebuild
deleted file mode 100644
index ac992f02d1b0..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.27.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.27.ebuild,v 1.1 2006/08/14 12:04:15 uberlord Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 15; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.15 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Ug, sudo in a Makefile
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.30.ebuild b/app-laptop/tp_smapi/tp_smapi-0.30.ebuild
deleted file mode 100644
index 9c5f01087474..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.30.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.30.ebuild,v 1.3 2007/04/20 13:18:01 chainsaw Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 15; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.15 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Ug, sudo in a Makefile
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.31.ebuild b/app-laptop/tp_smapi/tp_smapi-0.31.ebuild
deleted file mode 100644
index f23103fe008c..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.31.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.31.ebuild,v 1.3 2007/10/10 17:30:30 cla Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 15; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.15 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Ug, sudo in a Makefile
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.32.ebuild b/app-laptop/tp_smapi/tp_smapi-0.32.ebuild
deleted file mode 100644
index 3ea6037133d8..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.32.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.32.ebuild,v 1.1 2007/11/16 18:27:10 welp Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 19; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.19 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove usage of `sudo` in Makefile.
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.33.ebuild b/app-laptop/tp_smapi/tp_smapi-0.33.ebuild
deleted file mode 100644
index 3334eb021a27..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.33.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.33.ebuild,v 1.1 2007/12/31 18:30:43 welp Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 19; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.19 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove usage of `sudo` in Makefile.
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.37.ebuild b/app-laptop/tp_smapi/tp_smapi-0.37.ebuild
deleted file mode 100644
index 4878a5d7fb68..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.37.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.37.ebuild,v 1.4 2009/09/06 21:13:35 robbat2 Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 19; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.19 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-
-		CONFIG_CHECK="!SENSORS_HDAPS"
-		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/thinkpad_ec_semaphore.patch"
-
-	# Remove usage of `sudo` in Makefile.
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.39.ebuild b/app-laptop/tp_smapi/tp_smapi-0.39.ebuild
deleted file mode 100644
index 6134a2b7b13d..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.39.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.39.ebuild,v 1.2 2009/09/06 21:13:35 robbat2 Exp $
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 19; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.19 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-
-		CONFIG_CHECK="!SENSORS_HDAPS"
-		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove usage of `sudo` in Makefile.
-	sed -i 's,sudo ,,' Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES README
-}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.40-r2.ebuild b/app-laptop/tp_smapi/tp_smapi-0.40-r3.ebuild
index 6466899e99a2..fde32896e8cc 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.40-r2.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.40-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.40-r2.ebuild,v 1.1 2011/06/14 15:31:20 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.40-r3.ebuild,v 1.1 2011/06/17 13:27:42 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils linux-mod
 
@@ -23,7 +23,7 @@ RESTRICT="userpriv"
 DEPEND="sys-apps/dmidecode"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
+pkg_pretend() {
 	linux-mod_pkg_setup
 
 	if kernel_is lt 2 6 19; then
@@ -38,7 +38,6 @@ pkg_setup() {
 	BUILD_TARGETS="default"
 
 	if use hdaps; then
-
 		CONFIG_CHECK="~INPUT_UINPUT"
 		WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
 		linux-info_pkg_setup
@@ -52,14 +51,20 @@ pkg_setup() {
 	fi
 }
 
+pkg_setup() {
+	# run again as pkg_pretend is not var safe
+	pkg_pretend
+}
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-2.6.37.patch"
-	epatch "${FILESDIR}"/fix_header_check.patch
+	epatch \
+		"${FILESDIR}/${P}-2.6.37.patch" \
+		"${FILESDIR}/fix_header_check.patch"
 }
 
 src_install() {
 	linux-mod_src_install
-	dodoc CHANGES README || die
-	newinitd "${FILESDIR}"/${P}-initd smapi || die
-	newconfd "${FILESDIR}"/${P}-confd smapi || die
+	dodoc CHANGES README
+	newinitd "${FILESDIR}"/${P}-initd smapi
+	newconfd "${FILESDIR}"/${P}-confd smapi
 }
diff --git a/app-laptop/tp_smapi/tp_smapi-0.40.ebuild b/app-laptop/tp_smapi/tp_smapi-0.40.ebuild
deleted file mode 100644
index a64ab87b7191..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.40.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.40.ebuild,v 1.4 2009/12/01 18:51:39 fauli Exp $
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="http://tpctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 19; then
-		eerror
-		eerror "${P} requires Linux kernel 2.6.19 or above."
-		eerror
-		die "Unsupported kernel version"
-	fi
-
-	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
-	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
-	BUILD_TARGETS="default"
-
-	if use hdaps; then
-
-		CONFIG_CHECK="~INPUT_UINPUT"
-		WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
-		linux-info_pkg_setup
-
-		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
-		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-
-		CONFIG_CHECK="!SENSORS_HDAPS"
-		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
-		linux-info_pkg_setup
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc CHANGES README
-}