Merge updates from master

5 files changed, 59 insertions, 2 deletions

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 7e130062a6c1..0bc714e8175f 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -29,6 +29,15 @@
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
 
+
+# @ECLASS_VARIABLE: CHECKCONFIG_DONOTHING
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Do not error out in check_extra_config if CONFIG settings are not met.
+# This is a user flag and should under _no circumstances_ be set in the ebuild.
+: ${CHECKCONFIG_DONOTHING:=""}
+
 # @ECLASS_VARIABLE: KERNEL_DIR
 # @DESCRIPTION:
 # A string containing the directory of the target kernel sources. The default value is
@@ -978,7 +987,7 @@ linux-info_pkg_setup() {
 
 	linux-info_get_any_version
 
-	[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+	[[ -n "${CONFIG_CHECK}" && -z ${CHECKCONFIG_DONOTHING} ]] && check_extra_config;
 }
 
 # @FUNCTION: kernel_get_makefile
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index cd513eb0ee5b..131196855c8c 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,5 +1,10 @@
 DIST emutos-1024k-1.1.1.zip 342557 BLAKE2B eff915f0c531296c1c68a73bd96ef9a8b27195c4fdcd957df75b48806cf77ae8483a6a4d7a105cd5a609cb3412754d8de221b20ddf5cde9371a4a89183aa5270 SHA512 76d108a7d0e501552ec49ae14a7d00a334c9f262d0d5fd9d6eb12837e2bd54ec652679c3368bdb4c38560b7621483a44fb386562aa6727235ae8a3c4af07930f
+DIST emutos-1024k-1.2.zip 349307 BLAKE2B cc856a44eeea347b578ae0b2a05a0dfd0ac27c65c434ee87d3688d4f5a9ef999fd75d765b9ab224c7e386ab10ce78e40cac717159a4fffab3ebfb7df9e3590ff SHA512 656ef5abd9e0ef867045151c3178f4ccfe8e5ab49657ccd62072651485a81c5b384c826a254832d4be71eb81b14ddd55b24922428aaf6f6b3aef3e87582fb23a
 DIST emutos-192k-1.1.1.zip 2025455 BLAKE2B 9806be9d886653215d5553d2a908374da69a6982a2ec71ad04d2293c6fa2e4e5ccd651d95b78b4d58cbed45d9bf3ce9d8fc49b9409cb364f3120fb520cc2cfdf SHA512 7ec7ad52aa92553b2b0e61d88aac408ddf3c06d64f50854a02f7b44be99afecf9139906880641bba6bf17e431058c0afa11aae0a23479256c26713b87ec122e4
+DIST emutos-192k-1.2.zip 2021484 BLAKE2B f1ba0cde2000e0a0e0d48127a805c10396d2cc68f0209b4fc7fc34e3f5289f1dee451588cfde225c124386f961f17893c06ddfe7fc494169a4e17fab1d61d02f SHA512 2da55d3855e955e18ba00c0684907a0827a8928f1bddcb09d412b40e2baa560a0701880538007601deaec061bc221693f961bfa2992adb7112cc12104cb4be31
 DIST emutos-256k-1.1.1.zip 2570117 BLAKE2B e5646dea14b8608db1cb49f1d51d21971c36b664f013f2146848b78d9b0b4260029507c2a5e66fba473b4263a673ac59bb40e0ebdf864cdd3efbfc68ecec485a SHA512 62e3dff01733e04a76e669e88268a80423811b579ecd2f9f9d2bb59b9cbe649af0838d4e1cc930a2ba8095f624d374add79dbe3f98f6589bc2b50dece14cec27
+DIST emutos-256k-1.2.zip 2573209 BLAKE2B a26a9099b0afd07ff200982f63fdc4c8a6a8559b850392618886b30be9c84ed985edce789eca76d6e3c66cc5919c754aef8784e30bb600a9b24b4948ca71dc44 SHA512 d476f8cf125accd0a3cde9761d3bf08af26ff88e6f1b7631e903dc777c59d74786fb2e74441db3373d9d01a7573a892d68b243f23774ae156d6598ada55c948c
 DIST emutos-512k-1.1.1.zip 3117851 BLAKE2B 5a691e6b63ae5afb4e9f374580791d8e44feb75244ca287c9de19cd011224bfafb3041321b0f288b2add77d93402a958ac881a8a5200f49df4c81c062745b5ae SHA512 d5dd01e9470844b5c7b87231f021b3c50817517a7dc20f4b96cac51b318a7961dbff8df1534c7e89797f38aa8515c836feb1be4df5f7d0cf09f077d0ea57035a
+DIST emutos-512k-1.2.zip 3193629 BLAKE2B 77fdbf13e039f170b7bb1fe017ec8d4eb3216a6e9b6d528f4680c63e08e596700adbc7c0d9e78e0edcbf9cfbf7d6eefb1387198752871d0c9eb9005d09e09264 SHA512 76dbd9b9805f2ef747efee44b87755c4a519b890e211c6ca26df169ae3fa4562aa1c5dc53d9938ad72e632f33e516826c09b1101b7cf35255ed89b902e1c7cf1
 DIST emutos-aranym-1.1.1.zip 295671 BLAKE2B a4e1b34d851c7a410253ed41fd3b783e1f23d0859eb07cef529dd9f003cc2df77caa0ac0cfab0a80c4ab9421013ba6d6fe38ba849e95e23c4565f25d095d9ca1 SHA512 a4aa1f084e5baca9809f86d216bc45d178822ebe7af1f507ffe243f9e2b217bd3a0ef8b290ade5a5dc54b92991937a2a906fdcf9b1bf890e0f2ee0410d835b85
+DIST emutos-aranym-1.2.zip 301209 BLAKE2B caecd86ea97a6e79d036dd4aabe6adc4749c3f339b7b888086547d658deb94fe2ef1702664a36f3c0fa4a405bedb4a6ec5a019a8f79c3896bc99abc26a06010d SHA512 2bebf3a54f1e874edd473fb97694a16784b04fcc8a707e0540362597d31acf2d6558560968d83ea2691426f44bf1e8fab9920770715bb5d4399d480947676304
diff --git a/games-emulation/emutos/emutos-1.2.ebuild b/games-emulation/emutos/emutos-1.2.ebuild
new file mode 100644
index 000000000000..d351e0bdc49a
--- /dev/null
+++ b/games-emulation/emutos/emutos-1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_L10N=( cs:cz de es fi fr el:gr hu it nl no pl ru sv:se de-CH:sg tr en-GB:uk en:us )
+MY_VERS=( 192k 256k 512k 1024k:etos aranym:emutos- )
+
+DESCRIPTION="Single-user single-tasking operating system for 32-bit Atari computer emulators"
+HOMEPAGE="http://emutos.sourceforge.net"
+SRC_URI="$(printf "mirror://sourceforge/emutos/${PN}-%s-${PV}.zip " "${MY_VERS[@]%:*}")"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="$(printf 'l10n_%s ' "${MY_L10N[@]%:*}")"
+
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	local e list=()
+	for e in "${MY_L10N[@]}"; do
+		use l10n_${e%:*} && list+=( ${e#*:}.img )
+	done
+	(( ${#list[@]} )) || list=( us.img )
+
+	insinto /usr/share/${PN}
+	for e in "${MY_VERS[@]}"; do
+		if [[ ${e} =~ : ]]; then
+			doins ${PN}-${e%:*}-${PV}/${e#*:}${e%:*}.img # multilanguage
+		else
+			doins "${list[@]/#/${PN}-${e}-${PV}/etos${e%k}}" # single
+		fi
+		newdoc ${PN}-${e%:*}-${PV}/readme.txt readme-${e%:*}.txt
+	done
+
+	# These are identical for each, only need once.
+	dodoc ${PN}-1024k-${PV}/doc/{announce,authors,bugs,changelog,emudesk,incompatible,status,todo,xhdi}.txt
+
+	# Debug symbols usable by games-emulation/hatari (only provided with 1024k)
+	doins ${PN}-1024k-${PV}/etos1024k.sym
+}
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 545e3ca2929a..cd26d8ab9f85 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -5,4 +5,4 @@ DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST v5.15.10-zen1.patch.xz 758564 BLAKE2B 36948979a90ee57c131caa3500f669032bfb5e971a1a72a5847f5289fe8184961addab53f476ac0b8c5b271417115ad8a05ebf537dc91b9e86cb74f028faced5 SHA512 c0d11cc498fe97838e6caa5c1d9d628445729c15f2a16c089de5a50b41739925492476eb2819fad4a61db810b02cdb334f48fbcc6a2da849e7d07e1e65df6eca
-DIST v5.18.3-zen1.patch.xz 462204 BLAKE2B 4a8d2f274e2ad720fb51c116a87ab68d5e449758770293abc46a18095c40fd5a98efb1115ca6041e7b5e6a7354b9e7d23ada76a21584f3b53741a8815c148b17 SHA512 72e9f09f23042cf8fc4d2610accb01d6da8b817a541ac75c685ae95193c007b47ede60443ca71bfbe7bee240d508d151e6a43d10eba97d9b0da16b4b677a53cd
+DIST v5.18.16-zen1.patch.xz 1000796 BLAKE2B a4bc153fbae9152ed58f9f4f55a0705abc1928cdd43af2f5734ef58777258c6bb3b6dc5ea1bbff3a5831b1ab7b33e1c1684bddb7a5ebeac1c2b654ea04eebf7c SHA512 3f55a4141af5139fff783637f132515b86d3cd1366edf80f39d9e8e90e8af602425a921824b5b4f7e63931f0f547a896e05016c348485a822aed0472a463340b
diff --git a/sys-kernel/zen-sources/zen-sources-5.18.3.ebuild b/sys-kernel/zen-sources/zen-sources-5.18.16.ebuild
index 795d10246fde..795d10246fde 100644
--- a/sys-kernel/zen-sources/zen-sources-5.18.3.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.18.16.ebuild