commit: 96f1b92f7ecb57d5405be9b1549ce3e9463b86a1 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Apr 1 11:00:47 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 3 07:08:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f1b92f
dev-java/batik: avoid file collisions Bug: https://bugs.gentoo.org/872689 Closes: https://bugs.gentoo.org/903641 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30431 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../batik/{batik-1.16.ebuild => batik-1.16-r1.ebuild} | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dev-java/batik/batik-1.16.ebuild b/dev-java/batik/batik-1.16-r1.ebuild similarity index 93% rename from dev-java/batik/batik-1.16.ebuild rename to dev-java/batik/batik-1.16-r1.ebuild index aef311523b6a..1b2a6dfc4602 100644 --- a/dev-java/batik/batik-1.16.ebuild +++ b/dev-java/batik/batik-1.16-r1.ebuild @@ -96,6 +96,18 @@ src_prepare() { # We drop support for jython due to bug #825486. rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java || die rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java || die + + cat > "batik-squiggle-${SLOT}.desktop" <<-EOF || die + [Desktop Entry] + Name=Squiggle + Comment=SVG browser + Exec=batik-squiggle-${SLOT} + Icon=init + Terminal=false + Type=Application + Categories=Graphics;VectorGraphics; + MimeType=image/svg+xml + EOF } src_compile() { @@ -181,8 +193,10 @@ src_test() { src_install() { einstalldocs - domenu "${FILESDIR}"/batik-squiggle.desktop - doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg + domenu "batik-squiggle-${SLOT}.desktop" + newicon -s scalable \ + batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg \ + squiggle-${SLOT}.svg for module in "${BATIK_MODULES[@]}"; do JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
