diff options
author | 2014-03-22 18:35:19 +0000 | |
---|---|---|
committer | 2014-03-22 18:35:19 +0000 | |
commit | dccf281ae3b1b38ad4dbf79be05251046c9f2be6 (patch) | |
tree | 4f4ec0c9763f10cdce23c40efb45ae0f2a261150 /app-laptop | |
parent | Remove old. (diff) | |
download | gentoo-2-dccf281ae3b1b38ad4dbf79be05251046c9f2be6.tar.gz gentoo-2-dccf281ae3b1b38ad4dbf79be05251046c9f2be6.tar.bz2 gentoo-2-dccf281ae3b1b38ad4dbf79be05251046c9f2be6.zip |
Remove old.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'app-laptop')
-rw-r--r-- | app-laptop/tp_smapi/ChangeLog | 9 | ||||
-rw-r--r-- | app-laptop/tp_smapi/files/fix_header_check.patch | 19 | ||||
-rw-r--r-- | app-laptop/tp_smapi/files/tp_smapi-0.40-2.6.37.patch | 30 | ||||
-rw-r--r-- | app-laptop/tp_smapi/tp_smapi-0.40-r1.ebuild | 63 |
4 files changed, 7 insertions, 114 deletions
diff --git a/app-laptop/tp_smapi/ChangeLog b/app-laptop/tp_smapi/ChangeLog index cd19deb3c876..1b868d0a58d1 100644 --- a/app-laptop/tp_smapi/ChangeLog +++ b/app-laptop/tp_smapi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-laptop/tp_smapi -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/ChangeLog,v 1.46 2013/03/12 17:57:29 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/ChangeLog,v 1.47 2014/03/22 18:35:18 kensington Exp $ + + 22 Mar 2014; Michael Palimaka <kensington@gentoo.org> + -files/fix_header_check.patch, -files/tp_smapi-0.40-2.6.37.patch, + -tp_smapi-0.40-r1.ebuild: + Remove old. 12 Mar 2013; Markos Chandras <hwoarang@gentoo.org> tp_smapi-0.41.ebuild: Stable everywhere. Bug #458736 diff --git a/app-laptop/tp_smapi/files/fix_header_check.patch b/app-laptop/tp_smapi/files/fix_header_check.patch deleted file mode 100644 index 97b656961166..000000000000 --- a/app-laptop/tp_smapi/files/fix_header_check.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** Makefile.orig Mon Nov 23 08:55:42 2009 ---- Makefile Mon Nov 23 08:57:48 2009 -*************** -*** 27,33 **** - - DEBUG := 0 - -! ifneq ($(shell [ -f $(KBUILD)/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)) ---- 27,33 ---- - - DEBUG := 0 - -! 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/files/tp_smapi-0.40-2.6.37.patch b/app-laptop/tp_smapi/files/tp_smapi-0.40-2.6.37.patch deleted file mode 100644 index 60f05997a1d4..000000000000 --- a/app-laptop/tp_smapi/files/tp_smapi-0.40-2.6.37.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN tp_smapi-0.40.orig/thinkpad_ec.c tp_smapi-0.40/thinkpad_ec.c ---- tp_smapi-0.40.orig/thinkpad_ec.c 2008-12-16 08:03:06.000000000 +0300 -+++ tp_smapi-0.40/thinkpad_ec.c 2010-11-22 18:16:54.000000000 +0300 -@@ -88,7 +88,11 @@ - #define TPC_PREFETCH_JUNK (INITIAL_JIFFIES+1) /* Ignore prefetch */ - - /* Locking: */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) - static DECLARE_MUTEX(thinkpad_ec_mutex); -+#else -+static DEFINE_SEMAPHORE(thinkpad_ec_mutex); -+#endif - - /* 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 -urN tp_smapi-0.40.orig/tp_smapi.c tp_smapi-0.40/tp_smapi.c ---- tp_smapi-0.40.orig/tp_smapi.c 2008-12-16 08:03:06.000000000 +0300 -+++ tp_smapi-0.40/tp_smapi.c 2010-11-22 18:17:29.000000000 +0300 -@@ -109,7 +109,11 @@ - #define SMAPI_PORT2 0x4F /* fixed port, meaning unclear */ - static unsigned short smapi_port; /* APM control port, normally 0xB2 */ - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) - static DECLARE_MUTEX(smapi_mutex); -+#else -+static DEFINE_SEMAPHORE(smapi_mutex); -+#endif - - /** - * find_smapi_port - read SMAPI port from NVRAM diff --git a/app-laptop/tp_smapi/tp_smapi-0.40-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.40-r1.ebuild deleted file mode 100644 index 1895b0f00562..000000000000 --- a/app-laptop/tp_smapi/tp_smapi-0.40-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2012 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-r1.ebuild,v 1.5 2012/04/12 12:23:54 lxnay Exp $ - -EAPI="3" - -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" -RDEPEND="${DEPEND}" - -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}/${P}-2.6.37.patch" - epatch "${FILESDIR}"/fix_header_check.patch -} - -src_install() { - linux-mod_src_install - dodoc CHANGES README -} |