8 files changed, 148 insertions, 513 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c4aaf06e1b54..612c77628533 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 9004c36e230d..c3b17a4df8b4 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,11 @@
 DIST aws-cli-1.30.6.gh.tar.gz 2596217 BLAKE2B 3b4cbd540ede2826d212233e76a4431f090fdaa1848f3ddd5e52c3d637e8ccb6ed406072b5b4b3f62b67a29a995d984bfcf1f961915594459e52199dba2341b8 SHA512 8273d234428eb42e8845052c4122e06bb6d0693d2878296a101fa3ce72c5690787c6151aa8f819db83fe36f5263d14efd1e4b469494da8994d47d1f213c394b3
 DIST aws-cli-1.31.11.gh.tar.gz 2605881 BLAKE2B 816846d5dd50a382b837cb25e01be330cb345b55819907ddc8bd3a6623752322d5eb79526a42addb85e9b4dedbf86cee0f064f8ae87d9bd2b3ee996751f37265 SHA512 8147f2c39618317755903a49b02cbfacdc514fd76df31fd354526a684c8da97753d7e2429ca9d46f035fc12263cdec847078f7461dd1ed7948d6614d6408debb
 DIST aws-cli-1.31.12.gh.tar.gz 2606087 BLAKE2B f36825a15265ed7a260b42251dc6ed9b6a414fa1c27a6209395cc195fc1b30f0df3dec3c58deb9a9a003e3c6fa6cde5bd9b28b3f89e03d9adef1852dbc0bf49b SHA512 ef6de63c6540a4ac87280f5d557096a827939db5de258b62cd8b8fed5740e3c866e250c402ab6bd41bfc369891945605c79f5799be76e1166e0fa2495e129da5
+DIST aws-cli-1.31.13.gh.tar.gz 2606313 BLAKE2B fb2df38db566d07a44eeca9793cd043e58ef773a09122b69a084498ac3eb55ec65177c55d287a48f1739e743b3b642504b9fc87a8b8537fc870844b9a00fe838 SHA512 dde6e3494d841906a3670577f8619742d5957afca53db58cab31a90962ccf368d28aa04f7c3d39ff91be3c96ac6e13a4f399758c2cb73516221c9fdcf70b8d49
 DIST aws-cli-1.31.6.gh.tar.gz 2605365 BLAKE2B 30e7789a2a4f47b3b4dce9fb3c8083d56ebec8501d66fa03e34309c1c9e0c6302ce79c044fb1aecd879f2784443db5a9927bfb1c22e94883709600f0e1c538b4 SHA512 5da1be164d4e52b255093c0685b4add43a21b2f0259a6ad9b6e6bc1c7bbb17e1ee0db0f6b29ff0227b301d7f66e1d63b3d92047ccef5578b9de6b5579319be6c
 EBUILD awscli-1.30.6.ebuild 2744 BLAKE2B 210da13d12323d2293af81522241b228d94d9368227f37a05a1d6e3c83ac41738cbc7016b1f11df65cf6b094fbb92d0cca8ab856d6ad6915ac7819a01e25ce77 SHA512 30c717703a5123e908eac6d782bbe1ee68baf546917feddd0f7d827fedd1583b4ca1b47303669eb53f7517fb39efc8261d3c947be0bb363e5b0f37d72e33a9a4
 EBUILD awscli-1.31.11.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
 EBUILD awscli-1.31.12.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
+EBUILD awscli-1.31.13.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
 EBUILD awscli-1.31.6.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.31.13.ebuild b/app-admin/awscli/awscli-1.31.13.ebuild
new file mode 100644
index 000000000000..18db68f93233
--- /dev/null
+++ b/app-admin/awscli/awscli-1.31.13.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.8.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 792f85ace722..d6bfc268e15c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -6,16 +6,13 @@ AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
-DIST rsyslog-8.2304.0.tar.gz 3274047 BLAKE2B 13c0e200acf750e9b40b14153270b0f45358ac8be7a9d0e1fa879e686da9f5a3be3b7915e3c90757a42dbdfbf4c36301cfea213aafe5a0481e1b117f28cf3cf6 SHA512 ca8df2d1d38c78d853b1081c731d9f94cad653a915259b699f3a78a88bcf9c9d1d18b91667ef954fc96a0bd251aa3afd2b6264ce5a6b4ca700687a654507b64f
-DIST rsyslog-8.2306.0.tar.gz 3293380 BLAKE2B cb9ae3fa9f5c8c71491346323b7549d5997b116ec3141296e25871cb8be75f372d1de8b315a6a37e42dd649782790685b30705d1f91151d5561249da508e961d SHA512 4012ea18d49efa75438aa225fec1daafcaadc216cd5c0ecceccdc34688940bbdca9eb19bd9c401e834b023d9b9a5a0870529f7b855bb64c796a55538639dadfc
 DIST rsyslog-8.2308.0.tar.gz 3346424 BLAKE2B fc55323ab9f7e88cc84f32f95531a8cad87aad22bbb7a23303033bb841c8badc4053a8a9fc302611aeb4288efc148708affa7d873e41b07521cbece7e3ccfc45 SHA512 f8bcbbfe2c5c0a7e56203fc4ff285594cfa27fa7c998db2fe065a3f06b9bc30692626787c509b1f5d081a4b176680183b651625c5e3ccb4580ac59f3980ae8a5
 DIST rsyslog-8.2310.0.tar.gz 3349174 BLAKE2B df451f473fdf1714d2ff2bf92afe5e53d00395eb21508fd00c628784fa577aaf6fed597f79c99e64f62bd3a5eadde0748ce08e6c082a24a507fa687055599d70 SHA512 f04e14ede8c35e1799eadc711a6e99dbe56d312c7909c7ebed4d4bd489d310a44a5c2d3ed23968fbf3ccff5b580870d0f3ceeb690deb1d1424420fc9d3220696
-DIST rsyslog-doc-8.2304.0.tar.gz 6586061 BLAKE2B 4680db37eaa8583e21865fafb62ba07ffa235f4184a43bf9a1930166aa26a3bccdc15c43ba26504d157339eb02b05ea95076cf738abc3323eef16e07b42de2af SHA512 1ce8a8cf40cb767e4e62016aa2513f93535a3bd3c47ef34bc1efca007f7afe5c84ca4d30e911903dc8ba529ede0a07feb05ace075b5ef6c1757e5727d11f112e
-DIST rsyslog-doc-8.2306.0.tar.gz 6637017 BLAKE2B 7b4157bbfcdba6c7ac824ef4369bb2141a33989d4e3d1a95ca6b347f3d3eaa98266f7b7a684a8aa0342a8a38f87d7ae144444f888133619e82fb4802ef12d314 SHA512 eb5df4285ed9f5afe884dae497ed77ad96050a9101e94c8d83125c893998094e27d4fad7b7a42391d72cfdc1bf2aeb9fac8f65d61d8aa5c49dda9d0cac81d777
+DIST rsyslog-8.2312.0.tar.gz 3358109 BLAKE2B 8b463c07a44efa60b6faeaa466498a2540eefc158efa759479cc6fc36acb04a718dd6ee4015f311343e6b66b6e074d5ed40db29cbcad6c71b42286a58cb92d7c SHA512 a65ca1c6fe2d9dd853d073d93cfd4d007c3533bd10c633113fcf94c4746192945ed0a2b2ff84f9174b55de90ade2a062a0bd556ffe375864fad3772ef8ce39e3
 DIST rsyslog-doc-8.2308.0.tar.gz 6668327 BLAKE2B ca82fa7b69b19ba03fd30adbdf2bdc37eb7f11c714ec7f79d4cfb352fcdf42aae4cf146a6911ec26212de64057ac23416bb2ca27e8001cbe9f9945fd7c7a931e SHA512 f0a581e2a7642d100cdca94125c39cf00acfc3339114ddad067d726f1526941f52ab33c0f5789f9cbd4197b3e1f3c841da86c71886fa97306990193db8d6c935
 DIST rsyslog-doc-8.2310.0.tar.gz 6674428 BLAKE2B e951d564a63c57c1d9d130a315c4bc9f4c25c9cfaf83bece1bbda582eb40260f000c7d9805faca550d8df7b0f6074aff6cc86ff877706cad69909040c3dff5b1 SHA512 cf452f3705680fc81495e940ea7d5ae705a6dbfe0e2ce5a87865c3043f79daaec243df20e8aadd9fac6144a3df8f19d7c56fdf19ec68df78e2fdaffa45096143
-EBUILD rsyslog-8.2304.0.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
-EBUILD rsyslog-8.2306.0.ebuild 13411 BLAKE2B faa038d4e8aea22efbc79a226f8ae7e4a7691971db9e28faed0f9e0fc358505e6e24465b5bb174af6e0112bac9bbcb23fcf8cc3c241c78b9606b9320ea306280 SHA512 71252b5d282a5e99df7159e5da266edd3231e4cfcc486aabb4ee7a58710d43af023eeb6f74081792813f2b5ae5e5100fa8f3112fb03e3fca2b1b4fd6970d36b2
+DIST rsyslog-doc-8.2312.0.tar.gz 6621561 BLAKE2B 2aca14d24606e3a125259cad5fa43af61da2b70ba0b1916e5496f3d4eb6a28b612287bb83c3fa610f0f367deedcec4f0b3e93a552643194fdcf552dff3d408b6 SHA512 2fe8ab0e37a6899a545c09ea2586c33ab89a3e3d93ff079f99b15e9b1743423bbe54931684ba8509ed4f578a4b55ea22f6306aca256ee2245f88115a5f44e400
 EBUILD rsyslog-8.2308.0.ebuild 13412 BLAKE2B d81c8bf295a501fe6684727115bc87d3ff382bc86bf4f2dce29cc73ba8b98e548cd69427f096cc2837cbfe9fcb735cf3eac4f81f5b891a22b1306e5996e89d5c SHA512 613bef716c3565a457644b62c5f81e9aa1fb0f9cabcb2f00f0dcb959096db5ecfd3d75f774b92ba56a3ab1035b43b9da15acac467726d113a75d68af493c5839
 EBUILD rsyslog-8.2310.0.ebuild 13411 BLAKE2B faa038d4e8aea22efbc79a226f8ae7e4a7691971db9e28faed0f9e0fc358505e6e24465b5bb174af6e0112bac9bbcb23fcf8cc3c241c78b9606b9320ea306280 SHA512 71252b5d282a5e99df7159e5da266edd3231e4cfcc486aabb4ee7a58710d43af023eeb6f74081792813f2b5ae5e5100fa8f3112fb03e3fca2b1b4fd6970d36b2
+EBUILD rsyslog-8.2312.0.ebuild 13429 BLAKE2B c436e80fd721eb107637de9f4a58ee7f9d13ad4bdfaae5ef8399db6d2cede7f31ba8bf3c5d97d8d27569d474a3c71beb3c0476815523df10cfcbfa1ad4de51ff SHA512 ee82f56bd1946beb5a92c5eb1c599ef024ed3a2533743099212944c70f38631f95c949e9c0df57598f17c51825d5b17709bf8dc4df3dc079d9beac482f653bab
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2304.0.ebuild b/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
deleted file mode 100644
index ad15bf7f10b5..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
+++ /dev/null
@@ -1,496 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? (
-		dev-libs/apr-util
-		www-servers/civetweb
-		virtual/libcrypt:=
-	)
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads(+)]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imdocker
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2306.0.ebuild b/app-admin/rsyslog/rsyslog-8.2312.0.ebuild
index 8f43ae9ef921..21b249d85e28 100644
--- a/app-admin/rsyslog/rsyslog-8.2306.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2312.0.ebuild
@@ -3,26 +3,25 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools linux-info python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
 	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
-
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -107,7 +106,7 @@ DEPEND="
 	elibc_musl? ( sys-libs/queue-standalone )
 "
 
-if [[ ${PV} == "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
 	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
 	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
 	BDEPEND+=" >=sys-devel/bison-2.4.3"
@@ -117,26 +116,27 @@ fi
 CONFIG_CHECK="~INOTIFY_USER"
 WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
 
-PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch )
+PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" )
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
+	if [[ "${PV}" == "9999" ]]; then
 		git-r3_fetch
 		git-r3_checkout
 	else
-		unpack ${P}.tar.gz
+		unpack "${P}.tar.gz"
 	fi
 
 	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
+		if [[ "${PV}" == "9999" ]]; then
 			local _EGIT_BRANCH=
 			if [[ -n "${EGIT_BRANCH}" ]]; then
 				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
+				_EGIT_BRANCH="${EGIT_BRANCH}"
+
 				unset EGIT_BRANCH
 			fi
 
@@ -151,6 +151,7 @@ src_unpack() {
 			cd "${S}" || die "Cannot change dir into '${S}'"
 			mkdir docs || die "Failed to create docs directory"
 			cd docs || die "Failed to change dir into '${S}/docs'"
+
 			unpack ${PN}-doc-${PV}.tar.gz
 		fi
 	fi
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 9fc5e2a0367a..b67ca05107a2 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -10,10 +10,13 @@ DIST terraform-1.5.3-deps.tar.xz 296990652 BLAKE2B f48fbc5a0253c4f2b8d26a80a4189
 DIST terraform-1.5.3.tar.gz 5396543 BLAKE2B b21168d14d8000f8f2e2c8d05de157225f282e870b7ff64ce45f86c54ef9ed77d03130ccd20f965b79e5ac2d1859d296b015a02a946adbd8a3e6530ed42bf576 SHA512 b8f9a007099642cbf244c0d85008f708ba927a2c446996595e2aa3410f9a9b7b389ed5abad6fbfea029fadfc40f830a263ed8366761d30130f94b33a3c67136b
 DIST terraform-1.5.6-deps.tar.xz 297014652 BLAKE2B a72feedbb77ac95781a537c76ef5d1a8518e224ce6669c66af374cd5264eff77a85db321cf353c52ececbf0fee2ade0feae43507bbf7bb7226ae83ae393c38f4 SHA512 0af82d5f3dba2c813caf345bfc5b85e36d98317d4e15eb58f22f50ce8f3bef2b5ee21349cc164b4855cd2585b3b57886ae09e0f8049068c09612f36a99e728bf
 DIST terraform-1.5.6.tar.gz 5397969 BLAKE2B 009c03cd142346b070e13db604430b81500ed2ce913644ccf34ed3dbdaaf54dc94d2ac5a409a6f0ca0459db9b18a51d11894dc5dd074467a69c4428673ef3d03 SHA512 7df24a05715d6989663fb1b2ecb8da7dfcb5cae991667ff1a34ed4196146d644818b5af31421d001deb8fcd5fcc920b174dc76a78edbb1092f6eaa645fbc1446
+DIST terraform-1.6.5-deps.tar.xz 334283548 BLAKE2B 6222db5b66d9a49a7dba4806a1f5a07e0c7a871077bf960f556bcb55661957e41f4688babdd0f826a1a5b837520f98387de218fb8c90b7a902dda0f05566536d SHA512 dbbc303282ac918441a4018ceed6c6c448137f126a9125c322514a3336f27d6c312060c39d0d60a132caad2540be5bc274d7b30206b1df72af3e795bb140aab8
+DIST terraform-1.6.5.tar.gz 5635461 BLAKE2B afa99bf8e9787a4498e9868ceb91921e6be7bdd5d7ef60378a9173e9765f689fb4c6e8888ce5405c00a6fe855e22dc91fc46e911be8bbc1f0665d9f11bed1ebf SHA512 588b00bc86905021d5efb41ba62306c2a41c9cd2225fb1aeb956a7845be15d6aa3c7d0365e3b779ea7da415a562094ba091e6a4644add72ba3abe169f3a7d36a
 EBUILD terraform-1.3.9.ebuild 882 BLAKE2B 17c22385917c18bc6f8cd4937999cc285409b6748623cc59564865c45ee9ba94bfd128522ec4bec548078365c28b1f996410d5891fdd8361ae8910e595961e1f SHA512 8b7034c259240de694d1e2ceb59f9ba7eb513782db6fe94a28559e3bb5314e0922a5fba80a5a5d1f5e34fe0ce9d3e486d7435e75029049b967d834b21b18405e
 EBUILD terraform-1.4.6.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
 EBUILD terraform-1.5.0.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
 EBUILD terraform-1.5.1.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
 EBUILD terraform-1.5.3.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
 EBUILD terraform-1.5.6.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
+EBUILD terraform-1.6.5.ebuild 855 BLAKE2B 06bb17eee24ca12b7bcd97116b76a6a4ed6fb788852cb4db3ef6e9a73c0f03ae47d751d547f1b681ae5690be9611d342a286ea906cec2eea46e39b3598400cfc SHA512 3d82b9724520e92ffabc4f21e2ce22efda080e3896505ed27bcb69d35079cf89883657f5c697fecdf2ac38fb6a3b44f540c870a4b503e2c3aaaa14b508a32f4e
 MISC metadata.xml 1076 BLAKE2B 85b510c328c94106cb16527407d4694f6acc80d5aaa7ed677efc438be3522e52befc910b5b8805d2d1705bf1b0b220ed631e40bdbb1297779e96917158977f1a SHA512 06a6e462631d6ae026a127ea4c3f1cba4d84651d03011e08fa028adf2fbcb7dfbcd003d132d4a0ae58b7addafa5588270c3155d0cc400a3730628bd8bd716d95
diff --git a/app-admin/terraform/terraform-1.6.5.ebuild b/app-admin/terraform/terraform-1.6.5.ebuild
new file mode 100644
index 000000000000..fff5c2bc7b23
--- /dev/null
+++ b/app-admin/terraform/terraform-1.6.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="BUSL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+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/terraform \
+		-verbose \
+		. || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}