tp_smapi: Remove ebuild.

Both fixes are now in the main tree.

diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
deleted file mode 100644 (file)
index d8fce00..0000000
--- a/app-laptop/tp_smapi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0001-Convert-DECLARE_MUTEX-to-DEFINE_SEMAPHORE.patch 1321 RMD160 347a7d55ff992c1ee3586578049b96f34b95fe7e SHA1 8e14a7e87d7c932fb1d8e2ca825d5d87eb099eb5 SHA256 bfdd14c5ec4010143a5c3d20da5d1fed83270472cf16119e074023657a94bc17
-AUX tp_smapi-fix-vercheck.patch 503 RMD160 4a393fafa4316ea0b66ba95d044a053de2a43f0c SHA1 b2e0e26be961d2f2a3c8c4080be124beb8cd149d SHA256 9e6a878b2593f7809ea8a9f7939d9091d1faf5c8ff88e8e35d5b4572c13f4a25
-DIST tp_smapi-0.40.tgz 39002 RMD160 8b564396afe6255476e73c9c78bd47294eeb8d53 SHA1 bc1bd1c6558d1972501e816308234d48ac530fc6 SHA256 ccb0965684cad076160750f2ac380f99373fa73f0bcc1091ffce2492f56349ab
-EBUILD tp_smapi-0.40.ebuild 1515 RMD160 547f94cada469bdb99f038645eaba9097b8a3443 SHA1 376398f579f6ab7a92d72faadc35d11e437d7435 SHA256 d1c44d26199487069351d175129f16d4fc41912393b5f59552c0fdf0258ee5f2

diff --git a/app-laptop/tp_smapi/files/0001-Convert-DECLARE_MUTEX-to-DEFINE_SEMAPHORE.patch b/app-laptop/tp_smapi/files/0001-Convert-DECLARE_MUTEX-to-DEFINE_SEMAPHORE.patch
deleted file mode 100644 (file)
index 438e8a6..0000000
--- a/app-laptop/tp_smapi/files/0001-Convert-DECLARE_MUTEX-to-DEFINE_SEMAPHORE.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 90d564a00cca544b9eb4e6eff3790d5f0f8676b0 Mon Sep 17 00:00:00 2001
-From: Nick Bowler <nbowler@draconx.ca>
-Date: Wed, 17 Nov 2010 21:24:42 -0500
-Subject: [PATCH] Convert DECLARE_MUTEX to DEFINE_SEMAPHORE.
-
----
- thinkpad_ec.c |    2 +-
- tp_smapi.c    |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/thinkpad_ec.c b/thinkpad_ec.c
-index 2d77a64..e026a72 100644
---- a/thinkpad_ec.c
-+++ b/thinkpad_ec.c
-@@ -88,7 +88,7 @@ static u64 prefetch_jiffies;                      /* time of prefetch, or: */
- #define TPC_PREFETCH_JUNK   (INITIAL_JIFFIES+1)   /*   Ignore prefetch */
- 
- /* Locking: */
--static DECLARE_MUTEX(thinkpad_ec_mutex);
-+static DEFINE_SEMAPHORE(thinkpad_ec_mutex);
- 
- /* Kludge in case the ACPI DSDT reserves the ports we need. */
- static int force_io;    /* Willing to do IO to ports we couldn't reserve? */
-diff --git a/tp_smapi.c b/tp_smapi.c
-index 0cdbd0e..f6c833f 100644
---- a/tp_smapi.c
-+++ b/tp_smapi.c
-@@ -109,7 +109,7 @@ static struct { u8 rc; char *msg; int ret; } smapi_retcode[] =
- #define SMAPI_PORT2 0x4F           /* fixed port, meaning unclear */
- static unsigned short smapi_port;  /* APM control port, normally 0xB2 */
- 
--static DECLARE_MUTEX(smapi_mutex);
-+static DEFINE_SEMAPHORE(smapi_mutex);
- 
- /**
-  * find_smapi_port - read SMAPI port from NVRAM
--- 
-1.7.2.2
-

diff --git a/app-laptop/tp_smapi/files/tp_smapi-fix-vercheck.patch b/app-laptop/tp_smapi/files/tp_smapi-fix-vercheck.patch
deleted file mode 100644 (file)
index c2ecacd..0000000
--- a/app-laptop/tp_smapi/files/tp_smapi-fix-vercheck.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile 2008-12-16 05:03:06.000000000 +0000
-+++ b/Makefile 2009-01-15 02:47:01.000000000 +0000
-@@ -27,7 +27,7 @@
- 
- DEBUG := 0
- 
--ifneq ($(shell [ -f $(KBUILD)/include/linux/aio_abi.h ] && echo 1),1)
-+ifneq ($(shell [ -f $(KSRC)/include/linux/aio_abi.h ] && echo 1),1)
- $(warning Building tp_smapi requires Linux kernel 2.6.19 or newer, and matching kernel headers.)
- $(warning You may need to override the following Make variables:)
- $(warning .   KVER=$(KVER))

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 (file)
index ccd965b..0000000
--- a/app-laptop/tp_smapi/tp_smapi-0.40.ebuild
+++ /dev/null
@@ -1,62 +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_prepare() {
-       epatch "${FILESDIR}"/${PN}-fix-vercheck.patch
-       epatch "${FILESDIR}"/0001-Convert-DECLARE_MUTEX-to-DEFINE_SEMAPHORE.patch
-}
-
-src_install() {
-       linux-mod_src_install
-       dodoc CHANGES README
-}