From 79e2115d8a44bbec89f09f7b328313ee3dc86a16 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 5 Aug 2016 23:01:07 -0400 Subject: app-laptop/tp_smapi: new version 0.42. This adds a new version 0.42, and updates the ebuild a bit. First, the ebuild was updated to EAPI=6. Then the RESTRICT=userpriv was removed, as it no longer seems to have any effect: I can install the package fine with FEATURES=userpriv. Next, an obsolete kernel version check was removed. Every version of every flavor of Linux sources we have in the tree is already newer than 2.6.19. Finally, einstalldocs (from EAPI=6) was used to install the current set of docs as well as a TODO that had been omitted. I have added myself as the maintainer of this package, since I still have hardware that it supports. Gentoo-Bug: 516570 Gentoo-Bug: 583206 Package-Manager: portage-2.2.28 --- app-laptop/tp_smapi/Manifest | 1 + app-laptop/tp_smapi/metadata.xml | 9 +++- app-laptop/tp_smapi/tp_smapi-0.41-r2.ebuild | 75 ----------------------------- app-laptop/tp_smapi/tp_smapi-0.42.ebuild | 67 ++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 app-laptop/tp_smapi/tp_smapi-0.41-r2.ebuild create mode 100644 app-laptop/tp_smapi/tp_smapi-0.42.ebuild diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest index 425ca7eb52d..d6d974e1846 100644 --- a/app-laptop/tp_smapi/Manifest +++ b/app-laptop/tp_smapi/Manifest @@ -1 +1,2 @@ DIST tp_smapi-0.41.tar.gz 38852 SHA256 6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666 SHA512 924a11cdf64bc151d069d4f61ca476cf006773291f363b21a80ce091f560a78c4828d2e522e646a5b133c58149a37cb5c2432a165e92e6980eb510b9488c728e WHIRLPOOL 10c74811148934a49b2d2b65cd65d366c58de03682c02d6b82694b4831634a25f2da9986b0493e28b372abf7ada692ee8ea85b2881b823b0cb7b35b73f348d6e +DIST tp_smapi-0.42.tgz 39867 SHA256 7b8d9f488c3859805f1f292bf4d518cc5b32ebb69b0ebe96367d0852dd792d27 SHA512 1004b7ef961a9908c2144b26ea60b6dddabd83d60c11421a03e3b810f5b635415ef52656d6980915512d68f809f7bc3d662328f25d111537bd7e175d252cf83b WHIRLPOOL 7d03aaf2bb4de3aabbc38fba62f126e6f2976ea1964d85da2fffbbcd63bb4c3884a152851cae116438b859c13d59fd4e41be126683f660f9b8322d7fc40ddc28 diff --git a/app-laptop/tp_smapi/metadata.xml b/app-laptop/tp_smapi/metadata.xml index dc1f3c90300..2f944f633c2 100644 --- a/app-laptop/tp_smapi/metadata.xml +++ b/app-laptop/tp_smapi/metadata.xml @@ -1,12 +1,19 @@ - + + + mjo@gentoo.org + Michael Orlitzky + + Install a compatible HDAPS module + evgeni/tp_smapi tpctl + diff --git a/app-laptop/tp_smapi/tp_smapi-0.41-r2.ebuild b/app-laptop/tp_smapi/tp_smapi-0.41-r2.ebuild deleted file mode 100644 index e32c1f3b639..00000000000 --- a/app-laptop/tp_smapi/tp_smapi-0.41-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit flag-o-matic linux-mod - -DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" -HOMEPAGE="https://github.com/evgeni/tp_smapi/ http://tpctl.sourceforge.net/" -SRC_URI="mirror://github/evgeni/${PN}/${P}.tar.gz" - -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_pretend() { - 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 -} - -pkg_setup() { - # run again as pkg_pretend is not var safe - pkg_pretend -} - -src_compile() { - # Kernel Makefiles may pull in -mpreferred-stack-boundary=3 - # which requires that SSE disabled or compilation will fail. - # So we need to ensure that appended user CLAGS do not re-enable SSE - # https://bugs.gentoo.org/show_bug.cgi?id=492964 - replace-flags '-msse*' '' - replace-flags '-mssse3' '' - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - dodoc CHANGES README - newinitd "${FILESDIR}"/${PN}-0.40-initd smapi - newconfd "${FILESDIR}"/${PN}-0.40-confd smapi -} diff --git a/app-laptop/tp_smapi/tp_smapi-0.42.ebuild b/app-laptop/tp_smapi/tp_smapi-0.42.ebuild new file mode 100644 index 00000000000..ed4b4a57df4 --- /dev/null +++ b/app-laptop/tp_smapi/tp_smapi-0.42.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic linux-mod + +DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" +HOMEPAGE="https://github.com/evgeni/${PN}" +SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="hdaps" + +# We need dmideode if the kernel does not support +# DMI_DEV_TYPE_OEM_STRING in dmi.h. +DEPEND="sys-apps/dmidecode" +RDEPEND="${DEPEND}" + +pkg_pretend() { + linux-mod_pkg_setup + + 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" + # Why call this twice? + 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 +} + +pkg_setup() { + # run again as pkg_pretend is not var safe + pkg_pretend +} + +src_compile() { + # Kernel Makefiles may pull in -mpreferred-stack-boundary=3 + # which requires that SSE disabled or compilation will fail. + # So we need to ensure that appended user CLAGS do not re-enable SSE + # https://bugs.gentoo.org/show_bug.cgi?id=492964 + replace-flags '-msse*' '' + replace-flags '-mssse3' '' + + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + einstalldocs + newinitd "${FILESDIR}/${PN}-0.40-initd" smapi + newconfd "${FILESDIR}/${PN}-0.40-confd" smapi +} -- cgit v1.2.1