gentoo auto-resync : 29:05:2024 - 00:07:15

17 files changed, 96 insertions, 12 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 03aea80cef8c..57529a12b3e1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 4d7b8fabeea7..86691bc6efd1 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -5,5 +5,5 @@ AUX asymptote-2.86-without-lsp.patch 1045 BLAKE2B 9e212ea9f00f5c49171679cca577b8
 DIST asymptote-2.86.src.tgz 15118426 BLAKE2B 305edae6653094a5daa9f136951cfcc3f8ece1dc8e616593710e0bace350a95f61729f8d7a9522a14704300a6cfd15decb1bb634e58dba1626f09c053b6b368b SHA512 9e11dbfca10379f07b50dcce0d63c12b793f47741651b1804cf0825e87604c40b5b94acf343ce7f5ca7da83b5ebb0e213090ada80e0b6ebe4f6cec9db67209d6
 DIST asymptote-2.89.src.tgz 15133552 BLAKE2B bde5acd3e76543b3c936e785ccf081c38687d535f336ee0e3da62f5fe078bb040dc162b64f02e94f392129c120bdf497b86e3862059abdb1b4544bab3cce3218 SHA512 a9874f0dc6eb05b95ef551611d85f39222af2a0628d7904160b08bdaf797c2b9ec6d12af7ae26dee69dbc056a5bffad4e450d4846a517d80990d89759e0c47a0
 EBUILD asymptote-2.86.ebuild 5592 BLAKE2B 87f6be832470d9ecc15727cec0af4ab6d43092b7898a38ee37bb86913410dd169b123d9e76d1fb888443f13bb47624d1523717c6f8cd6a1489bacf431306d736 SHA512 0e276807b7054ceb807a35e9e5158612a9c6f293aaac97bc4165a9e7dd3165c688f9df86fb80743b02a2f15ca8e6df5b6c006ade732e84488980fce568626c80
-EBUILD asymptote-2.89.ebuild 5549 BLAKE2B 243717d534c43198a016f434bb5456f6c75baca9e90a16ada3bb4eb0521946a1b62a54f3f09f9d2d96733731b57f0cd8366e3c168816a31ae462b394216aca98 SHA512 a8b40bae9beaaf9505026158e50cc6436c7e839c82f14e7c66b7beb03d032f55eab7bd788426ebd21ca77c6b05d16c7e1c024c6c727e5e256f49bfdb2d4dfa16
+EBUILD asymptote-2.89.ebuild 5547 BLAKE2B 1ebd17a78dd79edb0eac18b054f7fe786227ccee3eefc1f397b759d698cf400e8a19ab2cebee15cd21edd299c26027ca39f6fb707db3e54ee0e650bc11ed6794 SHA512 8f9aeb3295c7c8252f1ea974769e1cf82357ac088b576bf2ee277c7bcd1967b236e563000cdeb61e459922dfabb17776eae68c380ebdd4eb8c2002ff6949e73b
 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.89.ebuild b/media-gfx/asymptote/asymptote-2.89.ebuild
index 41e78e722943..8d3f1ada6331 100644
--- a/media-gfx/asymptote/asymptote-2.89.ebuild
+++ b/media-gfx/asymptote/asymptote-2.89.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest
index 128ffcfa5187..e7358dfcd99e 100644
--- a/media-gfx/fig2dev/Manifest
+++ b/media-gfx/fig2dev/Manifest
@@ -1,5 +1,5 @@
 DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 EBUILD fig2dev-3.2.9-r2.ebuild 2299 BLAKE2B e52d451f49bfa3ecb700caf594e6218bc65b1398aff300baef91d49dff581a7819836d9c5c60d3760b99c3b37d050c73e39960248bab685553d09e23be880d74 SHA512 4375637aeb94840774f820512624753845252ccc0dbf93d4ac6dbdde7d05c0b07e5fe286b212bc5612ecf12c80f4cc3a1b69e1f4b041808f81dedcb04d534bbf
-EBUILD fig2dev-3.2.9-r4.ebuild 2501 BLAKE2B 15f9ae03bbf1c777840806b2965786ce788a5522ebc94e5339fd335b5ea0c71ece6c97548927fe4e5b319da33e133e1d4044b502e649a2c34c6825eb348cf0b1 SHA512 2cd1f1baa7c0fa55f085630a61cf79954b7e44f22831d887249fa47f194024dac79cd6b17a128dec2c2f1a81945e0bd707b81f4134a0585330d1a1210a8016a6
+EBUILD fig2dev-3.2.9-r4.ebuild 2497 BLAKE2B c05d8c0147a8fde6a5230f3d952b8b52650162862ce8617e675d42c813b5857f907468176c197ed0311386f6c8ffefda86b38f65855f8f144b2833b15d12aa8b SHA512 41f22eaeb792395bf27823cfdfd47db38cfc5dc0177fc2e0964e0bb8ea0f73fc18fd117e6c1d672d2cdffb8f2d25eff4370541174fd6a0c9cd0fd6dcb443a904
 MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild
index 4ac5899592f0..fa284b331dc5 100644
--- a/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild
+++ b/media-gfx/fig2dev/fig2dev-3.2.9-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+ghostscript"
 
 RDEPEND="
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 0cb19fd2b105..ef6379ec43c2 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -4,5 +4,5 @@ DIST gnofract4d-4.3_p20230717.tar.gz 18275492 BLAKE2B 0bc8834c6f3ed3ec48bf4ee49a
 DIST gnofract4d-4.3_p20240324.tar.gz 18274057 BLAKE2B 183bf96e0429fa676f1c6fca4ae6466c489d0fe5ffee09ae161e01d0f22b4e77165f846416702c026f5d73a27833dfebd49f5c3131c621c9b1abd2ee9fc5529d SHA512 a174683b659347e4a7203d78d309ab41971d105131d40ea60490871477e80109624405f7012e455389ccc9325e08f224a1d3ea2d4e0c23fc9c5ca4fb83f9dfaa
 EBUILD gnofract4d-4.3_p20221125-r1.ebuild 1470 BLAKE2B 9316290a45026d2aae523d8e59059fcf08cecf886757c7dd49af0d8532176b6bec30f6e3f01ade36656437be6410502f9486b5f482d7b293df7cbe735d007850 SHA512 030a61800bd923a76e929312a908bc3b45634d891bb48cdd8d605ff23c5ed363293e33e1a9050f74d8e47bc67e787861597e77ee47b6c2171dcc43b056c215ef
 EBUILD gnofract4d-4.3_p20230717.ebuild 1740 BLAKE2B 1fdd4739fa03dc7c5fb50f866c68238e910f5675ab487fd9c343cae1795267ec3b38973aecc371217da762415d829ea25121b29ce3154ebab9aaee41402e2e64 SHA512 71489072990eab391408b93946168cd31dd030cff20d225210d489b703197f180d5442d8222231308230707586d1cff0328b5cbf612d8bfbb652cf640f8e54d2
-EBUILD gnofract4d-4.3_p20240324.ebuild 1809 BLAKE2B b08de09173356ccf05909190bfa307c9a7c6c1cf517e3b7a1bf58ee140fc6e2a802ba0f8c79cead2fe26b61e14107bc98042abeb00c721995f51b9be12ed4d13 SHA512 f4a130057f94342acd0bdb184c96905bfed27c8b48953b405a5c0361b70ef39fe214ff2ae91c3b1e8751917a88b194cd7be99051375aa25fe8d8ee058ab59ad4
+EBUILD gnofract4d-4.3_p20240324.ebuild 1807 BLAKE2B ac4416bd07fdd91545cfa2da18dbec010e0a5a4ef482bb9a414d82ad0a651b8f9a9fa59d5e5433e775e12f356ad926633ba623ba3e81cb6d58746029ae8d3aa2 SHA512 84789c4544eab3b22f281a13ca97c45cbfedf3d391ac6443c2749e5bdefb4e5a580c8bfb46d09d8e815cebb1090ea9c9fd716902f7099631f260308394bc69c7
 MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild
index 47a8800ec72a..c9482af02943 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 24e4596d6c03..fa85394de34a 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,5 @@
+AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085
 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
-EBUILD hugin-2023.0.0-r1.ebuild 2115 BLAKE2B fc20ea33349976ef525f6f292d6980c7663db986a3a1b580bb44533e2dc41b5bf4c3fc5b8ea5921891495b54dc1be6981e5dcaa28cab73799a5930dc6fe42c06 SHA512 b94c7b35a787bceac7b68540162a3ee8fd8e8a6383e9f0ca7ccca74b836073663283183934cc019e2130ef87721da88d982391082e4ec410c03921ef76f91dd9
+EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf
 EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/files/boost-1.85-932315.patch b/media-gfx/hugin/files/boost-1.85-932315.patch
new file mode 100644
index 000000000000..e8fc5c2daa1f
--- /dev/null
+++ b/media-gfx/hugin/files/boost-1.85-932315.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User tmodes
+# Date 1710260877 -3600
+#      Tue Mar 12 17:27:57 2024 +0100
+# Node ID 4d081490b48aaff820cee7601b8624b37b652c06
+# Parent  4b55f17c4e72d6c2f8b4930e3367ff52e1741b45
+Fixed deprecated boost::filesystem::copy_option enum
+
+diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h
+--- a/src/hugin_base/hugin_utils/filesystem.h	Tue Mar 12 17:27:29 2024 +0100
++++ b/src/hugin_base/hugin_utils/filesystem.h	Tue Mar 12 17:27:57 2024 +0100
+@@ -64,6 +64,12 @@
+     #endif

+     #include <boost/filesystem.hpp>

+     namespace fs = boost::filesystem;

+-    #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists

++    #if BOOST_VERSION>=107400

++      // in Boost 1.74 and later filesystem::copy_option is deprecated

++      // use filesystem::copy_options instead

++      #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing

++    #else

++      #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists

++    #endif

+ #endif

+ #endif // _HUGIN_UTILS_FILESYSTEM_H

diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
index 4587f91ae7d5..40c4d46a93f6 100644
--- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
@@ -62,6 +62,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Fix build with boost >=1.85
+	eapply "${FILESDIR}/boost-1.85-932315.patch"
+
 	sed -i \
 		-e "/COMMAND.*GZIP/d" \
 		-e "s/\.gz//g" \
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index b31d63475543..98fcc243e9c2 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -8,5 +8,5 @@ AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90f
 DIST openvdb-10.0.1.tar.gz 3461352 BLAKE2B 506168a4bb29bab2a3a3cb37002858517000dc1682f04d95387fd1e250b61c61d92d2ffdf9b679d83ef1ce270909693ebd46224b732ce264685004d1e47b3027 SHA512 361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb
 DIST openvdb-11.0.0.tar.gz 4620858 BLAKE2B b970167fffa10f28f89c0a3497c7a6076462702c7ede6aacc098239a81f5f09f408b56c37f84ea68e301cedff24920f02a6d08c1f00a2b9ca48925ef7cdc85c7 SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4
 EBUILD openvdb-10.0.1.ebuild 5301 BLAKE2B 23512715e9b40466b8ca6ee4000b794a0bc8806cd2c9822d3ff21744fa496f55be69b53436aa920eb40084cf6c5508df156eadecd7ac28f139e1b137ccc144da SHA512 0da78e71c150b055521883cee4f46aae2b240fcf1e2d7886b171fcbcba6c583eb734dd70035d610d1beeb0c2c4f01c738fb6e6f904055bae4e3ffa779406edfb
-EBUILD openvdb-11.0.0.ebuild 9846 BLAKE2B 25d130ee74f0bdbda418a7a2f6f602bf5c27ad40fea5f2840dd12200ccbd58f29e1198e8d80d4a10af38b5cda1804da28b84c1d7f6894f98522fb00f42fdb75f SHA512 f9f6a9b9e98e038a3ec32e1cb5e5429e8afca15b20f4ca5ef252cbec10c3a9e73db2d333c41e52e235572576fe9aae1c83163d3607ab4112b905eec7dc9ee645
+EBUILD openvdb-11.0.0.ebuild 9845 BLAKE2B 4d99021440fa92b137b5ecafad0482c83b8afce9f36c89d7a08b1afcef258e321c4b53ad3174a52f722dc45386fdb24529940b609412e35f71712b40b8730336 SHA512 5ac047d5dc8ed3f4e62da04231e3c1b3c071276b9e6c976bf25870b6be406acda5cbe17dbb6ae4d6611f1ef1b08d3df1cae5082e85a6aca905f98ed814e6af38
 MISC metadata.xml 1920 BLAKE2B acab685a9a9f5f4bab9179e71cac281a2faf5d5f7e4cfd5ecbcd581bb57d148c85f7effbfdb8d796152605d38b18a42c2321ed80a10adb9ba97d5baf95d5582f SHA512 e2736509047f65a51faf64b112387aa75c31d4c6a7e0996b5d30c2f555ae3d705d71b68359bb4b665a9f73d0147cdf40c95f5ba4a9daa6d873507bc9e55034ca
diff --git a/media-gfx/openvdb/openvdb-11.0.0.ebuild b/media-gfx/openvdb/openvdb-11.0.0.ebuild
index ff01eb449a31..f8b4c535dd04 100644
--- a/media-gfx/openvdb/openvdb-11.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-11.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 LICENSE="MPL-2.0"
 OPENVDB_ABI=$(ver_cut 1)
 SLOT="0/$PV"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="abi$((OPENVDB_ABI + 1))-compat +abi${OPENVDB_ABI}-compat abi$((OPENVDB_ABI - 1))-compat abi$((OPENVDB_ABI - 2))-compat alembic ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2
 	cuda doc examples jpeg +nanovdb numpy openexr png python static-libs test utils zlib"
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 5826c6a5f5b5..c2895150f820 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,5 @@
 DIST plantuml-1.2024.4.tar.gz 12061228 BLAKE2B b6edf25c99fecab5a463ddc3f330b28ecad1b60a595f833e4af4ec5e4db3489456f5df4be997879ef38c4053da75b790ae9b942bf28b77a8f73413fbe9289b9a SHA512 cb51e44691eb0a206de3f23e0bf1ba08f8a9d111d838c8b5f2ef2e7b7bae61294deb935bd0c0f2798fdc51d7a0a3e54d40d201075964e109a7f0781010933e91
+DIST plantuml-1.2024.5.tar.gz 12119170 BLAKE2B 97fd8f48aa04d9d8b089547871abd954b8b1c189d32b844f1de4ac33678dabe2968a3307fb573f571adf541dbbbfd5eb5c21839b14f3cb9ed2e86ac7b447bb87 SHA512 20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5
 EBUILD plantuml-1.2024.4-r1.ebuild 1157 BLAKE2B 0cea92bc9488cee120779fa023231be060ab4659967e137c47e49bf9f64c1e8400ed1abb912c0d269762c736f7d5b813c6b275d74fc9356a5b70c9db56b39fab SHA512 207471d7c211c503f368fd6dd4b8393224bc652afb704f46c7842f11f954b0239d34399b71bca0b9a2fb1e828a468e2351dbe96afed99fc5b697e8d082993140
-MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
+EBUILD plantuml-1.2024.5.ebuild 1389 BLAKE2B 2116a7e4378f2b07d9da9419348c40bc8c436ec2f33617f7aa469cd6e88cada97e6dbd28001a89d7588316e71c746deb04c88ab60fc5eabb176619301f62bf18 SHA512 0f98212b29593b9f06c61eac4f7b7400f8abd48687aa6b46f68ca3e824d0f307936f7c5d4f1e75b55428a8f4f8c2266c7da5e9b15d66c8409a01a1a525287e1b
+MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5
diff --git a/media-gfx/plantuml/metadata.xml b/media-gfx/plantuml/metadata.xml
index e6cce2ef5e7b..0d377a268e92 100644
--- a/media-gfx/plantuml/metadata.xml
+++ b/media-gfx/plantuml/metadata.xml
@@ -19,4 +19,7 @@
 		<remote-id type="sourceforge">plantuml</remote-id>
 		<remote-id type="github">plantuml/plantuml</remote-id>
 	</upstream>
+	<use>
+		<flag name="ant-task">Provides classes used to manage PlantUML Ant task</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/plantuml/plantuml-1.2024.5.ebuild b/media-gfx/plantuml/plantuml-1.2024.5.ebuild
new file mode 100644
index 000000000000..04cef1a18f85
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2024.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple desktop xdg
+
+DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
+HOMEPAGE="https://plantuml.com"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ant-task"
+
+DEPEND=">=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND=">=virtual/jre-1.8:*
+	media-gfx/graphviz
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+JAVA_AUTOMATIC_MODULE_NAME="net.sourceforge.plantuml"
+JAVA_MAIN_CLASS="net.sourceforge.plantuml.Run"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	if use ant-task; then
+		# src/net/sourceforge/plantuml/ant/readme.md
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm src/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die
+	fi
+
+	# java-pkg-simple wants resources in a separate directory
+	cp -r src res || die
+	cp -r skin stdlib svg themes res || die
+	find res -type f \( -name '*.java' -o -iname 'readme.md' \
+		-o -name '*.ttf' -o -name '*.html' -o -name 'data.txt' \
+		-o -name '.editorconfig' \) -exec rm -rf {} + || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	make_desktop_entry plantuml PlantUML
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 539a65cc8868..c9abd381d23b 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -3,5 +3,5 @@ AUX 46.0-add-control-optional-deps.patch 2715 BLAKE2B eb9e97a8bf052b218d414b1378
 DIST simple-scan-44.0.tar.xz 1198824 BLAKE2B 2bc9ea19a99b02d6acdb21036558bd2d42751699a89d41ec4da3336c061ecc7ad249b34ab0b30c6a6fc162fb7f6538859d1c29b2c9a843f2c2a8785dadc8a086 SHA512 8543b687eafec4f2460efa446146b4fe3a0ad469e5dcc5fcd19a02484cbfac5bce80741b488217af44c580720a01577a8e78479a4d2e96307da3de9dcfa467c6
 DIST simple-scan-46.0.tar.xz 1136672 BLAKE2B 0ee2dd5392ed1a888948183e9efbd8943287baad66dd45351cbbb32a9a4c17903415676b3e6e00203d8a3572e90397b51bc23ecec2ad6cfa6597a10ffdd5bcf4 SHA512 f7c4433536f59c71f066cdae51b0de1b0dcf9b8af00f3bedb4c1be281d09f9ce122666ed849bd88de8868042429f14bb7b01409f8a006360ce4285000fd30bdc
 EBUILD simple-scan-44.0.ebuild 1371 BLAKE2B 73e325ad1d13050f6cb8994a651953f621371a11fa326ec90d4df661009819c0f28e61cbe02b3c00a9ba140d374950d78b4bb94b69e462ada1fe56dab236213d SHA512 60b1ecddb04e51f99888e7bd7cc93363054ede33e18a31975545707b1dd800ef77b147e97dfae565e7c39bf982910a025ba3af623f0040b35ff7c361be81855c
-EBUILD simple-scan-46.0.ebuild 1382 BLAKE2B ede05d3eb421012626e78a7e2edbbebe78773630af0e06b47c335a19469a8c3a2208eba9e6ee012582d05656a5913420ac37666ff332d9790919e0a8c8e22c2e SHA512 3dbf173a758e79464b2c9d01c85d81c1759fbdbc36017f4d8f6b3b1b83251d6cae797b8aa4566a09cc9f98ef778e8c19876e94f8b5863ca318d92f1ab09c56e3
+EBUILD simple-scan-46.0.ebuild 1379 BLAKE2B 52193681ca592beb07158792d6f5dbf3bd76be14eb7f305042f8d91b46db99fc20ea35e773a9fcf7e80c9f903e5ada866f2b70ece6aca87a516bad6723428f48 SHA512 b16b9773922f8e713c485e4f37fb6dc3904f181f59abab45ac2ea1e83cddf7c107ef68d43563e2af05d669bd97660db232b4b60cf63ec3622a5d9a19c5cd8e42
 MISC metadata.xml 646 BLAKE2B d894b0b617db9d06a787e5d1c4b8d44dd1bb7c528f1498e9ce6044b7a4e015857eb9e227257abfbdb05e628c18da4e194f3a87750969ebc2735e1715036c596a SHA512 596b4b58bbdc0c82db3f961fb21c65b2af83949195873e37f65f383d8be562e499816a76303f24d82499e4db0f4825e17c0472153f827cfd334167c23cc46df5
diff --git a/media-gfx/simple-scan/simple-scan-46.0.ebuild b/media-gfx/simple-scan/simple-scan-46.0.ebuild
index 765098e7a253..5f3bd3dfab81 100644
--- a/media-gfx/simple-scan/simple-scan-46.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-46.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="colord webp"
 
 DEPEND="