From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-laptop/Manifest.gz | Bin 3246 -> 3247 bytes app-laptop/thinkfan/Manifest | 2 +- app-laptop/thinkfan/metadata.xml | 5 +- app-laptop/tp_smapi/Manifest | 2 +- app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild | 74 +++++++++++++++++++++ app-laptop/tp_smapi/tp_smapi-0.43.ebuild | 74 --------------------- app-laptop/tuxedo-keyboard/Manifest | 2 +- .../tuxedo-keyboard-2.0.5-r1.ebuild | 23 +++++++ .../tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild | 23 ------- 9 files changed, 101 insertions(+), 104 deletions(-) create mode 100644 app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild delete mode 100644 app-laptop/tp_smapi/tp_smapi-0.43.ebuild create mode 100644 app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild delete mode 100644 app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild (limited to 'app-laptop') diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz index bc9e191790b3..498aba4ef4a1 100644 Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest index 6f38a1eee3a9..b12bab282298 100644 --- a/app-laptop/thinkfan/Manifest +++ b/app-laptop/thinkfan/Manifest @@ -2,4 +2,4 @@ DIST thinkfan-0.9.3.tar.gz 39527 BLAKE2B e6a6d09493d94b4de9ada20dcc4b0251c5f2c14 DIST thinkfan-1.0.2.tar.gz 77653 BLAKE2B 1b40553380f9b873883f0dc587665f24cd2e07de7a7e743cb9f99a3282f380da2258265a612b1c97d2945fed31aee0d6cbc30ea2a18c0b212e877e7635eda336 SHA512 d9133538096a7c5757f599adfebc8217aa7334a102573d6757f03b5c012a09d600be923930fd9d62f4afa591f5eb7a70a1c328004bddef85494d1a7ce56b648f EBUILD thinkfan-0.9.3.ebuild 1069 BLAKE2B 0e4862e477f197efc30f9c72330e8153327325a733277220a0e65725483762e700515dc3204712d8f6af2b06c576cf17f114683993c0385383cc92c58e211318 SHA512 ffec534bfe1c1eb08c1de3858347781d6f0dc349d7f3de39196a47166e65142d649e0e889141e9c90ce193f0f984ac386ce39cc45f6e70ff971278c3b6560247 EBUILD thinkfan-1.0.2.ebuild 924 BLAKE2B 3a99d05583446f1bb15130ac2c0faa32c93c6d10a5fbfb97e2dae1a21b157dad4d80cbc3628fd4bad98760f77cff2d99fddb0aad4008b3bc4cb6653376d34c28 SHA512 3381a2a57cd39759bb76d8a786dfd568da51b7e497d8ad270d7f173dde132c0746884cc117868ecb926d31af4064e65cc8120c40ddfc7d25a17ad0845b664907 -MISC metadata.xml 585 BLAKE2B d58c398a0280995a6ec8a92af6947462f0c4706c55067004916d25fd1b5536e0bcf6f72da3839d9d4ec2768e73202e6dd32ba6cc5d19f98c4ae3a11c6ab4913c SHA512 27be53762d6974c08098d70fb340f3aef2067e3c053cc9d6509e7d3a2065ac43e71c6a574588a6b8345bb4fd9dc17ace48cffb7941f547ca7f81594f0e41149b +MISC metadata.xml 505 BLAKE2B 8b6b4100f0b839473a7f3b09bcc2f8ed896076e4a815d69035fe5e5ee26c11100ad7c90c1be8dd15b8616012ccdaf7359ba926cf526f45427279d2a731d0c328 SHA512 fa6a9f4d5218fa6911d445439eaf5d01e58636f0063721646112d028b30ced234c3c39a69ccc876a5c28df5e01b5eaa067dc92a7802c06a2afd395c9b7fd9d5c diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml index c6b8ff4c4c32..134e69ff9e5d 100644 --- a/app-laptop/thinkfan/metadata.xml +++ b/app-laptop/thinkfan/metadata.xml @@ -1,10 +1,7 @@ - - zlogene@gentoo.org - Mikle Kolyada - + include libatasmart support to get disc temperature allow thinkfan to read GPU temperature from the proprietary nVidia driver diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest index 762984fc9a60..2c48cfc08fda 100644 --- a/app-laptop/tp_smapi/Manifest +++ b/app-laptop/tp_smapi/Manifest @@ -1,5 +1,5 @@ AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698 DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7 -EBUILD tp_smapi-0.43.ebuild 1970 BLAKE2B edbd3c305f952aaab0aad6a50b62135479282c046283365013c094136e608ecb8b80c6c494a8e363f7f5aaf04eb6ef4644c050c7aed1461bb9d72c46e639f08a SHA512 8642f737fd602dc4a7024bb98c4ccfe4a0c87984d4fd97a42f18018de8139d2db3fc143f3a8fec3c0a8cb7fa131c4ad5a835618062e36d19b285ff093df24046 +EBUILD tp_smapi-0.43-r1.ebuild 1970 BLAKE2B e010dfff03f66720c9d6774dcaeb456dfcca508c246bfbc4145f213d015353248d3f18903ddfd9801e11e43b55f804c02e41c6f77352ba92c92d60c498c0a161 SHA512 c227146e725fefad8fdafdd7ff9321faab17c44df523ba7d4f63e82814d6284490eb780b5160b92028324b9229bf958bafafdf0cdb82e38417597b9c439240fc MISC metadata.xml 473 BLAKE2B 9d19f4112fc0ac3e045c2d92e510bec52bbfbcd9bbca442d856598cc95f546592c4661b317215d35a6540a14e4bf68b3b826baa8c434a170e9841fce3706cc99 SHA512 21ce54c4cd204ddea9f1170f8e1b66e636bb2b541856ff541371bd572403519a09cf2367f5642a596684d66145bc9ab92396b102ef51086f2d22f96fc6c0b7af diff --git a/app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild new file mode 100644 index 000000000000..ca46cf62c791 --- /dev/null +++ b/app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic linux-mod + +DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" +HOMEPAGE="https://github.com/evgeni/tp_smapi" +SRC_URI="https://github.com/evgeni/tp_smapi/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}" + +# This code is factored out of both pkg_pretend() and pkg_setup() +# because the PMS states that ebuilds may not call phase functions +# directly (see the "List of functions" section). This was bug #596616 +# and #596622. +tp_smapi_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_pretend() { + tp_smapi_pkg_pretend +} + +pkg_setup() { + # run again as pkg_pretend is not var safe + tp_smapi_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 +} diff --git a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild deleted file mode 100644 index 99b675c4c0f3..000000000000 --- a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic linux-mod - -DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" -HOMEPAGE="https://github.com/evgeni/tp_smapi" -SRC_URI="https://github.com/evgeni/tp_smapi/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}" - -# This code is factored out of both pkg_pretend() and pkg_setup() -# because the PMS states that ebuilds may not call phase functions -# directly (see the "List of functions" section). This was bug #596616 -# and #596622. -tp_smapi_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_pretend() { - tp_smapi_pkg_pretend -} - -pkg_setup() { - # run again as pkg_pretend is not var safe - tp_smapi_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 -} diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest index 57e3baf9e707..95bb62f5190c 100644 --- a/app-laptop/tuxedo-keyboard/Manifest +++ b/app-laptop/tuxedo-keyboard/Manifest @@ -1,3 +1,3 @@ DIST tuxedo-keyboard-2.0.5.tar.gz 31001 BLAKE2B 931d011e2ac521cef1670a8952886c1ac9b2476c6227c2b3cfce28d52622d3869f3c55773279eea3cbcc94d7c5b12d5d5653a8e2f9c142d0c044fa23fddd958c SHA512 3b7a9331d04e2918f3452f9561b05f39ea458960c2ade299a368899638987178cfd33fa066a0835f88b14c240d7937692d7994ccf978749ea7fdc428e587e06a -EBUILD tuxedo-keyboard-2.0.5.ebuild 583 BLAKE2B 3633ae11af2f13a533feb53f2a3368ddc2b1a6a536903ecfe4312850d64b00f7f2ae1d81e12358515035e4bebbfe02640954602e7ae2898a7203f02d4f64c31d SHA512 eb48c301ebded725bb576736e611d8a187a0f9c9778cb272f6f1c881b108ea7b306e650f8822f78f9f5597b88344a55d80a6d9897b0cc305e54d558e5cf9914e +EBUILD tuxedo-keyboard-2.0.5-r1.ebuild 583 BLAKE2B 3633ae11af2f13a533feb53f2a3368ddc2b1a6a536903ecfe4312850d64b00f7f2ae1d81e12358515035e4bebbfe02640954602e7ae2898a7203f02d4f64c31d SHA512 eb48c301ebded725bb576736e611d8a187a0f9c9778cb272f6f1c881b108ea7b306e650f8822f78f9f5597b88344a55d80a6d9897b0cc305e54d558e5cf9914e MISC metadata.xml 257 BLAKE2B 509de9ecfaa2a50c6900b1ec69308a827823d04fcd54b77575b9b18b71b508bfeecb4be9e230324cadb1bc70674516d4e6744a0dd50ed0556fd71b7b2458f86e SHA512 5f02fa3554ba0e4203073be18f3962b6b6c4dec5b7bf36dcadd9de78827b31c766573268d6c9b092a4e7382557fe423fc31899cfe963ddbfae9ee6015c05c920 diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild new file mode 100644 index 000000000000..112e6376ad1a --- /dev/null +++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod toolchain-funcs + +DESCRIPTION="Kernel Module for Tuxedo Keyboard" +HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard" +SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BUILD_TARGETS="all" +MODULE_NAMES="tuxedo_keyboard(tuxedo:${S}:src)" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1" +} diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild deleted file mode 100644 index 112e6376ad1a..000000000000 --- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod toolchain-funcs - -DESCRIPTION="Kernel Module for Tuxedo Keyboard" -HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard" -SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BUILD_TARGETS="all" -MODULE_NAMES="tuxedo_keyboard(tuxedo:${S}:src)" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1" -} -- cgit v1.2.3