diff --git a/app-office/dia2code/dia2code-1.0.0.ebuild b/app-office/dia2code/dia2code-1.0.0-r1.ebuild
similarity index 72%
rename from app-office/dia2code/dia2code-1.0.0.ebuild
rename to app-office/dia2code/dia2code-1.0.0-r1.ebuild
index be9dbe3f8d5d7..62f52319e79fc 100644
--- a/app-office/dia2code/dia2code-1.0.0.ebuild
+++ b/app-office/dia2code/dia2code-1.0.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit gnome2
 
 DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
@@ -14,16 +15,18 @@ KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-DEPEND="
-	dev-libs/libxml2
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
 	test? ( app-shells/bash )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-imports.patch
+)
+
 src_prepare() {
 	# Script makes use of arrays
-	sed -e 's:/bin/sh:/bin/bash:' \
-		-i tests/tests.sh || die
+	sed -e 's:/bin/sh:/bin/bash:' -i tests/tests.sh || die
 	gnome2_src_prepare
 }
 
diff --git a/app-office/dia2code/files/dia2code-1.0.0-fix-imports.patch b/app-office/dia2code/files/dia2code-1.0.0-fix-imports.patch
new file mode 100644
index 0000000000000..e12d38806b6d5
--- /dev/null
+++ b/app-office/dia2code/files/dia2code-1.0.0-fix-imports.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/895298
+
+--- a/src/decls.hpp
++++ b/src/decls.hpp
+@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include "config.h"
+
+ #include "umlPackage.hpp"
++#include <cinttypes>
+
+ /* Package processing auxiliary structure:
+    "Declarations" are UML packages (which map to IDL module or C++