[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: de95d4d877419d13a16de8467f3c5f0c10149b4d
Author: Manuel Mommertz  desy  de>
AuthorDate: Wed Jan 17 10:53:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 19 05:52:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de95d4d8

dev-java/batik: Append to variable gjl_java_args instead of replacing it

Before this fix all launchers for apps that depend on batik get their 
gil_java_args variable overwritten. Now the relevant config for batik is 
appended, keeping the previous content of the variable.

Closes: https://bugs.gentoo.org/91
Signed-off-by: Manuel Mommertz  desy.de>
Closes: https://github.com/gentoo/gentoo/pull/34864
Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/{batik-1.17.ebuild => batik-1.17-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/batik/batik-1.17.ebuild 
b/dev-java/batik/batik-1.17-r1.ebuild
similarity index 98%
rename from dev-java/batik/batik-1.17.ebuild
rename to dev-java/batik/batik-1.17-r1.ebuild
index e86745d88df5..b389f8994bd7 100644
--- a/dev-java/batik/batik-1.17.ebuild
+++ b/dev-java/batik/batik-1.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -229,7 +229,7 @@ src_install() {
_EOF_
java-pkg_register-environment-variable \
gjl_java_args \
-   "-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+   "\$gjl_java_args 
-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
 
if use doc; then
java-pkg_dojavadoc target/api

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 67360a9f1185fd830c04928220a967508e630f09
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Dec  1 05:16:01 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  1 09:23:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67360a9f

dev-java/batik: drop 1.16-r2

Bug: https://bugs.gentoo.org/918088
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/Manifest |   2 -
 dev-java/batik/batik-1.16-r2.ebuild | 247 
 2 files changed, 249 deletions(-)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 883b9e84cf5b..38cde9303492 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,2 @@
-DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 
041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab
 SHA512 
024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
-DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B 
fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03
 SHA512 
7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
 DIST batik-src-1.17.tar.gz 13578640 BLAKE2B 
c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2
 SHA512 
0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516
 DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 
33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e
 SHA512 
513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60

diff --git a/dev-java/batik/batik-1.16-r2.ebuild 
b/dev-java/batik/batik-1.16-r2.ebuild
deleted file mode 100644
index e86745d88df5..
--- a/dev-java/batik/batik-1.16-r2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:batik:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
-
-DESCRIPTION="XML Graphics Batik"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/;
-SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
-   verify-sig? ( 
https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc
 )"
-S="${WORKDIR}/batik-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.16"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
-   dev-java/jacl:0
-   dev-java/rhino:1.6
-   dev-java/xalan:0
-   dev-java/xml-commons-external:1.4
-   dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="
-   ${CP_DEPEND}
-   >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-   ${CP_DEPEND}
-   >=virtual/jre-1.8:*
-"
-
-BDEPEND="
-   app-arch/zip
-   verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
-
-DOCS=( CHANGES NOTICE README )
-
-# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar 
files in the extensions
-# directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
-# We comment them out but keep them in the mudules list for later.
-# The same for batik-test-old which depends on fop-transcoder-allinone which 
itself depends on batik.
-# We also don't build batik-shared-resources since we install those resources 
on global scope.
-# And we don't build batik-all. Instead we install the modules.
-# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn 
dependency:tree":
-#  mvn -DskipTests dependency:tree \
-#  | sed -n '/Reactor Build Order:/,/Building org/p' \
-#  | cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die
-BATIK_MODULES=(
-#  batik-shared-resources
-   batik-constants
-   batik-i18n
-   batik-test
-   batik-util
-   batik-awt-util
-   batik-css
-   batik-ext
-   batik-xml
-   batik-dom
-   batik-parser
-   batik-svg-dom
-   batik-anim
-   batik-gvt
-   batik-script
-   batik-bridge
-   batik-svggen
-   batik-transcoder
-   batik-codec
-   batik-extension
-   batik-gui-util
-   batik-svgrasterizer
-#  batik-rasterizer-ext
-   batik-rasterizer
-   batik-slideshow
-   batik-swing
-   batik-svgbrowser
-#  batik-squiggle-ext
-   batik-squiggle
-   batik-svgpp
-   batik-ttf2svg
-# 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: ee142b3f897562a21c5bd5005ae47bc94e425565
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 30 03:15:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 30 03:15:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee142b3f

dev-java/batik: Stabilize 1.17 x86, #916015

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.17.ebuild b/dev-java/batik/batik-1.17.ebuild
index 4619d8234ea6..be3af0640c5f 100644
--- a/dev-java/batik/batik-1.17.ebuild
+++ b/dev-java/batik/batik-1.17.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.16"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: dd62012dea4fa6a412791fa8624b58464f09fcde
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 29 23:30:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 29 23:30:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd62012d

dev-java/batik: Stabilize 1.17 amd64, #916015

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.17.ebuild b/dev-java/batik/batik-1.17.ebuild
index 62259c27b4a4..4619d8234ea6 100644
--- a/dev-java/batik/batik-1.17.ebuild
+++ b/dev-java/batik/batik-1.17.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.16"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 7562653fb5583760f13f4ece1e0e04ccd7cefd5a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Sep 20 18:56:06 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep 20 18:56:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7562653f

dev-java/batik: reverted to unstable on 1.17

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/batik-1.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.17.ebuild b/dev-java/batik/batik-1.17.ebuild
index dd7569417d64..3ad8300e6b99 100644
--- a/dev-java/batik/batik-1.17.ebuild
+++ b/dev-java/batik/batik-1.17.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.16"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 370be1d1ba3f9c33c3172720d0e7e98f43f0b71e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Sep  6 13:56:18 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep 20 07:30:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370be1d1

dev-java/batik: add 1.17

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/Manifest  |   2 +
 dev-java/batik/batik-1.17.ebuild | 247 +++
 2 files changed, 249 insertions(+)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 6392b059f106..883b9e84cf5b 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1,4 @@
 DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 
041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab
 SHA512 
024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
 DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B 
fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03
 SHA512 
7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
+DIST batik-src-1.17.tar.gz 13578640 BLAKE2B 
c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2
 SHA512 
0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516
+DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 
33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e
 SHA512 
513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60

diff --git a/dev-java/batik/batik-1.17.ebuild b/dev-java/batik/batik-1.17.ebuild
new file mode 100644
index ..dd7569417d64
--- /dev/null
+++ b/dev-java/batik/batik-1.17.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/;
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc
 )"
+S="${WORKDIR}/batik-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.16"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+CP_DEPEND="
+   dev-java/jacl:0
+   dev-java/rhino:1.6
+   dev-java/xalan:0
+   dev-java/xml-commons-external:1.4
+   dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="
+   ${CP_DEPEND}
+   >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+   ${CP_DEPEND}
+   >=virtual/jre-1.8:*
+"
+
+BDEPEND="
+   app-arch/zip
+   verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
+
+DOCS=( CHANGES NOTICE README )
+
+# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar 
files in the extensions
+# directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+# We comment them out but keep them in the mudules list for later.
+# The same for batik-test-old which depends on fop-transcoder-allinone which 
itself depends on batik.
+# We also don't build batik-shared-resources since we install those resources 
on global scope.
+# And we don't build batik-all. Instead we install the modules.
+# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn 
dependency:tree":
+#  mvn -DskipTests dependency:tree \
+#  | sed -n '/Reactor Build Order:/,/Building org/p' \
+#  | cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die
+BATIK_MODULES=(
+#  batik-shared-resources
+   batik-constants
+   batik-i18n
+   batik-test
+   batik-util
+   batik-awt-util
+   batik-css
+   batik-ext
+   batik-xml
+   batik-dom
+   batik-parser
+   batik-svg-dom
+   batik-anim
+   batik-gvt
+   batik-script
+   batik-bridge
+   batik-svggen
+   batik-transcoder
+   batik-codec
+   batik-extension
+   batik-gui-util
+   batik-svgrasterizer
+#  batik-rasterizer-ext
+   batik-rasterizer
+   batik-slideshow
+   batik-swing
+   batik-svgbrowser
+#  batik-squiggle-ext
+   batik-squiggle
+   batik-svgpp
+   batik-ttf2svg
+#  batik-all
+   batik-test-swing
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: e1ee939fab0b3267ecb24a03f53bcc5f44e95319
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jun 29 06:15:57 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun 29 06:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ee939f

dev-java/batik: reverted to revbump

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/{batik-1.16-r1.ebuild => batik-1.16-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-java/batik/batik-1.16-r1.ebuild 
b/dev-java/batik/batik-1.16-r2.ebuild
similarity index 100%
rename from dev-java/batik/batik-1.16-r1.ebuild
rename to dev-java/batik/batik-1.16-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 625077cb34cedd4e9f4021c07ec619de59c0b7dd
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun 28 17:47:22 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun 29 06:10:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625077cb

dev-java/batik: BDEPEND on app-arch/zip

Closes: https://bugs.gentoo.org/909336
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/31659
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/batik-1.16-r1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-java/batik/batik-1.16-r1.ebuild 
b/dev-java/batik/batik-1.16-r1.ebuild
index 244e640e9dd5..dd7569417d64 100644
--- a/dev-java/batik/batik-1.16-r1.ebuild
+++ b/dev-java/batik/batik-1.16-r1.ebuild
@@ -37,7 +37,11 @@ RDEPEND="
>=virtual/jre-1.8:*
 "
 
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )"
+BDEPEND="
+   app-arch/zip
+   verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )
+"
+
 
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
 
 DOCS=( CHANGES NOTICE README )
@@ -141,7 +145,7 @@ src_compile() {
else
# Create the JAR file (not possible without 
adding at least one file).
jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" 
-C . README || die
-   zip -d "${module}.jar" "README"
+   zip -d "${module}.jar" "README" || die
fi
fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/files/

[Miroslav Šulc]

commit: 7aee25d6bcd1725bcf1dfc343a394e0d09af93d5
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr  6 16:23:17 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr  7 07:14:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aee25d6

dev-java/batik: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30500
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/files/batik-squiggle.desktop | 9 -
 1 file changed, 9 deletions(-)

diff --git a/dev-java/batik/files/batik-squiggle.desktop 
b/dev-java/batik/files/batik-squiggle.desktop
deleted file mode 100644
index 95bb990177c7..
--- a/dev-java/batik/files/batik-squiggle.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Squiggle
-Comment=SVG browser
-Exec=batik-squiggle-1.14
-Icon=init
-Terminal=false
-Type=Application
-Categories=Graphics;VectorGraphics;
-MimeType=image/svg+xml;

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/, dev-java/batik/files/

[Miroslav Šulc]

commit: f137d0226cf2c7568a4f382add4c533de20c2688
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr  4 20:43:05 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr  5 10:56:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f137d022

dev-java/batik: drop 1.14-r1

Closes: https://bugs.gentoo.org/903687
Closes: https://bugs.gentoo.org/903600
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30480
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/Manifest |   1 -
 dev-java/batik/batik-1.14-r1.ebuild | 178 
 dev-java/batik/files/batik-1.14-modules |  33 --
 3 files changed, 212 deletions(-)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index aebefb3e43af..6392b059f106 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,3 +1,2 @@
-DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 
9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815
 SHA512 
689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
 DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 
041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab
 SHA512 
024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
 DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B 
fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03
 SHA512 
7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea

diff --git a/dev-java/batik/batik-1.14-r1.ebuild 
b/dev-java/batik/batik-1.14-r1.ebuild
deleted file mode 100644
index 1a978d257f26..
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 
--keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple xdg-utils
-
-DESCRIPTION="XML Graphics Batik"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/;
-SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
-   dev-java/jacl:0
-   dev-java/jython:2.7
-   dev-java/rhino:1.6
-   dev-java/xalan:0
-   dev-java/xml-commons-external:1.4
-   dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-   >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-   >=virtual/jre-1.8:*"
-
-DOCS=( CHANGES NOTICE README )
-
-S="${WORKDIR}/batik-${PV}"
-
-src_prepare() {
-   default
-   java-pkg_clean
-}
-
-src_compile() {
-   # We loop over the modules list and compile the jar files.
-   while read module; do
-   einfo "Compiling $module"
-
-   JAVA_SRC_DIR=""
-   JAVA_RESOURCE_DIRS=""
-   JAVA_JAR_FILENAME="$module.jar"
-   JAVA_MAIN_CLASS=""
-
-   # Not all of the modules have resources.
-   if [[ -d $module/src/main/resources ]]; then
-   JAVA_RESOURCE_DIRS="$module/src/main/resources"
-   fi
-
-   # Don't let sed die on modules without MainClass.
-   JAVA_MAIN_CLASS=$( sed -n 
's:.*\(.*\):\1:p' $module/pom.xml )
-
-   # Some modules don't have source code.
-   if [[ -d $module/src/main/java/org ]]; then
-   JAVA_SRC_DIR="$module/src/main/java"
-   java-pkg-simple_src_compile
-   else
-   # This case applies to batik-rasterizer.
-   if [[ -d $module/src/main/resources/org ]]; then
-   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C 
"$module/src/main/resources" . || die
-   # Else for batik-rasterizer-ext, batik-squiggle and 
batik-squiggle-ext
-   else
-   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . 
README || die
-   zip -d $module.jar "README"
-   fi
-   fi
-
-   JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
-
-   rm -fr target || die
-   # Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts 
their jar files 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Arthur Zamarin]

commit: e7c2b9e9aa3bb970af77a54fc67ba030846b1f55
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr  4 19:57:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr  4 19:57:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c2b9e9

dev-java/batik: Stabilize 1.16-r1 amd64, #903725

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/batik/batik-1.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.16-r1.ebuild 
b/dev-java/batik/batik-1.16-r1.ebuild
index 4adeaf1d26f2..244e640e9dd5 100644
--- a/dev-java/batik/batik-1.16-r1.ebuild
+++ b/dev-java/batik/batik-1.16-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.16"
-KEYWORDS="~amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Arthur Zamarin]

commit: 746eab9ed8cc4773470740c9f7676222a04b3e3c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr  4 19:32:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr  4 19:32:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746eab9e

dev-java/batik: Stabilize 1.16-r1 x86, #903725

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/batik/batik-1.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.16-r1.ebuild 
b/dev-java/batik/batik-1.16-r1.ebuild
index 571c9b193034..4adeaf1d26f2 100644
--- a/dev-java/batik/batik-1.16-r1.ebuild
+++ b/dev-java/batik/batik-1.16-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.16"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: e7cf5658f674a586f1fe12c0cb47b732913f2941
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  3 21:39:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  3 21:40:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cf5658

dev-java/batik: Stabilize 1.16-r1 ppc64, #903725

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.16-r1.ebuild 
b/dev-java/batik/batik-1.16-r1.ebuild
index 1b2a6dfc4602..571c9b193034 100644
--- a/dev-java/batik/batik-1.16-r1.ebuild
+++ b/dev-java/batik/batik-1.16-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.16"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 96f1b92f7ecb57d5405be9b1549ce3e9463b86a1
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Apr  1 11:00:47 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Apr  3 07:08:28 2023 +
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" )

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 5bcfa45f57db2b244f4212e810e2ef9110556895
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Mar 27 08:54:27 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 31 06:38:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bcfa45f

dev-java/batik: add 1.16

Bug: https://bugs.gentoo.org/903600
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30411
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/Manifest  |   2 +
 dev-java/batik/batik-1.16.ebuild | 229 +++
 2 files changed, 231 insertions(+)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 4ac30465bd11..aebefb3e43af 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1 +1,3 @@
 DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 
9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815
 SHA512 
689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
+DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 
041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab
 SHA512 
024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
+DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B 
fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03
 SHA512 
7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea

diff --git a/dev-java/batik/batik-1.16.ebuild b/dev-java/batik/batik-1.16.ebuild
new file mode 100644
index ..aef311523b6a
--- /dev/null
+++ b/dev-java/batik/batik-1.16.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/;
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc
 )"
+S="${WORKDIR}/batik-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.16"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+   dev-java/jacl:0
+   dev-java/rhino:1.6
+   dev-java/xalan:0
+   dev-java/xml-commons-external:1.4
+   dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="
+   ${CP_DEPEND}
+   >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+   ${CP_DEPEND}
+   >=virtual/jre-1.8:*
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
+
+DOCS=( CHANGES NOTICE README )
+
+# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar 
files in the extensions
+# directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+# We comment them out but keep them in the mudules list for later.
+# The same for batik-test-old which depends on fop-transcoder-allinone which 
itself depends on batik.
+# We also don't build batik-shared-resources since we install those resources 
on global scope.
+# And we don't build batik-all. Instead we install the modules.
+# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn 
dependency:tree":
+#  mvn -DskipTests dependency:tree \
+#  | sed -n '/Reactor Build Order:/,/Building org/p' \
+#  | cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die
+BATIK_MODULES=(
+#  batik-shared-resources
+   batik-constants
+   batik-i18n
+   batik-test
+   batik-util
+   batik-awt-util
+   batik-css
+   batik-ext
+   batik-xml
+   batik-dom
+   batik-parser
+   batik-svg-dom
+   batik-anim
+   batik-gvt
+   batik-script
+   batik-bridge
+   batik-svggen
+   batik-transcoder
+   batik-codec
+   batik-extension
+   batik-gui-util
+   batik-svgrasterizer
+#  batik-rasterizer-ext
+   batik-rasterizer
+   batik-slideshow
+   batik-swing
+   batik-svgbrowser
+#  batik-squiggle-ext
+   batik-squiggle
+   batik-svgpp
+   batik-ttf2svg
+#  batik-all
+   batik-test-swing
+   batik-test-svg
+#  batik-test-old
+)
+
+src_prepare() {
+   java-pkg_clean
+   java-pkg-2_src_prepare
+   # We drop support for jython due to bug #825486.
+   rm 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Miroslav Šulc]

commit: 61b27e5f6dc23f4acd7d2fae0ba5d6cb7b631fa3
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun  1 06:23:09 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun  2 06:20:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b27e5f

dev-java/batik: drop 1.14

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/batik/batik-1.14.ebuild | 191 ---
 1 file changed, 191 deletions(-)

diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
deleted file mode 100644
index 74222ffb9dd1..
--- a/dev-java/batik/batik-1.14.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 
--keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple xdg-utils
-
-DESCRIPTION="XML Graphics Batik"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/;
-SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
-   dev-java/jacl:0
-   dev-java/jython:2.7
-   dev-java/rhino:1.6
-   dev-java/xalan:0
-   dev-java/xml-commons-external:1.3
-   dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-   >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-   >=virtual/jre-1.8:*"
-
-DOCS=( {CHANGES,NOTICE,README} )
-
-S="${WORKDIR}/batik-${PV}"
-
-src_prepare() {
-   default
-   java-pkg_clean
-}
-
-src_compile() {
-
-   # We loop over the modules list and compile the jar files.
-   while read module ; do \
-
-   echo "compiling $module"
-
-   JAVA_SRC_DIR=""
-   JAVA_RESOURCE_DIRS=""
-   JAVA_JAR_FILENAME="$module.jar"
-   JAVA_MAIN_CLASS=""
-
-   # Not all of the modules have resources.
-   if [[ -d $module/src/main/resources ]]; then \
-   JAVA_RESOURCE_DIRS="$module/src/main/resources"
-   fi
-
-   # Don't let sed die on modules without MainClass.
-   JAVA_MAIN_CLASS=$( sed -n 
's:.*\(.*\):\1:p' $module/pom.xml )
-
-   # Some modules don't have source code.
-   if [[ -d $module/src/main/java/org ]]; then \
-   JAVA_SRC_DIR="$module/src/main/java"
-   java-pkg-simple_src_compile
-   else
-   # This case applies to batik-rasterizer.
-   if [[ -d $module/src/main/resources/org ]]; then \
-   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C 
"$module/src/main/resources" . || die
-   # Else for batik-rasterizer-ext, batik-squiggle and 
batik-squiggle-ext
-   else
-   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . 
README || die
-   zip -d $module.jar "README"
-   fi
-   fi
-
-   JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
-
-   rm -fr target || die
-
-   # Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts 
their jar files in the extensions
-   # directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
-   # We keep them in the mudules list for later but omit them by 'grep -v'.
-   # The same for batik-test-old which depends on fop-transcoder-allinone 
which itself depends on batik.
-   # batik-1.14-modules is the "Reactor Build Order" extracted from the 
output of "mvn dependency:tree".
-   done < <(grep -v 
'\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' 
"${FILESDIR}"/batik-1.14-modules)
-
-   if use doc; then
-
-   JAVA_SRC_DIR=""
-   JAVA_JAR_FILENAME="ignoreme.jar"
-
-   while read module ; do \
-
-   # Some modules don't have source code
-   if [[ -d $module/src/main/java/org ]]; then \
-   JAVA_SRC_DIR+=( "$module/src/main/java" )
-   fi
-
-   done < "${FILESDIR}"/batik-1.14-modules
-
-   java-pkg-simple_src_compile
-   fi
-}
-
-src_test() {
-
-   JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-   while read module ; do \
-
-   echo "testing $module"
-
-   JAVA_TEST_SRC_DIR=""
-   JAVA_TEST_RESOURCE_DIRS=""
-   JAVA_TEST_RUN_ONLY=""
-
-   if [[ -d 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: bad0869f75afa8b4b873f23b6537f2594c15b956
Author: Sam James  gentoo  org>
AuthorDate: Tue May 31 22:09:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 31 22:09:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad0869f

dev-java/batik: Stabilize 1.14-r1 ppc64, #848840

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14-r1.ebuild 
b/dev-java/batik/batik-1.14-r1.ebuild
index a8ab713d7813..1a978d257f26 100644
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: 26a9776ba505845aa19e4ba7e93658885b00d66f
Author: Sam James  gentoo  org>
AuthorDate: Tue May 31 22:08:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 31 22:08:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a9776b

dev-java/batik: Stabilize 1.14-r1 x86, #848840

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14-r1.ebuild 
b/dev-java/batik/batik-1.14-r1.ebuild
index 65ec45645380..a8ab713d7813 100644
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: e8ac49d235f236911215202dbf7fc2e98355cf08
Author: Sam James  gentoo  org>
AuthorDate: Tue May 31 22:08:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 31 22:08:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ac49d2

dev-java/batik: Stabilize 1.14-r1 amd64, #848840

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14-r1.ebuild 
b/dev-java/batik/batik-1.14-r1.ebuild
index 97c0d8183481..65ec45645380 100644
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/, dev-java/batik/files/

[Arthur Zamarin]

commit: 5776e4441e70b5695f57230978afd1fc9a6115b9
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu May  5 16:25:30 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May  9 17:21:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5776e444

dev-java/batik: drop 1.9

Closes: https://bugs.gentoo.org/831112
Closes: https://bugs.gentoo.org/833406
Closes: https://bugs.gentoo.org/831105
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/batik/Manifest |   1 -
 dev-java/batik/batik-1.9.ebuild | 109 
 dev-java/batik/files/batik-1.9-ImportInfo.patch |  10 ---
 3 files changed, 120 deletions(-)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 33f7b1515575..4ac30465bd11 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1 @@
 DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 
9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815
 SHA512 
689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
-DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 
4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606
 SHA512 
96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
deleted file mode 100644
index 2e905bf8073d..
--- a/dev-java/batik/batik-1.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 epatch
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/;
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz;
-
-LICENSE="Apache-2.0"
-SLOT="1.9"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris 
~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-   tcl? ( dev-java/jacl:0 )
-   python? ( dev-java/jython:2.7 )
-   dev-java/xalan:0
-   dev-java/rhino:1.6
-   dev-java/ant-core:0
-   dev-java/xmlgraphics-commons:2
-   dev-java/xml-commons-external:1.3"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.6"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-   xml-commons-external-1.3
-   xmlgraphics-commons-2
-   rhino-1.6
-   xalan"
-
-src_prepare() {
-   default
-
-   # See bug 318323.
-   local file
-   for file in build.xml contrib/rasterizertask/build.xml; do
-   java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
-   done
-
-   # See bug 628812.
-   use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
-
-   cd lib || die
-   rm -v *.jar build/*.jar || die
-   use python && java-pkg_jar-from jython-2.7
-   use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-   # Fails to build on amd64 without this
-   export ANT_OPTS="-Xmx256m"
-   use amd64 && export ANT_OPTS="-Xmx1g"
-
-   eant jars all-jar $(use_doc)
-   cd contrib/rasterizertask || die
-   eant -Dgentoo.classpath="$(java-pkg_getjar ant-core 
ant.jar):../../classes" jar $(use_doc)
-}
-
-src_install() {
-   batik_unversion_jars() {
-   local jar
-   for jar in batik-*.jar; do
-   newj="${jar%-*}.jar"
-   java-pkg_newjar ${jar} ${newj}
-   done
-   }
-
-   # First unversion jars in ${P}/lib
-   cd "${S}/${P}/lib" || die
-   batik_unversion_jars
-
-   # Then, only those in ${P}
-   cd "${S}/${P}" || die
-   batik_unversion_jars
-
-   # Proceed with documentation installation
-   cd "${S}" || die
-   dodoc README CHANGES
-   use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
-
-   # See bug #116976.
-   java-pkg_dolauncher "batik-${SLOT}" \
-   --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-   --main org.apache.batik.apps.svgbrowser.Main
-
-   # To find these lsjar batik-${SLOT} | grep Main.class
-   local launcher
-   for launcher in ttf2svg slideshow svgpp rasterizer; do
-   java-pkg_dolauncher batik-${launcher}-${SLOT} \
-   --main org.apache.batik.apps.${launcher}.Main
-   done
-
-   # Install and register the ant task.
-   java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-   java-pkg_register-ant-task
-}

diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Florian Schmaus]

commit: d052d624e9ddf9fcfe5ababf0a423e54c779b764
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun May  1 19:19:22 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun May  1 19:19:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d052d624

dev-java/batik: minor code style changes

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/batik/batik-1.14-r1.ebuild | 15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/dev-java/batik/batik-1.14-r1.ebuild 
b/dev-java/batik/batik-1.14-r1.ebuild
index 4d4b9a29d2be..97c0d8183481 100644
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="${CP_DEPEND}
 RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
 
-DOCS=( {CHANGES,NOTICE,README} )
+DOCS=( CHANGES NOTICE README )
 
 S="${WORKDIR}/batik-${PV}"
 
@@ -45,10 +45,8 @@ src_prepare() {
 }
 
 src_compile() {
-
# We loop over the modules list and compile the jar files.
while read module; do
-
einfo "Compiling $module"
 
JAVA_SRC_DIR=""
@@ -82,7 +80,6 @@ src_compile() {
JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
 
rm -fr target || die
-
# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts 
their jar files in the extensions
# directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
# We keep them in the mudules list for later but omit them by 'grep -v'.
@@ -91,17 +88,14 @@ src_compile() {
done < <(grep -v 
'\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' 
"${FILESDIR}"/batik-1.14-modules)
 
if use doc; then
-
JAVA_SRC_DIR=""
JAVA_JAR_FILENAME="ignoreme.jar"
 
while read module; do
-
# Some modules don't have source code
if [[ -d $module/src/main/java/org ]]; then
JAVA_SRC_DIR+=( "$module/src/main/java" )
fi
-
done < "${FILESDIR}"/batik-1.14-modules
 
java-pkg-simple_src_compile
@@ -109,11 +103,9 @@ src_compile() {
 }
 
 src_test() {
-
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 
while read module; do
-
einfo "Testing $module"
 
JAVA_TEST_SRC_DIR=""
@@ -133,7 +125,6 @@ src_test() {
JAVA_TEST_SRC_DIR="$module/src/test/java"
java-pkg-simple_src_test
fi
-
done < <(grep -v 
'\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' 
"${FILESDIR}"/batik-1.14-modules)
 }
 
@@ -143,7 +134,6 @@ src_install() {
doicon 
batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
 
while read module; do
-
JAVA_MAIN_CLASS=$( sed -n 
's:.*\(.*\):\1:p' $module/pom.xml )
 
java-pkg_dojar $module.jar
@@ -155,13 +145,10 @@ src_install() {
 
# Some modules don't have source code
if [[ -d $module/src/main/java/org ]]; then
-
if use source; then
java-pkg_dosrc "$module/src/main/java/*"
fi
-
fi
-
done < <(grep -v 
'\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' 
"${FILESDIR}"/batik-1.14-modules)
 
local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Florian Schmaus]

commit: 3815608be4494944619d4c73383c6d376cbd1be4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Apr 27 09:02:28 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun May  1 19:12:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3815608b

dev-java/batik: dependency update xml-commons-external:1.4

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25273
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/batik/batik-1.14-r1.ebuild | 191 
 1 file changed, 191 insertions(+)

diff --git a/dev-java/batik/batik-1.14-r1.ebuild 
b/dev-java/batik/batik-1.14-r1.ebuild
new file mode 100644
index ..4d4b9a29d2be
--- /dev/null
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 
--keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/;
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.14"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+   dev-java/jacl:0
+   dev-java/jython:2.7
+   dev-java/rhino:1.6
+   dev-java/xalan:0
+   dev-java/xml-commons-external:1.4
+   dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+   >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+   >=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,NOTICE,README} )
+
+S="${WORKDIR}/batik-${PV}"
+
+src_prepare() {
+   default
+   java-pkg_clean
+}
+
+src_compile() {
+
+   # We loop over the modules list and compile the jar files.
+   while read module; do
+
+   einfo "Compiling $module"
+
+   JAVA_SRC_DIR=""
+   JAVA_RESOURCE_DIRS=""
+   JAVA_JAR_FILENAME="$module.jar"
+   JAVA_MAIN_CLASS=""
+
+   # Not all of the modules have resources.
+   if [[ -d $module/src/main/resources ]]; then
+   JAVA_RESOURCE_DIRS="$module/src/main/resources"
+   fi
+
+   # Don't let sed die on modules without MainClass.
+   JAVA_MAIN_CLASS=$( sed -n 
's:.*\(.*\):\1:p' $module/pom.xml )
+
+   # Some modules don't have source code.
+   if [[ -d $module/src/main/java/org ]]; then
+   JAVA_SRC_DIR="$module/src/main/java"
+   java-pkg-simple_src_compile
+   else
+   # This case applies to batik-rasterizer.
+   if [[ -d $module/src/main/resources/org ]]; then
+   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C 
"$module/src/main/resources" . || die
+   # Else for batik-rasterizer-ext, batik-squiggle and 
batik-squiggle-ext
+   else
+   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . 
README || die
+   zip -d $module.jar "README"
+   fi
+   fi
+
+   JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+
+   rm -fr target || die
+
+   # Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts 
their jar files in the extensions
+   # directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+   # We keep them in the mudules list for later but omit them by 'grep -v'.
+   # The same for batik-test-old which depends on fop-transcoder-allinone 
which itself depends on batik.
+   # batik-1.14-modules is the "Reactor Build Order" extracted from the 
output of "mvn dependency:tree".
+   done < <(grep -v 
'\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' 
"${FILESDIR}"/batik-1.14-modules)
+
+   if use doc; then
+
+   JAVA_SRC_DIR=""
+   JAVA_JAR_FILENAME="ignoreme.jar"
+
+   while read module; do
+
+   # Some modules don't have source code
+   if [[ -d $module/src/main/java/org ]]; then
+   JAVA_SRC_DIR+=( "$module/src/main/java" )
+   fi
+
+   done < "${FILESDIR}"/batik-1.14-modules
+
+   java-pkg-simple_src_compile
+   fi
+}
+
+src_test() {
+
+   JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+   while read module; do
+
+   einfo "Testing $module"
+
+   JAVA_TEST_SRC_DIR=""
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Jakov Smolić]

commit: 8d6a311b8e350af560f3a7d7ce139ce69b52cbb0
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May  1 12:19:04 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May  1 12:19:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6a311b

dev-java/batik: Stabilize 1.14 x86, #710208

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/batik/batik-1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
index ff433f72241f..74222ffb9dd1 100644
--- a/dev-java/batik/batik-1.14.ebuild
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sam James]

commit: 46ee7151fb889e14a33e633d8502ae5bef87e946
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 19:19:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 19:19:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ee7151

dev-java/batik: Stabilize 1.14 ppc64, #710208

Signed-off-by: Sam James  gentoo.org>

 dev-java/batik/batik-1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
index 1b9aa2ba2064..ff433f72241f 100644
--- a/dev-java/batik/batik-1.14.ebuild
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Agostino Sarubbo]

commit: 200cdc398504c5810d11c87b5e697ae4ab453398
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Apr 29 06:04:13 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Apr 29 06:04:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200cdc39

dev-java/batik: amd64 stable wrt bug #710208

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/batik/batik-1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
index fa844886caec..1b9aa2ba2064 100644
--- a/dev-java/batik/batik-1.14.ebuild
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Arthur Zamarin]

commit: d8697dbeb028698270b050e4cab127bcfbce7b86
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr 12 18:29:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 12 18:29:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8697dbe

dev-java/batik: Keyword 1.14 arm64, #836755

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/batik/batik-1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
index f4be7b642036..fa844886caec 100644
--- a/dev-java/batik/batik-1.14.ebuild
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jacl:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/, dev-java/batik/files/

[Florian Schmaus]

commit: f05681e1984f759b0e7235b9ea373b9d27a8cff4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Mar 22 17:08:01 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Mar 29 08:26:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f05681e1

dev-java/batik: Bump to 1.14

Closes: https://bugs.gentoo.org/710208

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24382
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/batik/Manifest |   1 +
 dev-java/batik/batik-1.14.ebuild| 191 
 dev-java/batik/files/batik-1.14-modules |  33 +
 dev-java/batik/files/batik-squiggle.desktop |   9 ++
 dev-java/batik/metadata.xml |   4 +
 5 files changed, 238 insertions(+)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index d7732ad2c392..33f7b1515575 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1 +1,2 @@
+DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 
9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815
 SHA512 
689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
 DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 
4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606
 SHA512 
96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952

diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
new file mode 100644
index ..f4be7b642036
--- /dev/null
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 
--keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/;
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.14"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+   dev-java/jacl:0
+   dev-java/jython:2.7
+   dev-java/rhino:1.6
+   dev-java/xalan:0
+   dev-java/xml-commons-external:1.3
+   dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+   >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+   >=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,NOTICE,README} )
+
+S="${WORKDIR}/batik-${PV}"
+
+src_prepare() {
+   default
+   java-pkg_clean
+}
+
+src_compile() {
+
+   # We loop over the modules list and compile the jar files.
+   while read module ; do \
+
+   echo "compiling $module"
+
+   JAVA_SRC_DIR=""
+   JAVA_RESOURCE_DIRS=""
+   JAVA_JAR_FILENAME="$module.jar"
+   JAVA_MAIN_CLASS=""
+
+   # Not all of the modules have resources.
+   if [[ -d $module/src/main/resources ]]; then \
+   JAVA_RESOURCE_DIRS="$module/src/main/resources"
+   fi
+
+   # Don't let sed die on modules without MainClass.
+   JAVA_MAIN_CLASS=$( sed -n 
's:.*\(.*\):\1:p' $module/pom.xml )
+
+   # Some modules don't have source code.
+   if [[ -d $module/src/main/java/org ]]; then \
+   JAVA_SRC_DIR="$module/src/main/java"
+   java-pkg-simple_src_compile
+   else
+   # This case applies to batik-rasterizer.
+   if [[ -d $module/src/main/resources/org ]]; then \
+   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C 
"$module/src/main/resources" . || die
+   # Else for batik-rasterizer-ext, batik-squiggle and 
batik-squiggle-ext
+   else
+   jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . 
README || die
+   zip -d $module.jar "README"
+   fi
+   fi
+
+   JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+
+   rm -fr target || die
+
+   # Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts 
their jar files in the extensions
+   # directory, see 
batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+   # We keep them in the mudules list for later but omit them by 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/files/, dev-java/batik/

[Patrice Clement]

commit: bace0280856b81f8196ef01a831d074a72c392ac
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Oct 28 17:51:29 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Oct 28 17:57:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bace0280

dev-java/batik: patch file against missing import.

Patch JaclInterpreterFactory.java against a missing import. We will
remove it once Batik devs decide to cut a new release.

Courtesy of Martin von Gagern  gmx.net>.

See: https://issues.apache.org/jira/browse/BATIK-1123
See: http://svn.apache.org/viewvc?view=revision=1808872
Closes: https://bugs.gentoo.org/628812
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/batik/batik-1.9.ebuild |  3 +++
 dev-java/batik/files/batik-1.9-ImportInfo.patch | 10 ++
 2 files changed, 13 insertions(+)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 364f452f0a0..a223d4116d9 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -48,6 +48,9 @@ java_prepare() {
java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
done
 
+   # See bug 628812.
+   use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
+
cd lib || die
rm -v *.jar build/*.jar || die
use python && java-pkg_jar-from jython-2.7

diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch 
b/dev-java/batik/files/batik-1.9-ImportInfo.patch
new file mode 100644
index 000..103b99e1b96
--- /dev/null
+++ b/dev-java/batik/files/batik-1.9-ImportInfo.patch
@@ -0,0 +1,10 @@
+--- 
a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java
  2017-10-28 17:24:11.401276868 +
 
b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java
  2017-10-28 17:27:13.314255999 +
+@@ -20,6 +20,7 @@
+ 
+ import java.net.URL;
+ 
++import org.apache.batik.script.ImportInfo;
+ import org.apache.batik.script.Interpreter;
+ import org.apache.batik.script.InterpreterFactory;
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: 95cbaa87f0b70702ab7829ae642c3fa223e6683a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Oct 28 17:53:38 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Oct 28 17:57:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cbaa87

dev-java/batik: make a bunch of variables local.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/batik/batik-1.9.ebuild | 25 +++--
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index a223d4116d9..ab95a4c9432 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -26,24 +26,26 @@ CDEPEND="
dev-java/xml-commons-external:1.3"
 
 DEPEND="
-   >=virtual/jdk-1.6
-   ${CDEPEND}"
+   ${CDEPEND}
+   >=virtual/jdk-1.6"
 
 RDEPEND="
-   >=virtual/jre-1.6
-   ${CDEPEND}"
+   ${CDEPEND}
+   >=virtual/jre-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_GENTOO_CLASSPATH="
xml-commons-external-1.3
xmlgraphics-commons-2
-   xalan
rhino-1.6
-"
+   xalan"
 
-java_prepare() {
-   # bug #318323
+src_prepare() {
+   default
+
+   # See bug 318323.
+   local file
for file in build.xml contrib/rasterizertask/build.xml; do
java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
done
@@ -69,6 +71,7 @@ src_compile() {
 
 src_install() {
batik_unversion_jars() {
+   local jar
for jar in batik-*.jar; do
newj="${jar%-*}.jar"
java-pkg_newjar ${jar} ${newj}
@@ -88,11 +91,13 @@ src_install() {
dodoc README CHANGES
use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
 
-   # pwd fixes bug #116976
-   java-pkg_dolauncher batik-${SLOT} --pwd 
"${EPREFIX}/usr/share/${PN}-${SLOT}/" \
+   # See bug #116976.
+   java-pkg_dolauncher "batik-${SLOT}" \
+   --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
--main org.apache.batik.apps.svgbrowser.Main
 
# To find these lsjar batik-${SLOT} | grep Main.class
+   local launcher
for launcher in ttf2svg slideshow svgpp rasterizer; do
java-pkg_dolauncher batik-${launcher}-${SLOT} \
--main org.apache.batik.apps.${launcher}.Main

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: 559cca9d8919f426d7cb1f7998c8d4e9fa3ee476
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Oct 27 18:30:06 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Oct 27 18:30:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559cca9d

dev-java/batik: remove vulnerable version.

Bug: https://bugs.gentoo.org/616476
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/batik/Manifest|   1 -
 dev-java/batik/batik-1.8-r3.ebuild | 124 -
 2 files changed, 125 deletions(-)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index b6aab4243ba..105be6a4e52 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1 @@
-DIST batik-src-1.8.tar.gz 14970684 SHA256 
0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 
352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b
 WHIRLPOOL 
fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
 DIST batik-src-1.9.tar.gz 16748072 SHA256 
bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 
96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
 WHIRLPOOL 
b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25

diff --git a/dev-java/batik/batik-1.8-r3.ebuild 
b/dev-java/batik/batik-1.8-r3.ebuild
deleted file mode 100644
index 68d9e0c96d6..000
--- a/dev-java/batik/batik-1.8-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/;
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz;
-
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-   dev-java/xalan:0
-   dev-java/rhino:1.6
-   dev-java/xml-commons-external:1.3
-   dev-java/xmlgraphics-commons:2
-   python? (
-   dev-java/jython:2.7
-   )
-   tcl? (
-   dev-java/jacl:0
-   )
-   dev-java/ant-core:0"
-
-DEPEND="
-   >=virtual/jdk-1.6
-   ${CDEPEND}"
-
-RDEPEND="
-   >=virtual/jre-1.6
-   ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-   xml-commons-external-1.3
-   xmlgraphics-commons-2
-   xalan
-   rhino-1.6
-"
-
-java_prepare() {
-   # bug #318323
-   for file in build.xml contrib/rasterizertask/build.xml; do
-   java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
-   done
-
-   # Add some missing imports to avoid a compiling issue.
-   # https://bugs.gentoo.org/show_bug.cgi?id=551952
-   # https://issues.apache.org/jira/browse/BATIK-1123
-   local imports=()
-   
imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
-   
imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
-   for import in ${imports[@]}; do
-   einfo "Fixing missing import in ${import}"
-   sed -i '23i import org.apache.batik.script.ImportInfo;' 
${import} || die
-   eend $?
-   done
-
-   cd lib || die
-   rm -v *.jar build/*.jar || die
-   use python && java-pkg_jar-from jython-2.7
-   use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-   # Fails to build on amd64 without this
-   if use amd64 ; then
-   export ANT_OPTS="-Xmx1g"
-   else
-   export ANT_OPTS="-Xmx256m"
-   fi
-
-   eant jars all-jar $(use_doc)
-   cd contrib/rasterizertask || die
-   eant -Dgentoo.classpath="$(java-pkg_getjar ant-core 
ant.jar):../../classes" jar $(use_doc)
-
-   # batik-all-1.8.jar is a all-in-one jar that contains all other jars.
-   # We don't want to package it.
-   # No actually we do. See bug 556062.
-   # cd "${S}"/"${P}/lib" || die
-   # rm -v ${PN}-all-${PV}.jar || die
-}
-
-src_install() {
-   batik_unversion_jars() {
-   for jar in batik-*.jar; do
-   newj="${jar%-*}.jar"
-   java-pkg_newjar ${jar} ${newj}
-   done
-   }
-
-   # First unversion jars in ${P}/lib
-   cd "${S}"/"${P}"/lib || die
-   batik_unversion_jars
-
-   # Then, only those in ${P}
-   cd "${S}"/"${P}" || die
-   batik_unversion_jars
-
-   # Proceed with documentation installation
-   cd "${S}" || die

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Agostino Sarubbo]

commit: d63440f249aaf55baac00cd4b4ef00a4fe7e535f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 25 09:30:58 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 25 09:30:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63440f2

dev-java/batik: amd64 stable wrt bug #616476

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/batik/batik-1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 19ae6d955c9..364f452f0a0 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Thomas Deutschmann]

commit: 0f8a56b03d4e4472b46d273ef53472e2ebe3dde6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Oct  3 00:39:50 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Oct  3 00:39:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8a56b0

dev-java/batik: x86 stable (bug #616476)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-java/batik/batik-1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index d51d53b73d1..19ae6d955c9 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Sergei Trofimovich]

commit: 672311ad1927bdc77daed0d89aeedea53201085f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep 27 09:25:03 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 27 09:25:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=672311ad

dev-java/batik: stable 1.9 for ppc64, bug #616476

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 dev-java/batik/batik-1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 59092af2759..d51d53b73d1 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: 2bd8da0fc9240f6d7a9163470e952e26126cf392
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jun  4 18:49:47 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Aug  1 20:43:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd8da0f

dev-java/batik: version bump to 1.9.

Gentoo-Bug: https://bugs.gentoo.org/616476

Package-Manager: Portage-2.3.5, Repoman-2.3.2

Closes: https://github.com/gentoo/gentoo/pull/4850

 dev-java/batik/Manifest |   1 +
 dev-java/batik/batik-1.9.ebuild | 101 
 2 files changed, 102 insertions(+)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 79f320e6ee5..b6aab4243ba 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1 +1,2 @@
 DIST batik-src-1.8.tar.gz 14970684 SHA256 
0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 
352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b
 WHIRLPOOL 
fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
+DIST batik-src-1.9.tar.gz 16748072 SHA256 
bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 
96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
 WHIRLPOOL 
b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
new file mode 100644
index 000..59092af2759
--- /dev/null
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java based SVG toolkit"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/;
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz;
+
+LICENSE="Apache-2.0"
+SLOT="1.9"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+IUSE="doc python tcl"
+
+CDEPEND="
+   tcl? ( dev-java/jacl:0 )
+   python? ( dev-java/jython:2.7 )
+   dev-java/xalan:0
+   dev-java/rhino:1.6
+   dev-java/ant-core:0
+   dev-java/xmlgraphics-commons:2
+   dev-java/xml-commons-external:1.3"
+
+DEPEND="
+   >=virtual/jdk-1.6
+   ${CDEPEND}"
+
+RDEPEND="
+   >=virtual/jre-1.6
+   ${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+   xml-commons-external-1.3
+   xmlgraphics-commons-2
+   xalan
+   rhino-1.6
+"
+
+java_prepare() {
+   # bug #318323
+   for file in build.xml contrib/rasterizertask/build.xml; do
+   java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
+   done
+
+   cd lib || die
+   rm -v *.jar build/*.jar || die
+   use python && java-pkg_jar-from jython-2.7
+   use tcl && java-pkg_jar-from jacl
+}
+
+src_compile() {
+   # Fails to build on amd64 without this
+   export ANT_OPTS="-Xmx256m"
+   use amd64 && export ANT_OPTS="-Xmx1g"
+
+   eant jars all-jar $(use_doc)
+   cd contrib/rasterizertask || die
+   eant -Dgentoo.classpath="$(java-pkg_getjar ant-core 
ant.jar):../../classes" jar $(use_doc)
+}
+
+src_install() {
+   batik_unversion_jars() {
+   for jar in batik-*.jar; do
+   newj="${jar%-*}.jar"
+   java-pkg_newjar ${jar} ${newj}
+   done
+   }
+
+   # First unversion jars in ${P}/lib
+   cd "${S}/${P}/lib" || die
+   batik_unversion_jars
+
+   # Then, only those in ${P}
+   cd "${S}/${P}" || die
+   batik_unversion_jars
+
+   # Proceed with documentation installation
+   cd "${S}" || die
+   dodoc README CHANGES
+   use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
+
+   # pwd fixes bug #116976
+   java-pkg_dolauncher batik-${SLOT} --pwd 
"${EPREFIX}/usr/share/${PN}-${SLOT}/" \
+   --main org.apache.batik.apps.svgbrowser.Main
+
+   # To find these lsjar batik-${SLOT} | grep Main.class
+   for launcher in ttf2svg slideshow svgpp rasterizer; do
+   java-pkg_dolauncher batik-${launcher}-${SLOT} \
+   --main org.apache.batik.apps.${launcher}.Main
+   done
+
+   # Install and register the ant task.
+   java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
+   java-pkg_register-ant-task
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: 5ee679dea2ee4879d2d29ca6fbf39ef9c7c04dbe
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Mar  2 13:50:03 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Mar  2 13:51:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee679de

dev-java/batik: Fix typo.

java-pkg_jar-from points to "jython" whilst it should be "jython-2.7".

Gentoo-Bug: https://bugs.gentoo.org/576180

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/batik/batik-1.8-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.8-r3.ebuild 
b/dev-java/batik/batik-1.8-r3.ebuild
index fa57219..b7869cc 100644
--- a/dev-java/batik/batik-1.8-r3.ebuild
+++ b/dev-java/batik/batik-1.8-r3.ebuild
@@ -65,7 +65,7 @@ java_prepare() {
 
cd lib || die
rm -v *.jar build/*.jar || die
-   use python && java-pkg_jar-from jython
+   use python && java-pkg_jar-from jython-2.7
use tcl && java-pkg_jar-from jacl
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: 123c9cd2dc6314fc171e943165dd67415b17677c
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Feb  8 00:11:32 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Feb  8 00:11:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123c9cd2

dev-java/batik: jython SLOT bump wrt bug 552452.

Package-Manager: portage-2.2.26
RepoMan-Options: --force
Signed-off-by: Patrice Clement  gentoo.org>

 .../{batik-1.8-r2.ebuild => batik-1.8-r3.ebuild}  | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/dev-java/batik/batik-1.8-r2.ebuild 
b/dev-java/batik/batik-1.8-r3.ebuild
similarity index 95%
rename from dev-java/batik/batik-1.8-r2.ebuild
rename to dev-java/batik/batik-1.8-r3.ebuild
index 7d4a6fb..fa57219 100644
--- a/dev-java/batik/batik-1.8-r2.ebuild
+++ b/dev-java/batik/batik-1.8-r3.ebuild
@@ -16,16 +16,25 @@ SLOT="1.8"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
-CDEPEND="dev-java/xalan:0
+CDEPEND="
+   dev-java/xalan:0
dev-java/rhino:1.6
dev-java/xml-commons-external:1.3
dev-java/xmlgraphics-commons:2
-   python? ( dev-java/jython:0 )
-   tcl? ( dev-java/jacl:0 )
+   python? (
+   dev-java/jython:2.7
+   )
+   tcl? (
+   dev-java/jacl:0
+   )
dev-java/ant-core:0"
-DEPEND=">=virtual/jdk-1.6
+
+DEPEND="
+   >=virtual/jdk-1.6
${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
+
+RDEPEND="
+   >=virtual/jre-1.6
${CDEPEND}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: eec96d20c698bb7c31b5394d17588de034b22e03
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Oct  8 16:06:48 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Oct  8 22:05:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec96d20

dev-java/batik: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/batik/batik-1.8-r1.ebuild | 116 -
 1 file changed, 116 deletions(-)

diff --git a/dev-java/batik/batik-1.8-r1.ebuild 
b/dev-java/batik/batik-1.8-r1.ebuild
deleted file mode 100644
index 7294a5a..000
--- a/dev-java/batik/batik-1.8-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/;
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz;
-
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="dev-java/xalan:0
-   dev-java/rhino:1.6
-   dev-java/xml-commons-external:1.3
-   dev-java/xmlgraphics-commons:2
-   python? ( dev-java/jython:0 )
-   tcl? ( dev-java/jacl:0 )
-   dev-java/ant-core:0"
-DEPEND=">=virtual/jdk-1.6
-   ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-   ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-   xml-commons-external-1.3
-   xmlgraphics-commons-2
-   xalan
-   rhino-1.6
-"
-
-java_prepare() {
-   # bug #318323
-   for file in build.xml contrib/rasterizertask/build.xml; do
-   java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v 
no -a maxmemory -v 512m
-   done
-
-   # Add some missing imports to avoid a compiling issue.
-   # https://bugs.gentoo.org/show_bug.cgi?id=551952
-   # https://issues.apache.org/jira/browse/BATIK-1123
-   local imports=()
-   
imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
-   
imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
-   for import in ${imports[@]}; do
-   einfo "Fixing missing import in ${import}"
-   sed -i '23i import org.apache.batik.script.ImportInfo;' 
${import} || die
-   eend $?
-   done
-
-   cd lib || die
-   rm -v *.jar build/*.jar || die
-   use python && java-pkg_jar-from jython
-   use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-   # Fails to build on amd64 without this
-   if use amd64 ; then
-   export ANT_OPTS="-Xmx1g"
-   else
-   export ANT_OPTS="-Xmx256m"
-   fi
-
-   eant jars all-jar $(use_doc)
-   cd contrib/rasterizertask || die
-   eant -Dgentoo.classpath="$(java-pkg_getjar ant-core 
ant.jar):../../classes" jar $(use_doc)
-
-   cd "${S}"/"${P}/lib" || die
-
-   # batik-all-1.8.jar is a all-in-one jar that contains all other jars.
-   # We don't want to package it.
-   rm -v ${PN}-all-${PV}.jar || die
-}
-
-src_install() {
-   batik_unversion_jars() {
-   for jar in batik-*.jar; do
-   newj="${jar%-*}.jar"
-   java-pkg_newjar ${jar} ${newj}
-   done
-   }
-
-   # First unversion jars in ${P}/lib
-   cd "${S}"/"${P}"/lib || die
-   batik_unversion_jars
-
-   # Then, only those in ${P}
-   cd "${S}"/"${P}" || die
-   batik_unversion_jars
-
-   # Proceed with documentation installation
-   cd "${S}" || die
-   dodoc README CHANGES
-   use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
-   # pwd fixes bug #116976
-   java-pkg_dolauncher batik-${SLOT} --pwd 
"${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-   --main org.apache.batik.apps.svgbrowser.Main
-
-   # To find these lsjar batik-${SLOT} | grep Main.class
-   for launcher in ttf2svg slideshow svgpp rasterizer; do
-   java-pkg_dolauncher batik-${launcher}-${SLOT} \
-   --main org.apache.batik.apps.${launcher}.Main
-   done
-
-   # Install and register the ant task.
-   java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-   java-pkg_register-ant-task
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

[Patrice Clement]

commit: 504fe1e4ca0d54a841d4454a0a127705746c70b8
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Oct  8 13:08:00 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Oct  8 22:05:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504fe1e4

dev-java/batik: Stable for amd64. Stable for ppc+ppc64+x86 using the ALLARCHES 
policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/batik/batik-1.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/batik/batik-1.8-r2.ebuild 
b/dev-java/batik/batik-1.8-r2.ebuild
index 3de7fc0..79bf96d 100644
--- a/dev-java/batik/batik-1.8-r2.ebuild
+++ b/dev-java/batik/batik-1.8-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.8"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="dev-java/xalan:0