diff --git a/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild b/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild
index 5e514431b7f59..b711dbbe24efa 100644
--- a/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit edo
 
@@ -31,20 +31,19 @@ BDEPEND="
 	doc? ( app-text/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.8-gcc15-cstdint.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-gcc15-cstdint.patch )
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		$(use_with doc docs)
 		$(use_enable test)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 7c00fac7a6252..5639e33a3ea5e 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit edo
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
@@ -33,14 +33,15 @@ BDEPEND="
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		$(use_with doc docs)
 		$(use_enable test)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {