gentoo resync : 03.03.2019

3 files changed, 3 insertions, 79 deletions

diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index 2728a26c4f61..96c201fbf854 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,7 +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.42.tgz 39867 BLAKE2B 0f7285fe99766437d964780f3c9d88480a19ed07de155e1794b5c48f318846fbde4eb759e825af9f5da89fb20aee5e217f32e873a70c7d85f63e3a44b385b0f7 SHA512 1004b7ef961a9908c2144b26ea60b6dddabd83d60c11421a03e3b810f5b635415ef52656d6980915512d68f809f7bc3d662328f25d111537bd7e175d252cf83b
 DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
-EBUILD tp_smapi-0.42-r1.ebuild 1947 BLAKE2B 8b3ce3e2e96c025ee1236feb410019d9033b8633a476b346e6aae63d4b1a48940edf9a294de5d85c4e6eb2d337f654dfd5379439ed17548502fbec98ae03a872 SHA512 d09fe01652350951baaaf67af7ce32036515a1535cb9f774d2e0e2f92b0f79163babc3c19c554a37a15b5ddde3bf5a4904e95dfaa74274783911d2c5335fbbef
-EBUILD tp_smapi-0.43.ebuild 1949 BLAKE2B fa54b6dfafcb3dc842ca205e21deb68eab8f7f4c7fcc858680ed7742d3ab906e3f140aadbf736f4f92efc413b204a254017ea622e15432e2e3eb01712297ac4f SHA512 f88a84f395b578979f152437904224b5de061584e95fd4d635b014c1d4513b83af312d93914e804c7c96e75448d3649e6f2d41acf55267b23a00ab9cf6c2fff3
+EBUILD tp_smapi-0.43.ebuild 1944 BLAKE2B 3b3f22e120dd21aac4805b06bdfdf6f6630373259a7a7fa1d0212474215118eb3b224b00b9cc55442a385131955d2a99cbba75d3b6c61539ccce9425f25e8e62 SHA512 76475b674d23283105ca9afc2b8c9d94d9f698db3aba508147805a9869846e3f1daecb4e8052bda7edc664f157dab731edaf1c4c43382ee1461855869993ec67
 MISC metadata.xml 473 BLAKE2B 9d19f4112fc0ac3e045c2d92e510bec52bbfbcd9bbca442d856598cc95f546592c4661b317215d35a6540a14e4bf68b3b826baa8c434a170e9841fce3706cc99 SHA512 21ce54c4cd204ddea9f1170f8e1b66e636bb2b541856ff541371bd572403519a09cf2367f5642a596684d66145bc9ab92396b102ef51086f2d22f96fc6c0b7af
diff --git a/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
deleted file mode 100644
index a7aa31518d52..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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/${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}"
-
-# 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
index 011865482566..8a841c5e15ac 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="hdaps"