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

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

14 files changed, 62 insertions, 579 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/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
-}