6 files changed, 57 insertions, 9 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 83622da9433b..19f04842c35f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/dia2code/Manifest b/app-office/dia2code/Manifest
index 62022f467360..06153a90dd75 100644
--- a/app-office/dia2code/Manifest
+++ b/app-office/dia2code/Manifest
@@ -1,3 +1,4 @@
+AUX dia2code-1.0.0-fix-imports.patch 344 BLAKE2B ace6791540361f4981956d0a058d5875e41414f7f88f240341b268efea02e10ad3a59850608641faf0f02f7036988fcfd6426496a897e69bce0720910ede59ed SHA512 787447902ba5606dee0d68704b4d1e53b8e4097b9e152f3330c644226b13282ee0c110aa3fe6cbb1a7c17dad2ed02e52b18ce501305287ab97dfe6f7847c3602
 DIST dia2code-1.0.0.tar.gz 946967 BLAKE2B 48e6c29e9178032d17816726fe2b60c7a87518b898c22f0caec94b31d8cb10e50da4c093f178cad62f8c107bc55c3bbddef692e8608bbb73aed3afb156a2f2be SHA512 6669352e624fddc94aaaa36a30263ad591494d473ca09e662a9de90902e4b4a7a7eb6d3de9b28cf162c63ebeea36f86b33822d510ac87ce97c5f196c761bac85
-EBUILD dia2code-1.0.0.ebuild 679 BLAKE2B e5330f803b6456694de71723cde6164e53114de293b6e0b5f1edbd03937894872b2e5384ce403f8eba27de407e18feab02eb3d81166301b691226e73ac216fd1 SHA512 54449b0c01518112c01c3537c15d8ee407561e19cc6a6e46c0523e91af926682e422900da038970f1153caaa8952570bfe0bedf28f45891bf816e7a024a1fc34
+EBUILD dia2code-1.0.0-r1.ebuild 708 BLAKE2B f6551a3d3f3a598dd70aa5fcafeed3cdc9fbccf61bc15662fb1412487b5190b7bedf523d5e9fc75fa25b8d42ce311ba071363ab0381f443f84ffaa8bd7d7e61c SHA512 0ad345b2dace350e122d1d5223fc8f4bdf612c31b8b0e52cbe7548ff46cc5e3abe857a516a03b93b019569ae09bbcc81ac525a784b1ab279302a81b8b4e4b6af
 MISC metadata.xml 332 BLAKE2B a61fd65558391c808252c9503105c26019cdbff7ef885e1775ea671ce4001667416c7ba01b543634ff6b0202fbd0607b45cca8bea2bbbf1da83e331a6795640d SHA512 e6c1fcfdc5c6691e262853909e409821eaf839dbf7ca76b6df2b34d35403774d6af330cf267056525136104eb25cf2bbec855d032772dcf3bb0fce6b8947de9d
diff --git a/app-office/dia2code/dia2code-1.0.0.ebuild b/app-office/dia2code/dia2code-1.0.0-r1.ebuild
index be9dbe3f8d5d..58e26fc2f4bd 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"
@@ -10,20 +11,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 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 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++
diff --git a/app-office/worklog-assistant-bin/Manifest b/app-office/worklog-assistant-bin/Manifest
index 7f8ec62a55cb..006c7e5deda4 100644
--- a/app-office/worklog-assistant-bin/Manifest
+++ b/app-office/worklog-assistant-bin/Manifest
@@ -1,4 +1,6 @@
 AUX worklog-assistant-bin-2.1.3580-fix-desktop.patch 554 BLAKE2B cdbd1525257e8f54ef1fbc1d03d2779155bcaabf6ca6da9741d741da6622b3be171ae1afc56be07ffca74468233b914ca1a032a8cdcaa828052b4b0eb161ca1c SHA512 0fc20285b4ad932762b44d19c9db08d7150f79c136f74d6ff9add6f7f510489f3b56f7637ca5c2b2fb44e6572ff2e117ab84ad39f83edeecaf7774197b502371
 DIST worklog-assistant-v2_2.1.3580_amd64.deb 31434440 BLAKE2B 44a85e3cefa652fac6d01d2b3dc0e1a32128d8c7e27b6177d2c3187b97011cf5cce7493d67e9f989e034f26bd88589e3d9960232a5da2dbadf909c26bede2ce9 SHA512 cac38acfd7e00a57f6869d1205920a27f5e6cc0525b09cc7b76350df38d5b6dd673779df22fdf55e8e327cb591a1c4738fe23645a6e42b6d2753af2eb330a646
+DIST worklog-assistant-v2_2.3.3900_amd64.deb 38333978 BLAKE2B 5e12d4ddaf6354e817959752fddf6b9409a47c3dd32de4c8e946ab9dc3c2d44333f43de77fe575300520070d65f6e22bb1f521eda22d3b572585758b92f1c4c9 SHA512 94b2c16e6e802fbe240f58f115626018e3d63feed8704fd6769d21657b6bf98387f325d4986ed4b096e7ca11d9c55b8dd6a471ccc57e68fd2c60bbca16a10ebb
 EBUILD worklog-assistant-bin-2.1.3580.ebuild 722 BLAKE2B f8213a08a24669448e8e08799deddcbf120fb8a0504b94383c12b7b3fc24b547f6e9030bc724aa3961e6a0ccd0ed295b58a44a3f06f5310e3e11be9abbe4976c SHA512 9dc7745e69dda6c52ad630a9503b43f9c5b0e1a9ae822e2c4182181da1aa217915b7fe720b8194217ae3189c86d6a4f2faf43635db138a4fd8444c1038d5cc8e
+EBUILD worklog-assistant-bin-2.3.3900.ebuild 638 BLAKE2B e3e86d21b81c30bbc9bab978de654cbbcaff98c1c5af44fc55f35efe04bc753bfcc1a9c45a4ae7614f0e3ee1cf3450abd7ccec80e8eebf11c56d02adcc98cecf SHA512 c46a7d8f4b91575de6153e21eab53636ce8e82ee4cb26526830cb24374c9b5e6547d8488fe1573364654331b2aeeed3762d0e883aa10690d6c9df37540d6da98
 MISC metadata.xml 399 BLAKE2B e6fa10afcb35bbcf9ffaa7998a22227159b37fd5701da2097a3f70085c2dcb2cc3c7cb3ea454b298141382c27e33bd385d6881ea4b70f6cdf76bb2377d968d7e SHA512 8ebce62b9f656263d0553f0a4c0de9ad62a0fa3f67f0f1497c89233a78565d0e6a09c09942a716459707fb335ac86c49e46bdb3e86d5279e9518c20c17445d8b
diff --git a/app-office/worklog-assistant-bin/worklog-assistant-bin-2.3.3900.ebuild b/app-office/worklog-assistant-bin/worklog-assistant-bin-2.3.3900.ebuild
new file mode 100644
index 000000000000..1d0c08bba197
--- /dev/null
+++ b/app-office/worklog-assistant-bin/worklog-assistant-bin-2.3.3900.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Hassle-free time tracking for JIRA self-hosted and OnDemand"
+HOMEPAGE="https://worklogassistant.com"
+SRC_URI="https://worklogassistant.com/downloads/${PN%-bin}-v2_${PV}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="worklog-assistant"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="fetch bindist strip"
+
+QA_PREBUILT="opt/Worklog Assistant/*"
+
+src_prepare() {
+	default
+
+	rm -r etc/ || die
+}
+
+src_install() {
+	mv * "${ED}" || die
+
+	dosym -r "/opt/Worklog Assistant/bin/Worklog Assistant" /opt/bin/WorklogAssistant
+}