From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2128515800C for ; Mon, 3 Apr 2023 07:08:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C66AE07EA; Mon, 3 Apr 2023 07:08:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFED1E07EA for ; Mon, 3 Apr 2023 07:08:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3631340C42 for ; Mon, 3 Apr 2023 07:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 513EE8BC for ; Mon, 3 Apr 2023 07:08:35 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1680505708.96f1b92f7ecb57d5405be9b1549ce3e9463b86a1.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/batik/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/batik/batik-1.16-r1.ebuild dev-java/batik/batik-1.16.ebuild X-VCS-Directories: dev-java/batik/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 96f1b92f7ecb57d5405be9b1549ce3e9463b86a1 X-VCS-Branch: master Date: Mon, 3 Apr 2023 07:08:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4db4cf95-c734-4b2f-b8c9-8d9638486333 X-Archives-Hash: 212b0c0701241f56e14edc77929aa816 commit: 96f1b92f7ecb57d5405be9b1549ce3e9463b86a1 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Apr 1 11:00:47 2023 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30431 Signed-off-by: Miroslav Šulc 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:.*\(.*\):\1:p' "${module}/pom.xml" )