8 files changed, 101 insertions, 2 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 28e2d60549a7..b6fa32fbadcf 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest
index c817bb39749c..25a82edc10de 100644
--- a/app-admin/mkosi/Manifest
+++ b/app-admin/mkosi/Manifest
@@ -2,8 +2,10 @@ DIST mkosi-15.1.tar.gz 120606 BLAKE2B 36171c08c18dd3ba3c2e54c8a3374fad2a9b008f82
 DIST mkosi-17.1.tar.gz 133505 BLAKE2B 96824568dd53cd83a1f8b95072c750e1a0bbd06356df19c62ea9799a5d8f1b2e55f108a3ec3cf171f5dfdefcc1ac5bc86785a60d80def38a5e1817b91f1d9486 SHA512 59988a6a81c0456df6fa9673032d1e25c5cc382b45fd0299c974559d573279c4c38f5600b4e14a71ecdaa013d9b97b90cc815b3b601a7dd061924519cd8b76bf
 DIST mkosi-19.tar.gz 163864 BLAKE2B c97a0a2139c036b727d0cdd6686a7fa5393f62357d87b988f0a1a473367eb552de1ed6f82c1ca99c697ef72acb2fdf6aef7981bfa8dd5c6230b82ba84cbcfb7e SHA512 8eb4e4af823299fdd6e9a077ec27be029656974ba0414b08ef226b5ccf7cd0a92d8bef4e475cdf05b86c3a0027c43be0f895af56a87df22502d2904cb0246ef4
 DIST mkosi-20.1.tar.gz 195875 BLAKE2B 55a508849ef5c1ef60681635e8e4d396587c11d735c23ba8f1b3367c30d8cf8a9cc479959ec2c43d1697fe9d34da281b574a6cf11c786e6c7926e60537aab5d2 SHA512 5d5631bb062fc11593c450a9f5e4ece51a87daf37948b24410d6fdf8bf9e9366b7510c3512ba55ec72b280e8c92b2b36bf7d7f30e9357f7427cd9126fcec566f
+DIST mkosi-20.2.tar.gz 198966 BLAKE2B 1ab2332427d205871adea24ddd50c41e716801dd320f17167dc2e990d449084d59fc58efb20de01a80d438ce85b900f9752f9acc2372a5d5e8ccead0d371b9ed SHA512 62095d81f21d18a1b7f25c73ea2989f9f5b8fe1e335185b3ce6774af2739df9124ca8f5860514a8f570d565ffbf07edf3abc53a0622059127f5c35ed23bd8f65
 EBUILD mkosi-15.1.ebuild 812 BLAKE2B fefc2c83f3d08049c09662b065768b0cb425593710e10a5a0bdd8cafa63f542481c4ea9d9b290036276ca3f0bc9ff9326dc5d11cc576ecac9729558f293fc641 SHA512 c1b6fadb5fd335d3b8525034dc5f417cb86cadbb9421d25961765f6ab9e922b18b9f851bf41b38cb3bad4cfd1069a2f880cecc63acc1b37f5ac2df4f527f3478
 EBUILD mkosi-17.1-r1.ebuild 818 BLAKE2B 54acb5f1829076770e02c46232bd80bd6a8f9d9d8ca22aec06018282a613eb2c643b029c4abe1a1d8748efbe52704ed5136c0b2129717caed540966456b02a4b SHA512 cfa1835e40a9fce04c251cb043c1f1a5ff1bc201b9266b7ca116df9d812c14c18d9286dcea01484f875670184afbecbf2384000d307a2ef810b0fea1861d6355
 EBUILD mkosi-19.ebuild 818 BLAKE2B 54acb5f1829076770e02c46232bd80bd6a8f9d9d8ca22aec06018282a613eb2c643b029c4abe1a1d8748efbe52704ed5136c0b2129717caed540966456b02a4b SHA512 cfa1835e40a9fce04c251cb043c1f1a5ff1bc201b9266b7ca116df9d812c14c18d9286dcea01484f875670184afbecbf2384000d307a2ef810b0fea1861d6355
 EBUILD mkosi-20.1.ebuild 818 BLAKE2B 424c0405820593ab1ee070d79a2db81cee873b6402be29a98cd9eae188ad4cc8822c1232865901bb81589af4f3a469842de2295a0278ef3c77fa2873de11f4d4 SHA512 5de096f5f6239d81c58106bae35937d7f2d543b1327bd1a931bad7bae8a8d0dd53e08ea9f8720123bad1baf04e3eb09f327b597d7016fbbdc0dda9d62ff5e51e
+EBUILD mkosi-20.2.ebuild 818 BLAKE2B 424c0405820593ab1ee070d79a2db81cee873b6402be29a98cd9eae188ad4cc8822c1232865901bb81589af4f3a469842de2295a0278ef3c77fa2873de11f4d4 SHA512 5de096f5f6239d81c58106bae35937d7f2d543b1327bd1a931bad7bae8a8d0dd53e08ea9f8720123bad1baf04e3eb09f327b597d7016fbbdc0dda9d62ff5e51e
 MISC metadata.xml 479 BLAKE2B 3921ab722bcee7cc126528e3b204251ef5fddb5abb333ef3317e8e5fb0a596eced1619ce8bb3670aa8c78f60987d59fc7f6992dc5b14c407f2be3b16581389de SHA512 d02e7a8f4e9295ea13e9bd8a451f1b87463c7d15cb49529e348aa483350fb0553b5a4485999abd876d40a658b457b4de46d3e7561ff3b512f9c1865b1b901e35
diff --git a/app-admin/mkosi/mkosi-20.2.ebuild b/app-admin/mkosi/mkosi-20.2.ebuild
new file mode 100644
index 000000000000..1574760425a0
--- /dev/null
+++ b/app-admin/mkosi/mkosi-20.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Build Bespoke OS Images"
+HOMEPAGE="https://github.com/systemd/mkosi"
+SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+RDEPEND="
+	app-emulation/qemu
+	sys-apps/bubblewrap
+	>=sys-apps/systemd-254
+	sys-firmware/edk2-ovmf"
+BDEPEND="virtual/pandoc"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	distutils-r1_src_compile
+
+	./tools/make-man-page.sh || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman mkosi/resources/mkosi.1
+}
+
+pkg_postinst() {
+	optfeature "For debian support: " dev-util/debootstrap
+}
diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest
new file mode 100644
index 000000000000..9c7942544298
--- /dev/null
+++ b/app-admin/opentofu/Manifest
@@ -0,0 +1,4 @@
+DIST opentofu-1.6.0-deps.tar.xz 332007504 BLAKE2B 1c2a7d2350944d34308baa0566977aad914b3c4f989ba90d51cb52e3001d11e56952906b0dab7adc5cef261290b748c0567e35c66f6701d62d750e18d0acea5f SHA512 5c5644b2caef5439e50865569abec133ba57a6e6581d8f8d38500671818079b471afcd86422858475b1ca912bdb75fe0b91227012f5c597bcaabe1a215b2eb09
+DIST opentofu-1.6.0.tar.gz 3696642 BLAKE2B e224ce14f04d07638d03b9a11ab251cd820acc86774f9c82f38f5bcfc38b62bbdbc70377e722a4dd2bd65f917ba0fc200ccaaeafdbd9430af66586491c7627eb SHA512 758f4ff79e526e9494e1e98dd927dbeb803b45df1f8bc15c3a9bca8343d7285b9130bfe5f19f6ddd7fd403b72d852b0d51542c058174e4bd5eed3c729b394bdb
+EBUILD opentofu-1.6.0.ebuild 844 BLAKE2B bdfa0b0c680d11a0dc80829f2acfbbd919efd06d6f5a2fc1478455a15e1aa8d1fbf633a23f9479677449a1561a2bc56c85766f94d0561a5df211116c1a395e50 SHA512 54b6886c941cb45f8965816bc2ecd161d2efa79348adf42b3f12bc1217d13f7de47a1a09deff7836864ccf76a7ef198320e7fbe506ed7c4489c494fc20026cc9
+MISC metadata.xml 417 BLAKE2B 82486cb8f3504862ce7658f0d54141e559a952874ec92697e7bd03f7f7a1e4a3df90a20158c8be6b4bb42d9c4e9de49c27754589e909a4e32ec52950a3d169bd SHA512 2a347bf9bd1be70d9e1853ae802091fcbea299a15fe4c170aacba005e7528c3b9c784d2b34bfff015f1b531648e6fb2e73ff3fb9d158df0991b3348a91f74eb6
diff --git a/app-admin/opentofu/metadata.xml b/app-admin/opentofu/metadata.xml
new file mode 100644
index 000000000000..cbe6b0ede320
--- /dev/null
+++ b/app-admin/opentofu/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://github.com/opentofu/opentofu/blob/main/CHANGELOG.md</changelog>
+		<remote-id type="github">opentofu/opentofu</remote-id>
+		</upstream>
+</pkgmetadata>
diff --git a/app-admin/opentofu/opentofu-1.6.0.ebuild b/app-admin/opentofu/opentofu-1.6.0.ebuild
new file mode 100644
index 000000000000..544c2e0b5f16
--- /dev/null
+++ b/app-admin/opentofu/opentofu-1.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="The open source infrastructure as code tool"
+HOMEPAGE="https://www.opentofu.org/"
+SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/tofu \
+		-verbose \
+		./cmd/tofu || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    tofu -install-autocomplete"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ed4093cc8579..1b99e128ebed 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -6,6 +6,6 @@ DIST sudo-1.9.15p5.tar.gz 5306611 BLAKE2B 73ee598c2a2848d5be24f97492b13eba2f326c
 DIST sudo-1.9.15p5.tar.gz.sig 566 BLAKE2B ddd8fed1b3721aafdb32b762834168063c3f0f003ef5d83f1883615320da6fe89b08d72c8e893c8b2bf9fd892a40e47cc77d72672e43b5a24db50e7194d9bc4c SHA512 97480a3d27b546a93e997c3a1e8169904a7625ab8fa6198d0b7e1d2d040f55b2d58462cd08e5cc97c2f1c817b12343e35cdd7db207aee42785f2b95b17c600b0
 EBUILD sudo-1.9.15_p2.ebuild 7392 BLAKE2B 4ab5117908a052176c1ce192a52e0bd4d002ec048d3c450be1b27c0972dcb8f4202190f673c27e3ead2b1c3c863f771c6ed98c13aff665961f8ac96dfa29eb16 SHA512 9db7de90b298d6de961ab10921dba516ee173c7504a1411d5dc5821dec6bda5b830f8f487544a493ada7ccbdc56f6b59877bc991450c31f5346ba2ddf63fdfde
 EBUILD sudo-1.9.15_p4.ebuild 7396 BLAKE2B 462323df4ae8fe3dba4aaed720d24e62a287e7d81a209901fc20a4630a02c3318328145e105980cd21235c18d55d50a58b0ecc222cb82284a82b92f581bb3d0e SHA512 8ab4c1bbc0ea6781d9fd3634547850431234c8513eadacc48cbf6584db6081a25ebf657e5c6bb8c8ae5a032e707148d9943569b9f8b88848b375662ff9fcba9b
-EBUILD sudo-1.9.15_p5.ebuild 7395 BLAKE2B 3a59be761bf1ef2c57f5ea06324252541b15396002c52a621861a1639528fbff5d6a2097e300b2d68dc3f8b089e8824895484ecf6f56cb2124609c802f72fd00 SHA512 e947cbf9491e52271f680d95b3527f5e4dcc0cb3bc8c17721892a33439252375424d4b51c9defb998c779dd85462c565ef4497a9fbb12d498b27deae993fbb1e
+EBUILD sudo-1.9.15_p5.ebuild 7394 BLAKE2B a23669bee265e3044d54cbc69ae9da6d2f590bd863437d105ff13a62cdf2912d9854f280e1735881111d76918378b1d5903c64bcc1677bd749f285c6da5cece7 SHA512 528a11ef8dec5c860bd3e0b6ff5eba7fd6e6b7306516b73611f6eaf55df2d24510db8f6e0a34491616b4b5115324f665981bb97d12f2577461e59feb1e54b2cd
 EBUILD sudo-9999.ebuild 7400 BLAKE2B 7f3ec8f785d65f4c3e3f45419a6329b9c81dfe75c52050417367817a35b1cecfc2241e2acdbae52257e32c3c5041cabf2aba731e9c167b6a4df654942c59eabc SHA512 979aefb72bc0fd32ba9bf62e782639e2feb0742290e89585b547cc3a62ede989eb996fc1413e1aa94b8071286a36ac59bb721d6a39b6941dc3556f42d8ed503d
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.15_p5.ebuild b/app-admin/sudo/sudo-1.9.15_p5.ebuild
index 1ee0001c0740..1e24a78af96e 100644
--- a/app-admin/sudo/sudo-1.9.15_p5.ebuild
+++ b/app-admin/sudo/sudo-1.9.15_p5.ebuild
@@ -33,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		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"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"