gentoo auto-resync : 10:04:2025 - 08:43:23

5 files changed, 57 insertions, 80 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f31d6598780c..3d82f04084af 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 5c08a5be10b8..927835cafcca 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -3,6 +3,5 @@ AUX mypaint-2.0.1-python3.11.patch 3968 BLAKE2B 02318c3543bc66fc1ffd89af02f00c0e
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
 AUX mypaint-2.0.1-setuptools.patch 2647 BLAKE2B e9212c40830e51ed8abe217204ce3bcad65fac99c7ad00f38ae6275eb404c3464598672431a6c857f7de42950830a63f25bcfcb5f19685a443f963251ed1a9be SHA512 4d834558ab0e5419aae98a2a8f30c285d330392d3627e21d25def869b16e2ef4100d45d6a78b3f1714bd72e1e7b8cb7de24f89893c6c98d87bcefe74aff5965a
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
-EBUILD mypaint-2.0.1-r3.ebuild 1902 BLAKE2B e834a0d01e599393d649f77ee161a2f3396d07c55606b7cbbc7126d0f2cb1f6ddfac6e6d1f5130817cdd57cec3721629f475eee2fed16865018c278d7d33c75d SHA512 1d9adf88bc6432ec5df418bb425a6d3856810a9f54d4c4e754ef13acded24281fd8e1242364812be9f72b1760e4a1f93b5b817cbd64db4d6c7b45877f6c49d46
 EBUILD mypaint-2.0.1-r4.ebuild 2287 BLAKE2B 919ec341a1fd844171378eb0e514bef9e527eebad331a221279bb9acccf2209fff66c87eb2b33e85199073383352cde21443bd2ceebd28c7d44b4254408b33d4 SHA512 3d52c16504a09affb8ce837995afc5876360eb657a30713ba68f19841671641ef69c981116bac1e28546d6148067c23eae7c7bddb01a9546ea2a153555d8d397
 MISC metadata.xml 320 BLAKE2B 17a66707a8182c8eb1a0206b8ec86cdc307ce2d965beb66aa08e3e2b31700eebc05213b7e27e98aef40e566fd028561476d6f614aeb2a0450f560801f187b060 SHA512 cb54ae739d86722c2959d8ff63d8f20394b0611ef3f3a6587e517f3de6625748201659d782e6ec8ca65e55c285a6ff52408b3586088ce2546ba42872dfd07133
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
deleted file mode 100644
index 10930b0a7498..000000000000
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit desktop distutils-r1 xdg
-
-DESCRIPTION="Fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.app/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="openmp"
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-		dev-python/protobuf[${PYTHON_USEDEP}]
-	')
-	>=dev-libs/json-c-0.11:=
-	gnome-base/librsvg
-	media-gfx/mypaint-brushes:2.0
-	media-libs/lcms:2
-	>=media-libs/libmypaint-1.5.0[openmp?]
-	media-libs/libpng:=
-	sys-devel/gettext
-	llvm-runtimes/openmp
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/swig
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.1-r1-build-system.patch
-	"${FILESDIR}"/${P}-GIL-hold.patch
-	"${FILESDIR}"/${P}-setuptools.patch
-	"${FILESDIR}"/${PN}-2.0.1-python3.11.patch
-)
-
-distutils_enable_tests setup.py
-
-src_compile() {
-	# --disable-openmp can't be passed to setup.py build,
-	# only setup.py build_ext.
-	# Trying to call build_ext then build and such fails.
-	#
-	# We just override the environment instead for simplicity.
-	local openmp=$(usex openmp '-fopenmp' '-fno-openmp')
-
-	OPENMP_CFLAG="${openmp}" OPENMP_LDFLAG="${openmp}" distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-
-	local lang=
-	for lang in ${LANGS}; do
-		if ! has ${lang} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${lang} || die
-		fi
-	done
-}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 743097dd61fe..c5a100f22763 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,5 @@
 DIST plantuml-1.2025.0.tar.gz 12278815 BLAKE2B e4ae5b7f76294f060d6a598b6e145bb97af3e37127bcea64cf812d6072e946153de564ddb4d3985f7923fd7584911f08016cee79e26fd48dbf822b385e761b52 SHA512 cdae9effb752af43df913eef21d5c575fa803786d2afeb06732870a36a8a7c71204a8a24817640d9cc99e6361d8cae34a7490bb2a8e5ae034ee31edc1d51afb2
+DIST plantuml-1.2025.2.tar.gz 12312056 BLAKE2B 92c75d30b5ecb7b1a5fac111ae3de0ec14cc7ec547b39daac14b32f1944b8eb6b8da567eaeeae8fe899c574205b9a6f2c18f315d5b642192e979cf4ad5885b42 SHA512 9d8a55d9fab5e8e4cf0eedb107c097034f6004bfefbf0f559e1e2c365c13c5e5beca46cd79f60b49f371c588deb83496022f57d7c5f9e2bc71ed94dd25450265
 EBUILD plantuml-1.2025.0.ebuild 1374 BLAKE2B fdf54fa04f1547c97898f22e5ec1ddcde9e87e502701c3750d94076a72a62ca41a5e93056d306151982e7a8026d20efb68b602e5c421c596d223f733c4825853 SHA512 bbe009e91bc03d8f45e27e46304c9e6ae7426fcd48637f6462cf391268618f8859f6cbf3265fc1617dc281ce8b0bd5469270218cff8990dea195d3c9ad342b09
+EBUILD plantuml-1.2025.2.ebuild 1382 BLAKE2B 18e99e15d7a1eb02e05fd109c7141f28c3349795d933cbb28e009c7bd3225f01e2da468fbe5178ff236da995255e5588cdc943ddbe84a86e07a60b130b5d8b65 SHA512 8771fe1729515e9701acd80362fb3ef526ef9a5afe57ace4664f606f851af1b905e7030e97f768f6dbd6e15780187c9f1aa60884e46b328b311be63521297b66
 MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5
diff --git a/media-gfx/plantuml/plantuml-1.2025.2.ebuild b/media-gfx/plantuml/plantuml-1.2025.2.ebuild
new file mode 100644
index 000000000000..61efb82925bf
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2025.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 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"
+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
+}