From d49d63ee52f4026f7871f4ce062c172ba5e62b74 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 15 Sep 2022 05:12:09 +0100
Subject: gentoo auto-resync : 15:09:2022 - 05:12:09

---
 sys-apps/Manifest.gz                               | Bin 48678 -> 48676 bytes
 sys-apps/ipmi-fan-control/Manifest                 |   5 +-
 .../ipmi-fan-control-0.3.10.ebuild                 | 159 +++++++++++++++++++++
 .../ipmi-fan-control/ipmi-fan-control-0.3.9.ebuild | 145 -------------------
 .../ipmi-fan-control/ipmi-fan-control-9999.ebuild  |  58 ++++++++
 sys-apps/portage/Manifest                          |   2 +-
 sys-apps/portage/portage-3.0.36.ebuild             |   2 +-
 sys-apps/sed/Manifest                              |   3 +-
 .../files/sed-4.8-avoid-noreturn-diagnostic.patch  |  21 +++
 sys-apps/sed/sed-4.8.ebuild                        |   4 +
 10 files changed, 249 insertions(+), 150 deletions(-)
 create mode 100644 sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.10.ebuild
 delete mode 100644 sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.9.ebuild
 create mode 100644 sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
 create mode 100644 sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9c46348b3633..e6f027018fb4 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/ipmi-fan-control/Manifest b/sys-apps/ipmi-fan-control/Manifest
index e45497c886ef..a221de680eef 100644
--- a/sys-apps/ipmi-fan-control/Manifest
+++ b/sys-apps/ipmi-fan-control/Manifest
@@ -29,7 +29,7 @@ DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb57
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST ipmi-fan-control-0.3.9.tar.gz 37251 BLAKE2B bfc655aea24bb0abd2bc100e6d058b7e2cef538ec774e06bbf0459799d3aee9894e1b3a707e9236c817fd8717d6aa07786ed50f592ba61d35bf02bdaec0db8f7 SHA512 5fdf5dd932df7fba71c8bc740ebd242cc4e7f51bcbc57b7d8993ed35277d2b02c4a4d2da31b1734bd03e30f1b74319049cc2383b857ffc738903756c45e49443
+DIST ipmi-fan-control-0.3.10.tar.gz 37283 BLAKE2B 2bdcd158968dd4f7828bcab2c5c90e0d89e7671e3b10e138d8402fed9b777c854748b63d349bb2b4d5a89d27434608435257d33ef469b3a7236a4f72c7e4161c SHA512 840924b90c03c914bc60c4b4b95ac014804b5d1578db9d916100761d6246d8a0fe97949a5afd496e5732788d556a755f57797fdd7ca3adef79ee6865b629a004
 DIST itoa-1.0.3.crate 10481 BLAKE2B aa516e8b2fdea4e4e1260a0783fb7aa2672c1bccdf519c45c608fe3f3fd4fe652d7f56f0cd6eeb6a56bc324c68ff241f601660a0dc3c5ffdf7fa239f470078ec SHA512 1290c027ec8a13d2d15ace2b58a1d1a3a18730cd5fb55bc995826b8f4d04ede650b8315a8905f6737c4c4988690ae03bf32c86ab3a31ae068a67d5be04cd618b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
@@ -100,5 +100,6 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD ipmi-fan-control-0.3.9.ebuild 3068 BLAKE2B e968ebc6400648e9ec0e09cf13d7a2680d1288f8f02dd9a55cc729df54c69dae82631262a583dc7345dacb61473331e018bd3ec2022df0315b27bc35b9ff8793 SHA512 51aca0b9ee7851b3d82cb29d945f271e4c263c0f2c08a12d62f2ad4cb623d2ff104d3b1e6dbf7e51563fbcd0fcfde728c941880d12843c4a5b7263bf29f0fa34
+EBUILD ipmi-fan-control-0.3.10.ebuild 3303 BLAKE2B 872ac62e8e2fa5e8c696f88020fc9952d281c802c424469eae48f88e2b9c94f37800674b01a72fa09b6ed1505fab18a63ec0d31c6d837cc65e40bf27e61164a3 SHA512 726f29df0669cab0fe52144999cea381fbca17b7b96445b1f075166042fe05d63fc1db0c626e4d1d34fe14dbc437771b2976926074b78379301a9a0434becbfa
+EBUILD ipmi-fan-control-9999.ebuild 1422 BLAKE2B 19b6dad8a840769323db6b45068e0a036aa14663ae147cb22c5496d39f722e85143187823fae8b7682dd5be8a7ec19b049383edc66415cd560bb89cd85261e2d SHA512 306b592c287288ca59909948f76a3fcc8ce74bfa192c2828cfd430f811adaad1bb460b4e95b6b793ff6d5f7632f83c10fecd73e79757ad86de61ba5be284f9f4
 MISC metadata.xml 423 BLAKE2B 7137f5ca6c83dbaf3434a33a3baf3101ab176993e0d41471ae0795a7181dadc2103126c9f968e3a0d24334ee0bbb408d9eea9578827ea92b0e9e15a284a7da5a SHA512 5e390262239e69a9d22085583c11dbecd93756a3af8a45e9afc379ed83b13d66a994fc25ab526fc9210b0ef71673c9d27f6ea156274988dbc8d1f780755dddf7
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.10.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.10.ebuild
new file mode 100644
index 000000000000..26a8ad739449
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.10.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.17.0
+	adler-1.0.2
+	aho-corasick-0.7.19
+	ansi_term-0.12.1
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.66
+	bitflags-1.3.2
+	bytes-1.2.1
+	cc-1.0.73
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	clap-2.34.0
+	env_logger-0.9.0
+	error-chain-0.12.4
+	fastrand-1.8.0
+	futures-0.3.24
+	futures-channel-0.3.24
+	futures-core-0.3.24
+	futures-executor-0.3.24
+	futures-io-0.3.24
+	futures-macro-0.3.24
+	futures-sink-0.3.24
+	futures-task-0.3.24
+	futures-util-0.3.24
+	getrandom-0.2.7
+	gimli-0.26.2
+	heck-0.3.3
+	hermit-abi-0.1.19
+	humantime-2.1.0
+	instant-0.1.12
+	itoa-1.0.3
+	lazy_static-1.4.0
+	libc-0.2.132
+	lock_api-0.4.8
+	log-0.4.17
+	memchr-2.5.0
+	miniz_oxide-0.5.4
+	mio-0.8.4
+	nix-0.14.1
+	num_cpus-1.13.1
+	object-0.29.0
+	once_cell-1.14.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.3
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	ppv-lite86-0.2.16
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.43
+	quote-1.0.21
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	redox_syscall-0.2.16
+	regex-1.6.0
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	retry-1.3.1
+	rexpect-0.4.0
+	rustc-demangle-0.1.21
+	ryu-1.0.11
+	scopeguard-1.1.0
+	serde-1.0.144
+	serde_derive-1.0.144
+	serde_json-1.0.85
+	signal-hook-registry-1.4.0
+	slab-0.4.7
+	smallvec-1.9.0
+	socket2-0.4.7
+	strsim-0.8.0
+	structopt-0.3.26
+	structopt-derive-0.4.18
+	syn-1.0.99
+	tempfile-3.3.0
+	termcolor-1.1.3
+	textwrap-0.11.0
+	thiserror-1.0.35
+	thiserror-impl-1.0.35
+	tokio-1.21.1
+	tokio-macros-1.8.0
+	tokio-stream-0.1.9
+	toml-0.5.9
+	unicode-ident-1.0.3
+	unicode-segmentation-1.10.0
+	unicode-width-0.1.10
+	vec_map-0.8.2
+	version_check-0.9.4
+	void-1.0.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="SuperMicro IPMI fan control daemon"
+HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
+else
+	SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		$(cargo_crate_uris)"
+	# supported boards are x86_64 only, do not keyword elsewhere
+	# technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="MIT 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+
+RDEPEND="sys-apps/ipmitool"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	sed -i \
+		-e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
+		-e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
+		dist/ipmi-fan-control.service.in || die
+
+	# TODO: add openrc service
+	systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
+
+	insinto /etc
+	newins config.sample.toml "${PN}".toml
+}
+
+pkg_postinst() {
+	optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
+}
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.9.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.9.ebuild
deleted file mode 100644
index 3f889794b444..000000000000
--- a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.3.9.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.17.0
-	adler-1.0.2
-	aho-corasick-0.7.19
-	ansi_term-0.12.1
-	atty-0.2.14
-	autocfg-1.1.0
-	backtrace-0.3.66
-	bitflags-1.3.2
-	bytes-1.2.1
-	cc-1.0.73
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	clap-2.34.0
-	env_logger-0.9.0
-	error-chain-0.12.4
-	fastrand-1.8.0
-	futures-0.3.24
-	futures-channel-0.3.24
-	futures-core-0.3.24
-	futures-executor-0.3.24
-	futures-io-0.3.24
-	futures-macro-0.3.24
-	futures-sink-0.3.24
-	futures-task-0.3.24
-	futures-util-0.3.24
-	getrandom-0.2.7
-	gimli-0.26.2
-	heck-0.3.3
-	hermit-abi-0.1.19
-	humantime-2.1.0
-	instant-0.1.12
-	itoa-1.0.3
-	lazy_static-1.4.0
-	libc-0.2.132
-	lock_api-0.4.8
-	log-0.4.17
-	memchr-2.5.0
-	miniz_oxide-0.5.4
-	mio-0.8.4
-	nix-0.14.1
-	num_cpus-1.13.1
-	object-0.29.0
-	once_cell-1.14.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	ppv-lite86-0.2.16
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.43
-	quote-1.0.21
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	redox_syscall-0.2.16
-	regex-1.6.0
-	regex-syntax-0.6.27
-	remove_dir_all-0.5.3
-	retry-1.3.1
-	rexpect-0.4.0
-	rustc-demangle-0.1.21
-	ryu-1.0.11
-	scopeguard-1.1.0
-	serde-1.0.144
-	serde_derive-1.0.144
-	serde_json-1.0.85
-	signal-hook-registry-1.4.0
-	slab-0.4.7
-	smallvec-1.9.0
-	socket2-0.4.7
-	strsim-0.8.0
-	structopt-0.3.26
-	structopt-derive-0.4.18
-	syn-1.0.99
-	tempfile-3.3.0
-	termcolor-1.1.3
-	textwrap-0.11.0
-	thiserror-1.0.35
-	thiserror-impl-1.0.35
-	tokio-1.21.1
-	tokio-macros-1.8.0
-	tokio-stream-0.1.9
-	toml-0.5.9
-	unicode-ident-1.0.3
-	unicode-segmentation-1.10.0
-	unicode-width-0.1.10
-	vec_map-0.8.2
-	version_check-0.9.4
-	void-1.0.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1
-"
-
-inherit cargo optfeature systemd
-
-DESCRIPTION="SuperMicro IPMI fan control daemon"
-HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
-SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="MIT 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-# supported boards are x86_64 only, do not keyword elsewhere
-# technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
-KEYWORDS="-* ~amd64"
-
-RDEPEND="sys-apps/ipmitool"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_install() {
-	cargo_src_install
-
-	sed -i \
-		-e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
-		-e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
-		dist/ipmi-fan-control.service.in || die
-
-	# TODO: add openrc service
-	systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
-
-	insinto /etc
-	newins config.sample.toml "${PN}".toml
-}
-
-pkg_postinst() {
-	optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
-}
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
new file mode 100644
index 000000000000..34f602de380e
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="SuperMicro IPMI fan control daemon"
+HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
+else
+	SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		$(cargo_crate_uris)"
+	# supported boards are x86_64 only, do not keyword elsewhere
+	# technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="MIT 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+
+RDEPEND="sys-apps/ipmitool"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	sed -i \
+		-e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
+		-e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
+		dist/ipmi-fan-control.service.in || die
+
+	# TODO: add openrc service
+	systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
+
+	insinto /etc
+	newins config.sample.toml "${PN}".toml
+}
+
+pkg_postinst() {
+	optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e51d5e2220ee..b88d51794d34 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,6 +8,6 @@ DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e501
 DIST portage-3.0.36.tar.bz2 1114026 BLAKE2B a8a535ae309c32955eae6a491cbc97f809fb67111688087aa98ac28df4bc97fcb3d9a4ce7c5dbdfbb7f21891a7524f671ff3e3ccbed425503c66bde591266957 SHA512 94b39718871e895c1170271ad072eaa72c995a7e7a06bda9ee76cde2e3949682da7a996780a83cc33c4647915f942fe9d4a7b9b6dfd9319143eb1453cee3b3de
 EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
 EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
-EBUILD portage-3.0.36.ebuild 8776 BLAKE2B 9ab205168b78229a1e55a7092cbb5bc16c63df719633f19d6ae34f158f67826f52a398a06ee6a3a87f4774d14c4b8100355f5f00b3ad779480502a400f8735dc SHA512 3f3c869e65258775f0e35fa770d0271adea169451a2353c0455409764b46892f28f0777de7c836bf2e34662c98ce3479706f0fa5c12013fc82d6e61e07cea9de
+EBUILD portage-3.0.36.ebuild 8774 BLAKE2B 35f821da5c324cf9dc0938f998214fbee9b3d55f699d91db5441ff448dc6602a9c7bf10d47e2b3ea7b53c19dcc90c150b31a0ae913ed85c23d29f46a0d389289 SHA512 437c743f7c6db48529d7371530c1e5d9c92941862f42266ae373841e4e771d01c1c853079381c3273e52a0112265befd8b1bc99de67642459105e4e2988e314c
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.36.ebuild b/sys-apps/portage/portage-3.0.36.ebuild
index e4e01496beee..cb0a9e0d6a5d 100644
--- a/sys-apps/portage/portage-3.0.36.ebuild
+++ b/sys-apps/portage/portage-3.0.36.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index b2fdbe2db08f..7176f8778b13 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,4 +1,5 @@
+AUX sed-4.8-avoid-noreturn-diagnostic.patch 677 BLAKE2B 27738d62b3052e4b39d70f28465b1ed70b363f2d7d01a4f37090d8351a11d4f131e0915d226c0b53dd995d76490542e796dc31efde368d3ca9f82cc7da81ce21 SHA512 9961a68e30608cf52c31265e63963823aa2971807dd501e2f841f4f0b7519488224b08b58e6fec106b56f221a4756a9dd43ce237d2d894d5505c33d593ec6a44
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
 DIST sed-4.8.tar.xz.sig 833 BLAKE2B 8e5b3c69a28ffbfa49ef6f769fbb72c6f1ec14e6e1e0cec3851d15d85e05560a8a74e28e037eefb916b10831b4afbe0e4735d713dc3b90d7d73de7d0b1176d0b SHA512 9b886bdbd18ee2d60608cee3fd2b4193a1b6c3309d887ee05828c14b89b7b515dbf042a9e0ebdd13e6ccfa42e3cd217a408c796d68c4ebedaaa64f795000f095
-EBUILD sed-4.8.ebuild 1102 BLAKE2B df5b3b78d4cd505fb56c5e2321ea10fbd4b190b05af303f8dc3d760fbab118e4c56a67de95f6329375c0e1f2b42c73591e54be1ba7f478dc3a68250c32daac3f SHA512 48a545b4cf5c2d3df81a55593f0d3f31e46f154c16b3974bc6bd86952f24e717df1a4bdb3d4a57336ed0f650799bc0ebbd003785837102d4f1bb74221f8f5f40
+EBUILD sed-4.8.ebuild 1167 BLAKE2B b95e7906784c90d297d0bf89a426626f2ebd423051557d17977551eb4263742af7dfbf296d8a3ffbdd16c2422d6d7282c9384823e50955022ade04b0f4138ee8 SHA512 1a77750faad77df90e3d959deffe9501bb88cae5cc6546b1f9e4ee8ae42f2edc7a851c22fa7cd259d0c70e04bf06d60fb15226c88df373e62574290eea2c02e2
 MISC metadata.xml 374 BLAKE2B a7f25f18d1ffcd990f11d66f403f5e283af61b7a81127b8a4450506b5432610972d4d28df0c60b5e45d502d2f2e260f0390836b43d9e5efd48e4594796f751c4 SHA512 7efb14e44bc0d9d25b0e90f776f25ee5fbcb8b44b226255dcdd5e54cb1fb414f9c7dcd33ec2aa6f6bfa82159be8bba19069fc9e13576bfe2b99a87c898f2d002
diff --git a/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch b/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch
new file mode 100644
index 000000000000..d361780b548d
--- /dev/null
+++ b/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch
@@ -0,0 +1,21 @@
+https://github.com/coreutils/gnulib/commit/0cc39712803ade7b2d4b89c36b143dad72404063
+
+From 0cc39712803ade7b2d4b89c36b143dad72404063 Sun Oct 18 00:00:00 2020
+From: Bruno Haible  <bruno@clisp.org>
+
+obstack: Fix a clang warning.
+* lib/obstack.c (print_and_abort): Mark as __attribute_noreturn__.
+
+diff --git a/lib/obstack.c b/lib/obstack.c
+index 6e82da054c..e6475a2a09 100644
+--- a/lib/obstack.c
++++ b/lib/obstack.c
+@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE;
+ #   include <libio/iolibio.h>
+ #  endif
+ 
+-static _Noreturn void
++static __attribute_noreturn__ void
+ print_and_abort (void)
+ {
+   /* Don't change any of these strings.  Yes, it would be possible to add
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index d71ab4f61ead..060be8689435 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
 BDEPEND="nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-sed )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-avoid-noreturn-diagnostic.patch"
+)
+
 src_configure() {
 	use static && append-ldflags -static
 
-- 
cgit v1.2.3