From a69218670e793a50d3c7a32901f1cde97c108ffe Mon Sep 17 00:00:00 2001
From: Arthur Zamarin <arthurzam@gentoo.org>
Date: Fri, 19 Apr 2024 23:24:35 +0300
Subject: app-office/dia2code: fix compile, RDEPEND, EAPI=8

- fix unknown uint8_t
- fix RDEPEND wrong assign
- EAPI=8
- small refactor

Closes: https://bugs.gentoo.org/895298
Closes: https://bugs.gentoo.org/886083
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---
 app-office/dia2code/dia2code-1.0.0-r1.ebuild       | 36 ++++++++++++++++++++++
 app-office/dia2code/dia2code-1.0.0.ebuild          | 33 --------------------
 .../files/dia2code-1.0.0-fix-imports.patch         | 12 ++++++++
 3 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 app-office/dia2code/dia2code-1.0.0-r1.ebuild
 delete mode 100644 app-office/dia2code/dia2code-1.0.0.ebuild
 create mode 100644 app-office/dia2code/files/dia2code-1.0.0-fix-imports.patch

(limited to 'app-office')

diff --git a/app-office/dia2code/dia2code-1.0.0-r1.ebuild b/app-office/dia2code/dia2code-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..62f52319e79f
--- /dev/null
+++ b/app-office/dia2code/dia2code-1.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
+HOMEPAGE="http://dia2code.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+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
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	doman docs/dia2code.1
+}
diff --git a/app-office/dia2code/dia2code-1.0.0.ebuild b/app-office/dia2code/dia2code-1.0.0.ebuild
deleted file mode 100644
index be9dbe3f8d5d..000000000000
--- a/app-office/dia2code/dia2code-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
-HOMEPAGE="http://dia2code.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-DEPEND="
-	dev-libs/libxml2
-	test? ( app-shells/bash )
-"
-
-src_prepare() {
-	# Script makes use of arrays
-	sed -e 's:/bin/sh:/bin/bash:' \
-		-i tests/tests.sh || die
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	doman docs/dia2code.1
-}
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 000000000000..e12d38806b6d
--- /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++
-- 
cgit v1.2.3-65-gdbad