public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/plantuml/
Date: Sat, 07 Jun 2025 17:44:07 +0000 (UTC)	[thread overview]
Message-ID: <1749318009.fda78c383805b8ea37433b017fda7c15114bff4b.fordfrog@gentoo> (raw)

commit:     fda78c383805b8ea37433b017fda7c15114bff4b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jun  3 06:26:45 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 17:40:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda78c38

media-gfx/plantuml: add 1.2025.3

- Updates JAVA_SRC_DIR and JAVA_RESOURCE_DIRS following upstream's new
  file structure
- Uses an extra ejavac call populating a target/intermediate directory
  for classes which are used only for compilation but not packaged in
  the final jar.

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/42423
Closes: https://github.com/gentoo/gentoo/pull/42423
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/plantuml/Manifest                 |  1 +
 media-gfx/plantuml/plantuml-1.2025.3.ebuild | 81 +++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 1981b068461f..e313e01ca007 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1 +1,2 @@
 DIST plantuml-1.2025.2.tar.gz 12312056 BLAKE2B 92c75d30b5ecb7b1a5fac111ae3de0ec14cc7ec547b39daac14b32f1944b8eb6b8da567eaeeae8fe899c574205b9a6f2c18f315d5b642192e979cf4ad5885b42 SHA512 9d8a55d9fab5e8e4cf0eedb107c097034f6004bfefbf0f559e1e2c365c13c5e5beca46cd79f60b49f371c588deb83496022f57d7c5f9e2bc71ed94dd25450265
+DIST plantuml-1.2025.3.tar.gz 13173012 BLAKE2B d2a903edfb2d0369cca015ed2df634e61466c338c8c380bb76886a527d9143545264b0b4a461f36c867ac5265aa03fb02fdbf649148bbce13278b1121676b1de SHA512 4b333ccdfd12bee897677de9a2bd587fdcfe64aacebc2a41f9ca6d27d0e31e54d32f9eee6f15b8c26956464aa04100b4a80f6f75158c367601d51811f58a41de

diff --git a/media-gfx/plantuml/plantuml-1.2025.3.ebuild b/media-gfx/plantuml/plantuml-1.2025.3.ebuild
new file mode 100644
index 000000000000..b5ee229ba69c
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2025.3.ebuild
@@ -0,0 +1,81 @@
+# 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="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# using media-gfx/graphviz
+	rm -r src/main/java/net/sourceforge/plantuml/windowsdot/graphviz.dat || die
+
+	if use ant-task; then
+		# src/main/java/net/sourceforge/plantuml/ant/readme.md
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm src/main/java/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die
+	fi
+
+	# Some classes are needed only for compilation but won't be packaged.
+	mkdir -p target/intermediate || die
+	local intsources
+	find src/main/java ! -path */plantuml/ant/* -type f -name '*.java' \
+		> intsources || die "sources"
+	ejavac -d target/intermediate @intsources
+	JAVA_GENTOO_CLASSPATH_EXTRA="target/intermediate"
+
+	rm -r src/main/java/net/sourceforge/plantuml/sudoku || die
+	rm -r src/main/java/net/sourceforge/plantuml/webp || die
+	rm -r src/main/java/jcckit || die "rm jcckit"
+	rm src/main/java/net/sourceforge/plantuml/jcckit/PSystemJcckit{,Factory}.java || die
+
+	# zext is not included in upstream's jar.
+	rm -r src/main/java/zext || die "rm zext"
+	rm src/main/java/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java || die
+
+	# java-pkg-simple wants resources in a separate directory
+	# excluding some files which are not included in upstream's jar
+	cd src/main/java || die "cd src/main/java"
+	find -type f \
+		! -name '.editorconfig' \
+		! -name '*.html' \
+		! -name '*.java' \
+		! -name '*.ttf' \
+		! -name 'readme.md' \
+		! -name 'README.md' |
+		xargs cp --parent -t ../resources || die "separate resource files"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	make_desktop_entry plantuml
+}


             reply	other threads:[~2025-06-07 17:44 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-07 17:44 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-23  6:33 [gentoo-commits] repo/gentoo:master commit in: media-gfx/plantuml/ Miroslav Šulc
2025-10-22 11:36 Sam James
2025-10-22  8:19 Miroslav Šulc
2025-10-16 12:12 Miroslav Šulc
2025-09-25 10:06 Miroslav Šulc
2025-09-05  7:58 Florian Schmaus
2025-09-04 20:48 Sam James
2025-08-07  7:05 Miroslav Šulc
2025-08-06 19:16 Miroslav Šulc
2025-05-11 17:42 Arthur Zamarin
2025-05-11  4:05 Arthur Zamarin
2025-04-09 17:54 Miroslav Šulc
2025-02-18 17:24 Miroslav Šulc
2025-02-17  9:57 Sam James
2025-01-18  9:10 Miroslav Šulc
2024-12-23  6:04 Miroslav Šulc
2024-12-22 18:51 Sam James
2024-11-22  7:53 Miroslav Šulc
2024-10-25  7:59 Miroslav Šulc
2024-10-25  5:46 Arthur Zamarin
2024-10-17 15:32 Arthur Zamarin
2024-10-02  9:04 Miroslav Šulc
2024-10-01 23:32 Sam James
2024-09-25  7:02 Miroslav Šulc
2024-09-03  8:29 Miroslav Šulc
2024-06-29  9:50 Miroslav Šulc
2024-06-28 15:38 Sam James
2024-05-29  9:43 Miroslav Šulc
2024-05-27  6:39 Miroslav Šulc
2024-05-25  9:23 Miroslav Šulc
2024-05-25  0:49 Sam James
2024-05-08  9:05 Miroslav Šulc
2024-05-07 10:05 Sam James
2024-04-25 11:55 Miroslav Šulc
2024-04-07  8:31 Miroslav Šulc
2024-03-22  8:43 Miroslav Šulc
2024-03-22  6:14 Arthur Zamarin
2024-02-17 11:53 Miroslav Šulc
2024-02-16 12:57 Miroslav Šulc
2024-02-13  8:26 Miroslav Šulc
2024-02-12 10:22 Sam James
2024-02-09  8:22 Miroslav Šulc
2024-02-02 15:15 Miroslav Šulc
2024-01-12 13:35 Miroslav Šulc
2024-01-12 13:35 Miroslav Šulc
2022-09-25  3:19 Miroslav Šulc
2022-09-25  1:18 Sam James
2022-08-24  3:20 Miroslav Šulc
2022-07-26  4:10 Miroslav Šulc
2022-07-25  7:07 Agostino Sarubbo
2022-06-23  4:09 Miroslav Šulc
2022-06-01  5:53 Miroslav Šulc
2022-05-31  7:07 Jakov Smolić
2022-05-11 12:33 Miroslav Šulc
2022-05-11  9:33 Jakov Smolić
2022-05-01  5:26 Miroslav Šulc
2022-05-01  5:11 Miroslav Šulc
2022-04-30 19:09 Sam James
2022-04-15  6:34 Miroslav Šulc
2022-04-14 19:36 Jakov Smolić
2022-04-10  8:38 Miroslav Šulc
2022-03-30  6:37 Miroslav Šulc
2022-03-15  9:50 Miroslav Šulc
2022-03-15  9:38 Jakov Smolić
2022-03-14  8:27 Miroslav Šulc
2022-02-12 15:19 Miroslav Šulc
2022-02-12 11:38 Jakov Smolić
2022-02-02  8:34 Miroslav Šulc
2022-01-12  9:46 Miroslav Šulc
2022-01-09 21:46 Miroslav Šulc
2022-01-09 20:35 Jakov Smolić
2022-01-04  8:11 Miroslav Šulc
2022-01-03 18:21 Miroslav Šulc
2022-01-03  9:19 Sam James
2021-12-14  8:05 Miroslav Šulc
2021-12-14  8:00 Jakov Smolić
2021-12-09  9:07 Miroslav Šulc
2021-12-04  8:58 Miroslav Šulc
2021-12-03 15:58 Sam James
2021-12-03  9:57 Miroslav Šulc
2021-11-13  9:04 Miroslav Šulc
2021-11-08 11:22 Miroslav Šulc
2021-11-08 10:01 Jakov Smolić
2021-11-03  6:28 Miroslav Šulc
2021-10-08 18:46 Miroslav Šulc
2021-06-12  9:52 Miroslav Šulc
2021-06-12  3:29 Sam James
2021-05-12  6:17 Miroslav Šulc
2020-07-21  1:36 Aaron Bauman
2020-02-18  8:52 Miroslav Šulc
2020-02-17 12:13 Agostino Sarubbo
2020-01-17 10:14 Miroslav Šulc
2020-01-17  9:29 Agostino Sarubbo
2020-01-16 23:44 Miroslav Šulc
2019-12-17 12:46 Miroslav Šulc
2019-12-17 12:46 Miroslav Šulc
2019-04-09 21:17 Mikle Kolyada
2016-08-06 10:05 James Le Cuirot
2016-08-06  9:39 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1749318009.fda78c383805b8ea37433b017fda7c15114bff4b.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox