9 files changed, 280 insertions, 183 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index dd6978691b48..7ca7de8a9308 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a4aebdf871d5..f0d4b7acad62 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,10 +3,8 @@ AUX fwupd-1.8.3-gresource_quirks_paths.patch 421 BLAKE2B c21f9756c92fdb104bf0ac2
 AUX fwupd-1.8.3-installed_tests.patch 6003 BLAKE2B 0d70f6c2d8acb905b07d4526c6298912a9665ed2303526037722e7a78eb24ba82d7bf0d3f3e893ff568286e5179419d120afcee7bfad6795987f128cdb2ee58a SHA512 d32cf37fdd689a66ae1738967ee60110771f773a7e713bfcddcd9d0e4b7dbf4f2006509b269782f14f2f5e2b01d15d14ec56d6d97f54c8ac3f56118400543e24
 AUX fwupd-1.8.4-installed_tests.patch 5999 BLAKE2B c59749549f7bf057129802ee534780967c09155ab247f5bc0293112908cd833f2700d92c5839efc1d09250bc2ac966d468c83f7a9e61622d2aa35d60d3b0115b SHA512 6158b56816bf7e5173f23fa29314f33effe5eb49a06201cdfa17743d22b3f0e3260f9aa2661687cc369f252e958ba193088fc96aa4de4d3c93d69658d145ab56
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
-DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
 DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4
 DIST fwupd-1.8.4.tar.xz 3269648 BLAKE2B 20857c5de6194a561c587ace0463d94440d25256a04cce51b77f3dcffde9b0f08a03a03e1d0dbb5f15016169f9a31e290609b3fc3f68b40b932c77335f05ec6f SHA512 569d0cb81f9a29259d0a7ae7100ca1063d20557b56903f80c1466667baf40a74d677f48159e5bd53ab6b33de8ce7185bf279b6dbcf6edfee744c1d4965c5db8f
-EBUILD fwupd-1.7.7-r2.ebuild 4687 BLAKE2B a5450492daf94736a2ee317978fc21d60382bb8a6c7ba3c003149f2f3e73565644654ff077c8ccd54dae968d275dd20a128f045202b2dc4c19f7ad80a9082fd5 SHA512 15feebf6040c76435e4b55256744546c283e6b9f05ab8f0412826298f35be668a08656d22b8f38ea3016e46b746a59d4f7282e73046297628d18ced93bceb429
-EBUILD fwupd-1.8.3.ebuild 5322 BLAKE2B d1336f8aa29c9d4bea521010e2d17500e146879721c8a109ef86c6d2d08cef9eab4d51261d98be6f4b49820f9b639bd0df380502b9baec168d2b37dd6d8b1d14 SHA512 3d248768e415d42ab8b59def8ac8cb90552b4e8a943d5d4a2144b31876cb702816423a733a6b88d96481278f2bf8ebf93f5c82ab9d9b01e4a155ca129b7927ea
-EBUILD fwupd-1.8.4.ebuild 5184 BLAKE2B cdd05ac4b0272cb7270e68b57935914ca0c2f5b36f4eeb2a1878d47b625bb196b8c228281f3fa96f8cc1c0af9bdd0a093c9f83d99b6eb1c0816cb7915265d369 SHA512 883a66fe4b62725e8a1c4c19aa6b6072ebde1d0162abe62694e7af390498a15732a289667a3d04fc4f891dfa71d4fa548b092882db71c721b923170752bf4045
-MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
+EBUILD fwupd-1.8.3.ebuild 5356 BLAKE2B d8e24b8a801b87fb6c5f131c085733179c7b1e3e9db8ae520c8a8936ca735f980943ce4c161dd6f16be907c9960bdc46ca69f00c87baba8794603730e97a6044 SHA512 cdf4745d6a2bae6f8400810bfc608f86f9851688f122c73b38cd0924d1fbca80a96bb6ea02bbd86e98ea17071f7ffe52e759a4362cccf0d3a577db5f4eebbb01
+EBUILD fwupd-1.8.4.ebuild 5218 BLAKE2B e2da28da4b199830dfa58cfa6ab9560844115c39953fb47fe3b258f109038685910d535b6e7cae42b03749bf716c2d3d884840b722e34074c84c70abdfed676d SHA512 3b8101026dc08faa88d552f729809739f99a866b6fda5989ae0c9e0aba7c64e2763117de5ba331104188ec453c6612b69d7e833d05fbf89f5cf958967297c474
+MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
deleted file mode 100644
index cc687abf943b..000000000000
--- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use nvme ; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="true"
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use fastboot plugin_fastboot)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_uf2)
-		$(meson_use logitech plugin_logitech_bulkcontroller)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use sqlite)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild
index 6dd2394f80cf..27984e59c834 100644
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild
@@ -198,9 +198,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	use minimal || udev_reload
 }
 
 pkg_postrm() {
+	xdg_pkg_postrm
 	use minimal || udev_reload
 }
diff --git a/sys-apps/fwupd/fwupd-1.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild
index 4d97b8c02eb5..df9202e9d65c 100644
--- a/sys-apps/fwupd/fwupd-1.8.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild
@@ -195,9 +195,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	use minimal || udev_reload
 }
 
 pkg_postrm() {
+	xdg_pkg_postrm
 	use minimal || udev_reload
 }
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 748aacf79969..e17d6e15e8fb 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -22,7 +22,6 @@
 		<flag name="modemmanager">Build and install Modem Manager plugin</flag>
 		<flag name="spi">Install Intel-SPI plugin</flag>
 		<flag name="synaptics">Install synaptics plugin</flag>
-		<flag name="thunderbolt">Install Thunderbolt plugin</flag>
 		<flag name="tpm">Install Trusted Platform Module plugin</flag>
 		<flag name="uefi">Enable UEFI support</flag>
 	</use>
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 975324d2d8e3..37286c93cccb 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -3,11 +3,13 @@ AUX fancontrol.initd 600 BLAKE2B 2c869e1c5f1a6af0a95a9dce29856414f7e0d8e4a0accf4
 AUX fancontrol.service-r1 146 BLAKE2B 666a45c2e55dcf31470167ba9bb78e6205b3fcb47f66ae7b185d6651dba33f8a7699f800ecddaed070a8827d24893cc1971203b691f37515ea74125e889e8965 SHA512 eb1e22045a4adbcba398b77061d33b145614edf960c31aeb3c9a987553d6a0d8de332d4887e52ca2c6d6147d6e1a2b5e8bae41dca5f1c9d4fc2dc522c18459f8
 AUX lm-sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
 AUX lm-sensors-3.6.0-no-which.patch 593 BLAKE2B 7e5e141b3cae400f767b31226436370a9dba1cd2c5364463225900cb95f4cfaf67ef75a4f89e3a760ea3ef5383ee4d0ed873f277114d6ebc1aee44cf543d7d0f SHA512 dad3c21290323eeec3ab947a723700ebb819cbe067059fce3d1e81c5c1c9b1a62d0ecc2d9a710e1d25600dd25e11c0f664dd1e67f05cf54859d37d0c642ebce8
+AUX lm-sensors-3.6.0-w83627ehf-nct6775.patch 1930 BLAKE2B 43f79c4ff0df654a23a2356c43f6504980aaa71af057e5f9cd9394c81e35ab456572d28d7873b13772cc5ec82bf2bdd866339044492e6a64144c438524efd50d SHA512 2f889352624434c1addbf80355327e6fe3bea5c98283bd4a88c78f620a75df40d74780f3c4603ab2c1c14b20e99fa4e67072ce3b522aaedeef977ef5a3eb848b
 AUX lm_sensors.confd 102 BLAKE2B 5d0771a2cac4869caee2d6ae3ac2cc2f60e64720ad587d4a89fa6dca7506325554b06d92cce42fc51b9af9c8715834d6d481f342cd6be57061c5234dfabd26d3 SHA512 a31220f4bf337de7b17158e00c64e662527abe11c5cc9f8401216f757dcde1c220527ad73f375c0de051030119daeba4cef6c5155f077447a9391e273cd65f50
 AUX lm_sensors.initd 331 BLAKE2B 6bb75290fb3b686c6a4ad213360cf82020065b259b22c40d049b5caf6f22f7bcaf37e09b90e50330e14023d1d0102f4d2e755757c983fa58c2f0ed4ecb45b025 SHA512 1b4ad50408804da03b3862e10d342ad2e0d8077340fa57d8b28e470259bc50176b4e1208ff9ffaf28839c76767e18685c7abdac12b74185c84e80ebfbcd01ab1
 AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
+EBUILD lm-sensors-3.6.0-r1.ebuild 6638 BLAKE2B 5b013c228428208cfc65849990156b48e814de7c9a1977bbd4e24c063d4640a414c608f484feba3459d95d989b834790d160174f166ee5a24cec6b309058f864 SHA512 6adf11422cdc0cbb825153e81978cf5586db974a0078362aa254a042a53aadf31325fecc8dca2874eb71a40077680cc1c8b6e9059ed2fb76f580c65509b5fe0c
 EBUILD lm-sensors-3.6.0.ebuild 6672 BLAKE2B efecba75234ac2175f71f070cd16b3bed7dbae5e74c91ce78c3999de502155286669651dd8ff3149d83d51190bf672e90a477aba5d528b540e1fe6ef2b2aa3f2 SHA512 2f120c58c561c148ab755b85dc3d1e65c731e1fad666cc39ade50e98fff6de3c0c0ab59cdd57bbd262a47a15ef2095f7d4139c996446288d3ddc6e9d61f7cf7d
 MISC metadata.xml 826 BLAKE2B f4bbd7a126d042dc595f2f5f980445ee576f61c589ecd61359b0f68935b92a2483890add6f4b3fbe73d7e43a5e60462cde524c25561df0036d43c95dd36bdc2f SHA512 83e3b7b23643aff17671420de8bb32095e2170d4b80abd4bf5cee4f08a7168475f8779a40a6d35d587f8820a7f6d32eb8c9a83015860bc521064ca157e23782a
diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch
new file mode 100644
index 000000000000..e4493c414a49
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch
@@ -0,0 +1,46 @@
+From 23c53b457407ab3ed217f963fc0329d0ae4bdeac Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Tue, 12 May 2020 16:22:06 +0200
+Subject: [PATCH] sensors-detect: Fix the driver for Nuvoton W83677HG-I
+
+Originally, support for the Nuvoton W83677HG-I and derivatives was
+first added to the w83627ehf driver, so that's the driver recommended
+by sensors-detect. Later, support for the same device was added to
+the nct6775 driver. In kernel v5.6, support was removed from the
+w83627ehf driver to get rid of the duplicate code.
+
+So sensors-detect should now point users of this device to the
+nct6775 driver. We can't do that for very old kernels though, as this
+driver did not exist back then. I chose v3.10 for the cut-over, as
+this is when support for the Nuvoton W83677HG-I was finalized in the
+nct6775 driver, at least according to git log.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ prog/detect/sensors-detect | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
+index 6fc441aa6..319b1b7b9 100755
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -2273,7 +2273,7 @@ use constant FEAT_SMBUS	=> (1 << 7);
+ 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+ 	}, {
+ 		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+-		driver => "w83627ehf",
++		driver => sub { kernel_version_at_least(3, 10, 0) ? "nct6775" : "w83627ehf" },
+ 		devid => 0xB470,
+ 		devid_mask => 0xFFF0,
+ 		logdev => 0x0b,
+@@ -4574,7 +4574,9 @@ sub scan_cpu
+ sub chip_special_cases
+ {
+ 	# Some chip to driver mappings depend on the environment
+-	foreach my $chip (@chip_ids) {
++	foreach my $chip (@chip_ids, @superio_ids_natsemi, @superio_ids_smsc,
++			  @superio_ids_smsc_ns, @superio_ids_winbond,
++			  @superio_ids_ite) {
+ 		if (ref($chip->{driver}) eq 'CODE') {
+ 			$chip->{driver} = $chip->{driver}->();
+ 		}
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..1374e7998896
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs multilib-minimal
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
+
+if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
+	COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc"
+	SRC_URI="https://github.com/lm-sensors/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+else
+	SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_rs 1- -)"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1"
+
+# SUBSLOT based on SONAME of libsensors.so
+SLOT="0/5.0.0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="contrib sensord static-libs"
+
+COMMON_DEPS="
+	sensord? (
+		net-analyzer/rrdtool
+		virtual/logger
+	)"
+
+RDEPEND="${COMMON_DEPS}
+	dev-lang/perl
+	!<sys-apps/openrc-0.36"
+
+DEPEND="${COMMON_DEPS}
+	sys-devel/bison
+	sys-devel/flex"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch
+	"${FILESDIR}"/${PN}-3.6.0-no-which.patch
+	"${FILESDIR}"/${PN}-3.6.0-w83627ehf-nct6775.patch
+)
+
+DOCS=( CHANGES CONTRIBUTORS INSTALL README )
+DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
+
+src_prepare() {
+	default
+
+	if [[ -n "${COMMIT}" ]]; then
+		local _version="${PV%_*}+git_${COMMIT}"
+
+		sed -i \
+			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
+			version.h || \
+			die "Failed to update version.h"
+
+		sed -i \
+			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
+			-e "/^\$revision =~ s.*/d" \
+			prog/detect/sensors-detect || \
+			die "Failed to set revision in prog/detect/sensors-detect"
+
+		sed -i \
+			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
+			-e "/^REVISION=.*/d" \
+			-e "/^REVDATE=.*/d" \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust prog/pwm/pwmconfig"
+	else
+		sed -i \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
+	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
+		die "Failed to sed in LDFLAGS"
+
+	sed -i \
+		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+		prog/pwm/fancontrol || \
+		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
+
+	# Don't use EnvironmentFile in systemd unit
+	sed -i \
+		-e '/^EnvironmentFile=/d' \
+		-e '/^Exec.*modprobe.*/d' \
+		prog/init/lm_sensors.service || \
+		die "Failed to remove EnvironmentFile from systemd unit file"
+
+	if ! use static-libs; then
+		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
+			die "Failed to disable static building"
+	fi
+
+	# Don't show outdated user instructions
+	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
+		die "Failed to remove outdated user instructions"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	default
+
+	if multilib_is_native_abi && use sensord; then
+		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
+		# support. To prevent errors like
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
+		#   cannot find -lrrd
+		#
+		# we only build sensord when we are building for profile's native ABI
+		# (it doesn't affect libsensors.so).
+		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
+			die "Failed to enable building of sensord"
+	fi
+}
+
+multilib_src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)"
+}
+
+multilib_src_install() {
+	# We need to set CC and friends again here to avoid recompilation for cross
+	# bug #799851
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		DESTDIR="${ED}" \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		ETCDIR="/etc" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+	newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
+	systemd_dounit prog/init/lm_sensors.service
+
+	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
+	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
+	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord.confd sensord
+		newinitd "${FILESDIR}"/sensord.initd sensord
+		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
+	fi
+
+	einstalldocs
+
+	docinto developers
+	dodoc doc/developers/applications
+
+	if use contrib; then
+		insinto /usr/share/lm_sensors
+		doins -r "${S}"/configs
+	fi
+}
+
+pkg_postinst() {
+	local _new_loader='3.4.0_p20160725'
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! ver_test "${_v}" -gt "${_new_loader}"; then
+			# This is an upgrade which require migration
+
+			elog ""
+			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
+			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
+			elog ""
+			elog "To migrate your configuration you have 2 options:"
+			elog ""
+			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
+			elog ""
+			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
+			elog "     variables from \"/etc/conf.d/lm_modules\" to"
+			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
+			elog ""
+			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
+			elog ""
+			elog "     Important: Don't forget to migrate your module's argument"
+			elog "                (modules_<name>_args variable) if your are not already"
+			elog "                using \"/etc/modprobe.d\" (which is recommended)."
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# New installation
+
+		elog ""
+		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
+		elog ""
+		elog "You might want to add lm_sensors to your default runlevel to make"
+		elog "sure the sensors get initialized on the next startup."
+		elog ""
+		elog "Be warned, the probing of hardware in your system performed by"
+		elog "sensors-detect could freeze your system."
+	fi
+}