Merge updates from master

app-admin/terraform/Manifest

@@ -2,3 +2,5 @@ DIST terraform-1.11.2-deps.tar.xz 100391620 BLAKE2B 378b82e1820aa33cbd14c30d2cb1
 DIST terraform-1.11.2.tar.gz 7275162 BLAKE2B ff8b871b7f2da75d7ea8f43affe8c373c82b63ed06b809d5b0833ba3537eec91dcb4322be69aafdb45c824b60212659064a04bcfdc30a0e385dc509e54b4cc9d SHA512 c0ed60d5c75a7c8fd0a5f55ee9c020754a4304d0d651a106fcaeb8103535e92e18cea5af0ae7178a42051d3fcde4d4224a470b1ed84f4040943c13a832fbafdf
 DIST terraform-1.12.1-deps.tar.xz 111475580 BLAKE2B a31af53fa6de4ed3e65902e2b9229bd0145c1e8921d78d531778fcbd88a7ce5536835e47b7b75de4cde35d7581ce64bb032f2a17325215c06edc4b848749c54f SHA512 862b787ebcb9257c25e960b4367087e8c7d800766789c296971b0ed217094f7ea0066a135250469a729d320bd75daa5a7b465f6f487cb8c2da334f07517c7d49
 DIST terraform-1.12.1.tar.gz 7845520 BLAKE2B dadfc5fd04222d9ed25c7b2f728494c1f1a34928e5c840f938960a59f32138c637d1ea05f3664ff72da1d91e457f859a686bb42308cd349191aab72aa46276e9 SHA512 7e288d8fcb06ad858243bfa7bc1435f347a0aaae1e972be1de341266fb707329c369a496d8930b6e47287740e8048d2583c0679074402cac64e83fbe42ff1224
+DIST terraform-1.13.4-vendor.tar.xz 9180836 BLAKE2B 9ced09535ac0033725d626f669e7f8ebbf3b721aa607dbab14c0e9d031d7e25275f3ab5019f8802450adeb10212230f76e5f1206f20d7907860c5aa322ced839 SHA512 e274bf776a61fa447f567a269c84b4259e8933e6369f5d0fad1b889583b89e8e4d5733eeb7fce0b4c506188cac3491d334e2394ffa181da745a7110ed15f4085
+DIST terraform-1.13.4.tar.gz 5556057 BLAKE2B ef0e8d819a9121906ec3e936aa5a655466f9f4994a0f821a5a04e5260f4d2c0bf0be7ea6ad29206899e20063455640dc7252d173fb83925bd2df712594068f21 SHA512 91dad20e7a3380804bbb5a4d571f2543d7483cea91c837bc7aca17196f05bacaac5e1c49c3c94f1c8edf6dce3fad2662493d5b95dd8a5f7a86666c7501d7a309

app-admin/terraform/terraform-1.13.4.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 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://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-vendor.tar.xz"
+
+LICENSE="BUSL-1.1"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	local -x CGO_ENABLED=0
+	local go_ldflags=(
+		-X github.com/hashicorp/terraform/version.dev=no
+	)
+	ego build -mod=vendor -ldflags "${go_ldflags[*]}" -o bin/${PN} .
+}
+
+src_install() {
+	dobin bin/${PN}
+	einstalldocs
+
+	newbashcomp - "${PN}" <<- EOF
+		complete -C '/usr/bin/${PN}' ${PN}
+	EOF
+}

dev-java/xmlunit-core/xmlunit-core-2.11.0.ebuild

@@ -40,6 +40,6 @@ JAVA_TEST_GENTOO_CLASSPATH="asm byte-buddy hamcrest jaxb-runtime-2 junit-4 mocki
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
-	mv ${WORKDIR}/test-resources-${TEST}/* ../test-resources || die
+	mv "${WORKDIR}/test-resources-${TEST}"/* ../test-resources || die
 	java-pkg-simple_src_test
 }

profiles/package.mask

@@ -231,11 +231,6 @@ net-misc/grive
 # Bugs #952796, #957240. Removal on 2025-10-29.
 sys-auth/google-authenticator-wrappers
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2025-09-30)
-# Unmaintained in ::gentoo, EAPI-7 based, almost no one else is left
-# packaging this. Removal on 2025-10-29.
-sys-fs/reiserfs-defrag
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2025-09-30)
 # Unmaintained in ::gentoo, EAPI-7 based, broken by CMake 4.
 # If you want to keep it, maintain it.

sys-fs/reiserfs-defrag/files/reiserfs-defrag-0.2.2-cmake4-compat.patch

@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,6 @@
++cmake_minimum_required (VERSION 2.6...4.1)
++
+ project (reiserfs-defrag)
+ 
+-cmake_minimum_required (VERSION 2.6)
+-
+ add_executable (reiserfs-defrag
+ 	defrag.cpp
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -1,6 +1,6 @@
++cmake_minimum_required (VERSION 2.6...4.1)
++
+ project (reiserfs-toys)
+ 
+-cmake_minimum_required (VERSION 2.6)
+-
+ add_library (mrfsu STATIC
+ 	../reiserfs.cpp

sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -15,6 +15,8 @@ KEYWORDS="~amd64"
 
 DOCS=( ChangeLog README.md )
 
+PATCHES=( "${FILESDIR}/${P}-cmake4-compat.patch" )
+
 pkg_postinst() {
 	ewarn "Defragmentation should be done OFFLINE only! You MUST unmount your reiserfs partition before starting ${PN}"
 }