[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 5cd6b2793f1989909ea37c55f6f23a9f9e1cf79d
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Apr 17 09:27:18 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Apr 17 09:36:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd6b279
dev-java/fop: move dev-java/ant to CP_DEPEND
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/35723/commits/7cf257fad30a8e975eab487d36f1333d3550cd9c
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/fop-2.9-r1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-java/fop/fop-2.9-r1.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
index 7d81868091b4..c9268c877d7d 100644
--- a/dev-java/fop/fop-2.9-r1.ebuild
+++ b/dev-java/fop/fop-2.9-r1.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
"
CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
dev-java/batik:1.16
dev-java/commons-io:1
dev-java/commons-logging:0
@@ -43,7 +44,6 @@ CP_DEPEND="
DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
- >=dev-java/ant-1.10.14-r3:0
test? (
dev-java/mockito:2
dev-java/pdfbox:0
@@ -52,7 +52,6 @@ DEPEND="${CP_DEPEND}
"
RDEPEND="${CP_DEPEND}
- >=dev-java/ant-1.10.14-r3:0
>=virtual/jre-1.8:*"
DOCS=( NOTICE README )
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 4f75503ec1714b534e8f932754377133a767e8db
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Mar 15 11:58:34 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Apr 17 09:14:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f75503e
dev-java/fop: switch to dev-java/ant
Also move sun-jai-bin and javax-serrvlet-api to CP_DEPEND since these
are also needed on runtime.
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/35723/commits/19f6a7eabaa33128869a6b2df621a0cfd6642d25
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/{fop-2.9.ebuild => fop-2.9-r1.ebuild} | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
similarity index 96%
rename from dev-java/fop/fop-2.9.ebuild
rename to dev-java/fop/fop-2.9-r1.ebuild
index e691baf0a9e9..7d81868091b4 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9-r1.ebuild
@@ -35,15 +35,15 @@ CP_DEPEND="
dev-java/commons-io:1
dev-java/commons-logging:0
dev-java/fontbox:0
+ dev-java/javax-servlet-api:2.2
dev-java/qdox:1.12
+ dev-java/sun-jai-bin:0
dev-java/xmlgraphics-commons:2
"
DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
- dev-java/ant-core:0
- dev-java/javax-servlet-api:2.2
- dev-java/sun-jai-bin:0
+ >=dev-java/ant-1.10.14-r3:0
test? (
dev-java/mockito:2
dev-java/pdfbox:0
@@ -52,6 +52,7 @@ DEPEND="${CP_DEPEND}
"
RDEPEND="${CP_DEPEND}
+ >=dev-java/ant-1.10.14-r3:0
>=virtual/jre-1.8:*"
DOCS=( NOTICE README )
@@ -63,12 +64,6 @@ PATCHES=(
"${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch"
)
-JAVA_CLASSPATH_EXTRA="
- ant-core
- javax-servlet-api-2.2
- sun-jai-bin
-"
-
src_unpack() {
if use verify-sig; then
verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
@@ -83,6 +78,9 @@ src_prepare() {
}
src_compile() {
+ # while ant could install multiple jar files we only need ant.jar
+ JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)"
+
JAVA_JAR_FILENAME="fop-util.jar"
JAVA_SRC_DIR="fop-util/src/main/java"
java-pkg-simple_src_compile
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 74b84e12566f40acdb775f649677feff8264d69d
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Feb 22 07:09:45 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Feb 22 13:45:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b84e12
dev-java/fop: adjust SRC_URI
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/fop-2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index b8d147c876c1..9268af5e38fb 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://xmlgraphics.apache.org/fop/;
SRC_URI="
mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
- verify-sig? (
https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
+ verify-sig? (
https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
test? (
https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
"
S="${WORKDIR}/fop-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/files/, dev-java/fop/
commit: 84e8700135cb51435adec7cf9e049ef3fd92d004
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Feb 22 07:01:00 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Feb 22 13:45:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e87001
dev-java/fop: drop 2.8-r1
Closes: https://bugs.gentoo.org/903880
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/Manifest | 2 -
.../fop/files/fop-2.8-skip-failing-tests.patch | 48 --
dev-java/fop/fop-2.8-r1.ebuild | 188 -
3 files changed, 238 deletions(-)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 5080bc909c93..09319bb63d30 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,6 +1,4 @@
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B
79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c
SHA512
71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
-DIST fop-2.8-src.tar.gz 22855369 BLAKE2B
183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02
SHA512
22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
-DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B
f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b
SHA512
c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de
DIST fop-2.9-src.tar.gz 20642865 BLAKE2B
6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a
SHA512
d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093
DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B
284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f
SHA512
404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
DIST fop-hyph-2.0.jar 6655933 BLAKE2B
bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164
SHA512
3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
diff --git a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
deleted file mode 100644
index 729795e93fd2..
--- a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# https://bugs.gentoo.org/903880
a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
-+++
b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
-@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource;
-
- import org.custommonkey.xmlunit.Diff;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.w3c.dom.Document;
- import org.xml.sax.SAXException;
- import org.xml.sax.helpers.AttributesImpl;
-@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase {
- assertNull(d.getStructureTreeEventHandler().startNode("table-body",
null, null));
- }
-
--@Test
-+@Test @Ignore
- public void testRemoveBlocks() throws Exception {
- keepEmptyTags = false;
- compare("http://www.w3.org/1999/XSL/Format\;>\n"
-@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase {
- + "\n");
- }
-
--@Test
-+@Test @Ignore
- public void testRemoveTableHeader() throws Exception {
- keepEmptyTags = false;
- String fo = IOUtils.toString(getResource("table-artifact.fo"),
"utf8").replace("role=\"artifact\"", "");
a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
-+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
-@@ -25,6 +25,7 @@ import java.io.File;
- import java.io.IOException;
-
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.xml.sax.SAXException;
-
- import static org.junit.Assert.assertEquals;
-@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest {
- * Test using a standard FOP font
- * @throws Exception checkstyle wants a comment here, even a silly one
- */
--@Test
-+@Test @Ignore
- public void testPDFEncodingWithStandardFont() throws Exception {
-
- /* If the PDF encoding is correct, a text dump of the generated PDF
file contains this
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 37534cb842626af2084fe6ee0dabf7f778593986
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Feb 22 07:17:05 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Feb 22 13:45:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37534cb8
dev-java/fop: merge shadowed BDEPEND
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35484
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/fop-2.9.ebuild | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index 9268af5e38fb..e691baf0a9e9 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -23,6 +23,13 @@ LICENSE="Apache-2.0"
SLOT="2.8"
KEYWORDS="amd64 ~arm64 ppc64 x86"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
+
+BDEPEND="
+ dev-java/xalan:0
+ verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )
+"
+
CP_DEPEND="
dev-java/batik:1.16
dev-java/commons-io:1
@@ -47,8 +54,6 @@ DEPEND="${CP_DEPEND}
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
-BDEPEND="dev-java/xalan:0"
-
DOCS=( NOTICE README )
PATCHES=(
@@ -64,8 +69,6 @@ JAVA_CLASSPATH_EXTRA="
sun-jai-bin
"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
src_unpack() {
if use verify-sig; then
verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 44aae5886719c9bfbfb5677af4668ced50206a1a
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Feb 21 02:25:58 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 22 04:45:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44aae588
dev-java/fop: Stabilize 2.9 x86, #923915
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-java/fop/fop-2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index d9359d0447ac..b8d147c876c1 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: b7eb97c3a17adfb4aeca9dc8624dfb18b2532c32
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Feb 6 19:32:01 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Feb 6 19:32:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7eb97c3
dev-java/fop: Stabilize 2.9 amd64, #923915
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/fop/fop-2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index 2252537fa0cd..d9359d0447ac 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 9ea1faeca66b527ee3f9f1f8cd0d03067d329d2f
Author: Sam James gentoo org>
AuthorDate: Tue Feb 6 19:29:17 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 6 19:29:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea1faec
dev-java/fop: Stabilize 2.9 ppc64, #923915
Signed-off-by: Sam James gentoo.org>
dev-java/fop/fop-2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index f001831b1cff..2252537fa0cd 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 2364b69485eeb8020c43b09354adcd57e067e347
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Feb 5 18:16:44 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Feb 6 09:43:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2364b694
dev-java/fop: fix test failures
Closes: https://bugs.gentoo.org/918867
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35195
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/fop-2.9.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index 63bf4d2080f1..f001831b1cff 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.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
@@ -151,6 +151,8 @@ src_test() {
# This jar file was created manually from the output of "mvn test".
# Upstream does this with maven-antrun-plugin
jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
+ mkdir generated-test || die
+ mv {target/test-classes,generated-test}/org || die
java-pkg-simple_src_test
einfo "Testing fop-core"
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/files/, dev-java/fop/
commit: a626db0289f7ddb5f1ab029e18b665d8ea784d19 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Sep 6 18:04:21 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Sep 20 07:30:31 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a626db02 dev-java/fop: add 2.9 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32925 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/fop/Manifest | 2 + ...fop-2.9-FO2StructureTreeConverterTestCase.patch | 45 + .../fop-2.9-MissingLanguageWarningTestCase.patch | 88 + .../fop/files/fop-2.9-PDFEncodingTestCase.patch| 31 .../files/fop-2.9-PDFToUnicodeCMapTestCase.patch | 33 dev-java/fop/fop-2.9.ebuild| 199 + 6 files changed, 398 insertions(+) diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index 0d9b604c3ef6..5080bc909c93 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -1,4 +1,6 @@ DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6 DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357 DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b SHA512 c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de +DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 +DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3 diff --git a/dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch b/dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch new file mode 100644 index ..87e36eb4b49c --- /dev/null +++ b/dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch @@ -0,0 +1,45 @@ +There were 2 failures: +1) testRemoveBlocks(org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase) +org.junit.ComparisonFailure: expected:<0" encoding="UTF-8"[ standalone="no"]?> but was:<0" encoding="UTF-8"[]?> +at org.junit.Assert.assertEquals(Assert.java:117) +at org.junit.Assert.assertEquals(Assert.java:146) +at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.compare(FO2StructureTreeConverterTestCase.java:225) +at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.testRemoveBlocks(FO2StructureTreeConverterTestCase.java:150) +2) testRemoveTableHeader(org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase) +org.junit.ComparisonFailure: expected:<0" encoding="UTF-8"[ standalone="no"]?> but was:<0" encoding="UTF-8"[]?> +at org.junit.Assert.assertEquals(Assert.java:117) +at org.junit.Assert.assertEquals(Assert.java:146) +at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.compare(FO2StructureTreeConverterTestCase.java:225) +at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.testRemoveTableHeader(FO2StructureTreeConverterTestCase.java:187) + +FAILURES!!! +Tests run: 11, Failures: 2 + +--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java +@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource; + + import org.custommonkey.xmlunit.Diff; + import org.junit.Test; ++import org.junit.Ignore; + import org.w3c.dom.Document; + import org.xml.sax.SAXException; + import org.xml.sax.helpers.AttributesImpl;
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: a4618c2843b94f26c42e47af20e1ec09e22051ce
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue May 9 06:04:22 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed May 10 04:57:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4618c28
dev-java/fop: drop 2.8
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/fop-2.8.ebuild | 166
1 file changed, 166 deletions(-)
diff --git a/dev-java/fop/fop-2.8.ebuild b/dev-java/fop/fop-2.8.ebuild
deleted file mode 100644
index e78205ca474e..
--- a/dev-java/fop/fop-2.8.ebuild
+++ /dev/null
@@ -1,166 +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:fop:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Graphics Format Object Processor All-In-One"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/;
-SRC_URI="
- mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
- https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
-"
-S="${WORKDIR}/fop-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/batik:1.16
- dev-java/commons-io:1
- dev-java/commons-logging:0
- dev-java/fontbox:0
- dev-java/qdox:1.12
- dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- dev-java/javax-servlet-api:2.2
- dev-java/sun-jai-bin:0
- test? (
- dev-java/mockito:4
- dev-java/pdfbox:0
- dev-java/xmlunit:1
- )
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="dev-java/xalan:0"
-
-DOCS=( NOTICE README )
-
-JAVA_CLASSPATH_EXTRA="
- ant-core
- javax-servlet-api-2.2
- sun-jai-bin
-"
-
-src_prepare() {
- java-pkg_clean
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- JAVA_SRC_DIR="fop-util/src/main/java"
- JAVA_JAR_FILENAME="fop-util.jar"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
- rm -r target || die
-
- JAVA_SRC_DIR="fop-events/src/main/java"
- JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
- JAVA_JAR_FILENAME="fop-events.jar"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
- rm -r target || die
-
- JAVA_SRC_DIR="fop-core/src/main/java"
- JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
- JAVA_MAIN_CLASS=$( sed -n 's:.*\(.*\):\1:p'
fop-core/pom.xml )
- JAVA_JAR_FILENAME="fop-core.jar"
- # Code generation according to
- #
https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
- pushd fop-core/src/main/codegen/fonts > /dev/null || die
- local fonts=$(find . -name "Courier*.xml" \
- -o -name "Helvetica*.xml" \
- -o -name "Times*.xml" \
- -o -name "Symbol.xml" \
- -o -name "ZapfDingbats.xml"
- )
- for font in ${fonts}; do \
- xalan -XSLTC \
- -IN $font \
- -XSL font-file.xsl \
- -OUT
../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
- done
- xalan -XSLTC \
- -IN encodings.xml \
- -XSL code-point-mapping.xsl \
- -OUT
../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
- popd > /dev/null || die
- java-pkg-simple_src_compile
- rm -r target || die
-
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
-
- # Update "fop-core.jar" with "event-mode.xml" files produced manually
- # by running "mvn package".
- mkdir event-model && pushd $_ > /dev/null || die
- jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
- popd > /dev/null || die
- jar -uf "fop-core.jar" -C event-model . || die
- # Upstream does this with maven-antrun-plugin:
- #
https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
-
- # public class EventProducerCollectorTask extends Task {
- #
- # private List filesets = new
java.util.ArrayList();
- # private File destDir;
- # private File translationFile;
-
- if use doc; then \
- JAVA_SRC_DIR=(
- "fop-util/src/main/java"
- "fop-events/src/main/java"
- "fop-core/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 29ff19a472dc85279d3ae3311d39714de6c118f8
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue May 9 05:51:24 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue May 9 05:51:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ff19a4
dev-java/fop: Stabilize 2.8-r1 x86, #905857
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/fop/fop-2.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
index 56a5baa59c55..ddd660e61c1d 100644
--- a/dev-java/fop/fop-2.8-r1.ebuild
+++ b/dev-java/fop/fop-2.8-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 94f6a486aa52282068fba7ec8ecb640572fa26d1
Author: Jakov Smolić gentoo org>
AuthorDate: Sun May 7 13:39:53 2023 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun May 7 13:39:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f6a486
dev-java/fop: Stabilize 2.8-r1 ppc64, #905857
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/fop/fop-2.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
index fb67b3fb784f..56a5baa59c55 100644
--- a/dev-java/fop/fop-2.8-r1.ebuild
+++ b/dev-java/fop/fop-2.8-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: fcce855546b8d558a6b040f33c9de5f1bb3bb285
Author: Sam James gentoo org>
AuthorDate: Sun May 7 11:45:23 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 7 11:45:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcce8555
dev-java/fop: Stabilize 2.8-r1 amd64, #905857
Signed-off-by: Sam James gentoo.org>
dev-java/fop/fop-2.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
index 487cd4d7cade..fb67b3fb784f 100644
--- a/dev-java/fop/fop-2.8-r1.ebuild
+++ b/dev-java/fop/fop-2.8-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/, dev-java/fop/files/
commit: bfa1d6c232c00963d4485bd5057a6a11217f7b3a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Mar 31 10:24:39 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Apr 7 08:09:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa1d6c2
dev-java/fop: enable tests on the fop-core module
Adds verify-sig
Switches test dependency mockito:4 -> mockito:2
Skips one failing test via selection:
! -name 'MissingLanguageWarningTestCase.java' \
Skips three other failing tests via patch:
PATCHES=( "${FILESDIR}/fop-2.8-skip-failing-tests.patch" )
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30491
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/Manifest | 2 +
.../fop/files/fop-2.8-skip-failing-tests.patch | 48 ++
dev-java/fop/fop-2.8-r1.ebuild | 187 +
3 files changed, 237 insertions(+)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 4f4eb358b352..0d9b604c3ef6 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,2 +1,4 @@
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B
79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c
SHA512
71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
DIST fop-2.8-src.tar.gz 22855369 BLAKE2B
183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02
SHA512
22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
+DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B
f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b
SHA512
c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de
+DIST fop-hyph-2.0.jar 6655933 BLAKE2B
bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164
SHA512
3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
diff --git a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
new file mode 100644
index ..729795e93fd2
--- /dev/null
+++ b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
@@ -0,0 +1,48 @@
+# https://bugs.gentoo.org/903880
+---
a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
+@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource;
+
+ import org.custommonkey.xmlunit.Diff;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.w3c.dom.Document;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.AttributesImpl;
+@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase {
+ assertNull(d.getStructureTreeEventHandler().startNode("table-body",
null, null));
+ }
+
+-@Test
++@Test @Ignore
+ public void testRemoveBlocks() throws Exception {
+ keepEmptyTags = false;
+ compare("http://www.w3.org/1999/XSL/Format\;>\n"
+@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase {
+ + "\n");
+ }
+
+-@Test
++@Test @Ignore
+ public void testRemoveTableHeader() throws Exception {
+ keepEmptyTags = false;
+ String fo = IOUtils.toString(getResource("table-artifact.fo"),
"utf8").replace("role=\"artifact\"", "");
+--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
+@@ -25,6 +25,7 @@ import java.io.File;
+ import java.io.IOException;
+
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.xml.sax.SAXException;
+
+ import static org.junit.Assert.assertEquals;
+@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest {
+ * Test using a standard FOP font
+ * @throws Exception checkstyle wants a comment here, even a silly one
+ */
+-@Test
++@Test @Ignore
+ public void testPDFEncodingWithStandardFont() throws Exception {
+
+ /* If the PDF encoding is correct, a text dump of the generated PDF
file contains this (excerpts)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
new file mode 100644
index ..487cd4d7cade
--- /dev/null
+++ b/dev-java/fop/fop-2.8-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: f882ffe3f179188bc6c2167453279234574cd7c5
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Apr 4 20:37:42 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Apr 5 10:56:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f882ffe3
dev-java/fop: drop 2.7
Closes: https://bugs.gentoo.org/903672
Bug: https://bugs.gentoo.org/903687
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/Manifest | 1 -
dev-java/fop/fop-2.7.ebuild | 158
2 files changed, 159 deletions(-)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 6e6c52d90a47..4f4eb358b352 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,3 +1,2 @@
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B
79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c
SHA512
71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
-DIST fop-2.7-src.tar.gz 26799877 BLAKE2B
00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a
SHA512
bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
DIST fop-2.8-src.tar.gz 22855369 BLAKE2B
183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02
SHA512
22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
deleted file mode 100644
index a40189884199..
--- a/dev-java/fop/fop-2.7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 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:fop:2.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Graphics Format Object Processor All-In-One"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/;
-SRC_URI="
- mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
- https://dev.gentoo.org/~flow/distfiles/fop/${P}-jars.tar.xz
-"
-
-LICENSE="Apache-2.0"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/batik:1.14
- dev-java/commons-io:1
- dev-java/fontbox:0
- dev-java/qdox:1.12
- dev-java/sun-jai-bin:0
- dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- dev-java/sun-jai-bin:0
- test? (
- dev-java/mockito:4
- dev-java/pdfbox:0
- dev-java/xmlunit:1
- )
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( NOTICE README )
-
-S="${WORKDIR}/fop-${PV}"
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_compile() {
- JAVA_SRC_DIR="fop-util/src/main/java"
- JAVA_JAR_FILENAME="fop-util.jar"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
- rm -r target || die
-
- JAVA_SRC_DIR="fop-events/src/main/java"
- JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
- JAVA_JAR_FILENAME="fop-events.jar"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
- rm -r target || die
-
- JAVA_SRC_DIR="fop-core/src/main/java"
- JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
- JAVA_MAIN_CLASS=$( sed -n 's:.*\(.*\):\1:p'
fop-core/pom.xml )
- JAVA_JAR_FILENAME="fop-core.jar"
- # Code generation according to
- #
https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L150-L219
- pushd fop-core/src/main/codegen/fonts >/dev/null || die
- local fonts=$(find . -name "Courier*.xml" \
- -o -name "Helvetica*.xml" \
- -o -name "Times*.xml" \
- -o -name "Symbol.xml" \
- -o -name "ZapfDingbats.xml"
- )
- for font in ${fonts}; do \
- xalan -XSLTC \
- -IN $font \
- -XSL font-file.xsl \
- -OUT
../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
- done
- xalan -XSLTC \
- -IN encodings.xml \
- -XSL code-point-mapping.xsl \
- -OUT
../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
- popd
- java-pkg-simple_src_compile
- rm -r target || die
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 0a14334b04a7b45e0c4de54b0de73ee894860c09
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=0a14334b
dev-java/fop: Stabilize 2.8 amd64, #903725
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/fop/fop-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.8.ebuild b/dev-java/fop/fop-2.8.ebuild
index f6207b46c778..e78205ca474e 100644
--- a/dev-java/fop/fop-2.8.ebuild
+++ b/dev-java/fop/fop-2.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: dca3a058a2cdd77d26d879f8d4cc4970237c9659
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=dca3a058
dev-java/fop: Stabilize 2.8 x86, #903725
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/fop/fop-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.8.ebuild b/dev-java/fop/fop-2.8.ebuild
index 71cd343177d5..f6207b46c778 100644
--- a/dev-java/fop/fop-2.8.ebuild
+++ b/dev-java/fop/fop-2.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 46552e228474a08a7969f1c6a8f22b382bd024c8
Author: Sam James gentoo org>
AuthorDate: Mon Apr 3 21:39:55 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 3 21:40:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46552e22
dev-java/fop: Stabilize 2.8 ppc64, #903725
Signed-off-by: Sam James gentoo.org>
dev-java/fop/fop-2.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.8.ebuild b/dev-java/fop/fop-2.8.ebuild
index 0f57b74075c1..71cd343177d5 100644
--- a/dev-java/fop/fop-2.8.ebuild
+++ b/dev-java/fop/fop-2.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
CP_DEPEND="
dev-java/batik:1.16
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: a3ba7f162cb4eab8faa2111d5b9347c2b9255839
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Mar 31 10:24:39 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Apr 1 05:25:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ba7f16
dev-java/fop: add 2.8
Switches to batik:1.16 where support for jython is dropped
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30421
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/fop/Manifest | 1 +
dev-java/fop/fop-2.8.ebuild | 166
2 files changed, 167 insertions(+)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 0cbe07fc9d42..6e6c52d90a47 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,2 +1,3 @@
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B
79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c
SHA512
71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
DIST fop-2.7-src.tar.gz 26799877 BLAKE2B
00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a
SHA512
bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
+DIST fop-2.8-src.tar.gz 22855369 BLAKE2B
183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02
SHA512
22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
diff --git a/dev-java/fop/fop-2.8.ebuild b/dev-java/fop/fop-2.8.ebuild
new file mode 100644
index ..0f57b74075c1
--- /dev/null
+++ b/dev-java/fop/fop-2.8.ebuild
@@ -0,0 +1,166 @@
+# 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:fop:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/;
+SRC_URI="
+ mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+ https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
+"
+S="${WORKDIR}/fop-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2.8"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/batik:1.16
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+ dev-java/fontbox:0
+ dev-java/qdox:1.12
+ dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ dev-java/javax-servlet-api:2.2
+ dev-java/sun-jai-bin:0
+ test? (
+ dev-java/mockito:4
+ dev-java/pdfbox:0
+ dev-java/xmlunit:1
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="dev-java/xalan:0"
+
+DOCS=( NOTICE README )
+
+JAVA_CLASSPATH_EXTRA="
+ ant-core
+ javax-servlet-api-2.2
+ sun-jai-bin
+"
+
+src_prepare() {
+ java-pkg_clean
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ JAVA_SRC_DIR="fop-util/src/main/java"
+ JAVA_JAR_FILENAME="fop-util.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+ rm -r target || die
+
+ JAVA_SRC_DIR="fop-events/src/main/java"
+ JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+ JAVA_JAR_FILENAME="fop-events.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+ rm -r target || die
+
+ JAVA_SRC_DIR="fop-core/src/main/java"
+ JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+ JAVA_MAIN_CLASS=$( sed -n 's:.*\(.*\):\1:p'
fop-core/pom.xml )
+ JAVA_JAR_FILENAME="fop-core.jar"
+ # Code generation according to
+ #
https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
+ pushd fop-core/src/main/codegen/fonts > /dev/null || die
+ local fonts=$(find . -name "Courier*.xml" \
+ -o -name "Helvetica*.xml" \
+ -o -name "Times*.xml" \
+ -o -name "Symbol.xml" \
+ -o -name "ZapfDingbats.xml"
+ )
+ for font in ${fonts}; do \
+ xalan -XSLTC \
+ -IN $font \
+ -XSL font-file.xsl \
+ -OUT
../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+ done
+ xalan -XSLTC \
+ -IN encodings.xml \
+ -XSL code-point-mapping.xsl
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/files/, dev-java/fop/
commit: c10da10bc5d295f20ed764377f3e1ca63ff77b95
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu May 5 16:19:59 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon May 9 17:21:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10da10b
dev-java/fop: drop 2.0-r3
Closes: https://bugs.gentoo.org/834482
Closes: https://bugs.gentoo.org/634744
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/fop/Manifest | 1 -
dev-java/fop/files/headless-launcher.bash | 1 -
dev-java/fop/fop-2.0-r3.ebuild| 129 --
3 files changed, 131 deletions(-)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 27bd73277440..0cbe07fc9d42 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,3 +1,2 @@
-DIST fop-2.0-src.zip 26381859 BLAKE2B
8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395
SHA512
428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B
79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c
SHA512
71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
DIST fop-2.7-src.tar.gz 26799877 BLAKE2B
00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a
SHA512
bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
diff --git a/dev-java/fop/files/headless-launcher.bash
b/dev-java/fop/files/headless-launcher.bash
deleted file mode 100644
index a01c56f5e6ef..
--- a/dev-java/fop/files/headless-launcher.bash
+++ /dev/null
@@ -1 +0,0 @@
-[[ "${!#}" = "-awt" ]] || gjl_java_args="-Djava.awt.headless=true"
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
deleted file mode 100644
index 6265183f67ad..
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs'
ant target), currently it cannot
-# be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/;
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="
- dev-java/batik:1.9
- dev-java/ant-core:0
- dev-java/fontbox:1.7
- dev-java/commons-io:1
- dev-java/commons-logging:0
- java-virtuals/servlet-api:3.0
- dev-java/avalon-framework:4.2
- dev-java/xmlgraphics-commons:2
- dev-java/xml-commons-external:1.3
- dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-# test? (
-# dev-java/ant-junit:0
-# dev-java/junit:4
-# dev-java/xmlunit:1
-# dev-java/mockito:0
-# )"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
- ant-core
- batik-1.9
- fontbox-1.7
- commons-io-1
- commons-logging
- servlet-api-3.0
- avalon-framework-4.2
- xmlgraphics-commons-2
- xml-commons-external-1.3
-"
-
-TARGETS=(
- resourcegen
- jar-hyphenation
- jar-sandbox
- jar-main
-)
-
-java_prepare() {
- find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
- # https://bugs.gentoo.org/show_bug.cgi?id=554386
- # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
- java-pkg_jar-from --into lib qdox-1.12 qdox.jar
- java-pkg_jar-from --into lib xmlgraphics-commons-2
xmlgraphics-commons.jar
- java-pkg_jar-from --into lib commons-logging commons-logging.jar
- java-pkg_jar-from --into lib commons-io-1 commons-io.jar
- java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
- java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
- java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
- java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
- java-pkg_jar-from --virtual
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 18f41bf0c80ab2e988a61250b01299e06e88fd04 Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 7 17:54:04 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 7 17:54:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f41bf0 dev-java/fop: Stabilize 2.7 ppc64, #727504 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/fop/fop-2.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild index 59fa332f90a6..a40189884199 100644 --- a/dev-java/fop/fop-2.7.ebuild +++ b/dev-java/fop/fop-2.7.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="2.7" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" CP_DEPEND=" dev-java/batik:1.14
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: dd91c0e758e59e5cdeb7fe3b7aabb662624fcc78 Author: Jakov Smolić gentoo org> AuthorDate: Fri May 6 09:23:02 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Fri May 6 09:23:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd91c0e7 dev-java/fop: Stabilize 2.7 amd64, #727504 Signed-off-by: Jakov Smolić gentoo.org> dev-java/fop/fop-2.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild index 5c30a5a49912..aecc3d9cb737 100644 --- a/dev-java/fop/fop-2.7.ebuild +++ b/dev-java/fop/fop-2.7.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="2.7" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" CP_DEPEND=" dev-java/batik:1.14
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 7cc3d92926c8bd13f98e658f52bcffa770c8e24f Author: Jakov Smolić gentoo org> AuthorDate: Fri May 6 09:23:07 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Fri May 6 09:23:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc3d929 dev-java/fop: Stabilize 2.7 x86, #727504 Signed-off-by: Jakov Smolić gentoo.org> dev-java/fop/fop-2.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild index aecc3d9cb737..59fa332f90a6 100644 --- a/dev-java/fop/fop-2.7.ebuild +++ b/dev-java/fop/fop-2.7.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="2.7" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" CP_DEPEND=" dev-java/batik:1.14
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/files/, dev-java/fop/
commit: 8a1a75d34f4cd056daa686de3d8ba643d8e5e3ed
Author: Florian Schmaus gentoo org>
AuthorDate: Sun Apr 17 22:24:40 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Apr 17 22:27:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1a75d3
dev-java/fop: remove binaries out of files/
Closes: https://bugs.gentoo.org/839042
Fixes: 55f3ec5078e3 ("dev-java/fop: Bump to 2.7")
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/fop/Manifest| 1 +
dev-java/fop/files/fop-2.7-core-event-models.jar | Bin 8835 -> 0 bytes
dev-java/fop/files/fop-2.7-test-event-model.jar | Bin 428 -> 0 bytes
dev-java/fop/fop-2.7.ebuild | 9 ++---
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index b65582322b79..27bd73277440 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,2 +1,3 @@
DIST fop-2.0-src.zip 26381859 BLAKE2B
8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395
SHA512
428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
+DIST fop-2.7-jars.tar.xz 7348 BLAKE2B
79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c
SHA512
71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
DIST fop-2.7-src.tar.gz 26799877 BLAKE2B
00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a
SHA512
bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
diff --git a/dev-java/fop/files/fop-2.7-core-event-models.jar
b/dev-java/fop/files/fop-2.7-core-event-models.jar
deleted file mode 100644
index 49bece365d93..
Binary files a/dev-java/fop/files/fop-2.7-core-event-models.jar and /dev/null
differ
diff --git a/dev-java/fop/files/fop-2.7-test-event-model.jar
b/dev-java/fop/files/fop-2.7-test-event-model.jar
deleted file mode 100644
index 7c2fff6a088d..
Binary files a/dev-java/fop/files/fop-2.7-test-event-model.jar and /dev/null
differ
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
index e6aa1be68d31..5c30a5a49912 100644
--- a/dev-java/fop/fop-2.7.ebuild
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -11,7 +11,10 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="XML Graphics Format Object Processor All-In-One"
HOMEPAGE="https://xmlgraphics.apache.org/fop/;
-SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz"
+SRC_URI="
+ mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+ https://dev.gentoo.org/~flow/distfiles/fop/${P}-jars.tar.xz
+"
LICENSE="Apache-2.0"
SLOT="2.7"
@@ -95,7 +98,7 @@ src_compile() {
# Update "fop-core.jar" with "event-mode.xml" files produced manually
# by running "mvn package".
mkdir event-model && pushd $_ >/dev/null || die
- jar -xf "${FILESDIR}/fop-2.7-core-event-models.jar"
+ jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
popd
jar -uf "fop-core.jar" -C event-model . || die
# Upstream does this with maven-antrun-plugin:
@@ -126,7 +129,7 @@ src_test() {
# This jar file was created manually from the output of "mvn test".
# Upstream does this with maven-antrun-plugin
- jar -xf ${FILESDIR}/fop-2.7-test-event-model.jar || die
+ jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
java-pkg-simple_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: bee7854c056dc34cbefa534d8a1a1396f76017e1
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=bee7854c
dev-java/fop: Keyword 2.7 arm64, #836755
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/fop/fop-2.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
index 01d732a46cb4..e6aa1be68d31 100644
--- a/dev-java/fop/fop-2.7.ebuild
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.7"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/batik:1.14
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: ad23555f42b141a10663229c379349a6408b02c5
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Apr 5 18:06:30 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Apr 10 15:12:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad23555f
dev-java/fop: Enable tests on fop-core
Closes: https://bugs.gentoo.org/836752
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24920
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/fop/fop-2.7.ebuild | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
index b6bc2ad9ebca..01d732a46cb4 100644
--- a/dev-java/fop/fop-2.7.ebuild
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -31,7 +31,7 @@ DEPEND="${CP_DEPEND}
dev-java/ant-core:0
dev-java/sun-jai-bin:0
test? (
- dev-java/mockito:0
+ dev-java/mockito:4
dev-java/pdfbox:0
dev-java/xmlunit:1
)
@@ -119,7 +119,7 @@ src_compile() {
}
src_test() {
- JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,pdfbox,xmlunit-1"
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,pdfbox,xmlunit-1"
JAVA_TEST_SRC_DIR="fop-events/src/test/java"
JAVA_TEST_RUN_ONLY="org.apache.fop.events.BasicEventTestCase"
@@ -130,13 +130,14 @@ src_test() {
java-pkg-simple_src_test
+ sed \
+ -e 's:verifyZeroInteractions:verifyNoInteractions:' \
+ -i
fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
|| die
+
JAVA_TEST_SRC_DIR="fop-core/src/test/java"
JAVA_TEST_RESOURCE_DIRS="fop-core/src/test/resources"
- # Testing fop-core seems to want a newer mockito:
- # error: cannot find symbol
- # import static org.mockito.ArgumentMatchers.anyInt;
-# java-pkg-simple_src_test
+ java-pkg-simple_src_test
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/, dev-java/fop/files/
commit: 55f3ec5078e3d85b0cce92b424b9202dd6a9b580
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Mar 29 23:14:39 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Apr 4 07:31:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f3ec50
dev-java/fop: Bump to 2.7
Tests for mudule fop-core need a newer mockito version
(see comment in the ebuild), skipped for now.
Closes: https://bugs.gentoo.org/727504
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/fop/Manifest| 1 +
dev-java/fop/files/fop-2.7-core-event-models.jar | Bin 0 -> 8835 bytes
dev-java/fop/files/fop-2.7-test-event-model.jar | Bin 0 -> 428 bytes
dev-java/fop/fop-2.7.ebuild | 154 +++
dev-java/fop/metadata.xml| 12 +-
5 files changed, 163 insertions(+), 4 deletions(-)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 9cab9ee0471a..b65582322b79 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1 +1,2 @@
DIST fop-2.0-src.zip 26381859 BLAKE2B
8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395
SHA512
428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
+DIST fop-2.7-src.tar.gz 26799877 BLAKE2B
00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a
SHA512
bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
diff --git a/dev-java/fop/files/fop-2.7-core-event-models.jar
b/dev-java/fop/files/fop-2.7-core-event-models.jar
new file mode 100644
index ..49bece365d93
Binary files /dev/null and b/dev-java/fop/files/fop-2.7-core-event-models.jar
differ
diff --git a/dev-java/fop/files/fop-2.7-test-event-model.jar
b/dev-java/fop/files/fop-2.7-test-event-model.jar
new file mode 100644
index ..7c2fff6a088d
Binary files /dev/null and b/dev-java/fop/files/fop-2.7-test-event-model.jar
differ
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
new file mode 100644
index ..b6bc2ad9ebca
--- /dev/null
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 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:fop:2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/;
+SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.7"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/batik:1.14
+ dev-java/commons-io:1
+ dev-java/fontbox:0
+ dev-java/qdox:1.12
+ dev-java/sun-jai-bin:0
+ dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ dev-java/sun-jai-bin:0
+ test? (
+ dev-java/mockito:0
+ dev-java/pdfbox:0
+ dev-java/xmlunit:1
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/fop-${PV}"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ JAVA_SRC_DIR="fop-util/src/main/java"
+ JAVA_JAR_FILENAME="fop-util.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+ rm -r target || die
+
+ JAVA_SRC_DIR="fop-events/src/main/java"
+ JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+ JAVA_JAR_FILENAME="fop-events.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+ rm -r target || die
+
+ JAVA_SRC_DIR="fop-core/src/main/java"
+ JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+ JAVA_MAIN_CLASS=$( sed -n 's:.*\(.*\):\1:p'
fop-core/pom.xml )
+ JAVA_JAR_FILENAME="fop-core.jar"
+ # Code generation according to
+ #
https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L150-L219
+ pushd fop-core/src/main/codegen/fonts >/dev/null || die
+ local fonts=$(find . -name "Courier*.xml" \
+ -o -name "Helvetica*.xml" \
+ -o -name "Times*.xml" \
+ -o -name "Symbol.xml" \
+ -o -name "ZapfDingbats.xml"
+ )
+ for font in ${fonts}; do \
+ xalan -XSLTC \
+ -IN $font \
+ -XSL font-file.xsl \
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: a7334988e9f6086e75e8189b8be356419150eaf3
Author: Patrice Clement gentoo org>
AuthorDate: Fri Oct 27 20:19:17 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Oct 27 20:21:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7334988
dev-java/fop: stable for amd64+x86+ppc64.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-java/fop/fop-2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
index aa19c7912ab..308735bc50b 100644
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Formatting Objects Processor is a print
formatter driven by XSL"
HOMEPAGE="https://xmlgraphics.apache.org/fop/;
SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-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"
LICENSE="Apache-2.0"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 1a42c06f26db765193efdd1378063f47df518e90
Author: Patrice Clement gentoo org>
AuthorDate: Fri Oct 27 19:20:47 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Oct 27 19:20:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a42c06f
dev-java/fop: switch to the HTTPS scheme.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-java/fop/fop-2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
index ac7953c6a59..aa19c7912ab 100644
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -12,7 +12,7 @@ JAVA_PKG_IUSE="doc examples source test"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/;
+HOMEPAGE="https://xmlgraphics.apache.org/fop/;
SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: c9cc3299c37b950b6a4f6c48d31460a1c2da7245
Author: Patrice Clement gentoo org>
AuthorDate: Fri Oct 27 19:20:06 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Oct 27 19:20:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9cc3299
dev-java/fop: bump dev-java/batik's SLOT.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --force
dev-java/fop/fop-2.0-r3.ebuild | 129 +
1 file changed, 129 insertions(+)
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
new file mode 100644
index 000..ac7953c6a59
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: if 'doc' use flag is used then should build also extra docs ('docs'
ant target), currently it cannot
+# be built as it needs forrest which we do not have
+# TODO: package and use optional dependency jeuclid
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="http://xmlgraphics.apache.org/fop/;
+SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Tests are broken even in 2.0
+RESTRICT="test"
+
+CDEPEND="
+ dev-java/batik:1.9
+ dev-java/ant-core:0
+ dev-java/fontbox:1.7
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+ java-virtuals/servlet-api:3.0
+ dev-java/avalon-framework:4.2
+ dev-java/xmlgraphics-commons:2
+ dev-java/xml-commons-external:1.3
+ dev-java/qdox:1.12"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+# test? (
+# dev-java/ant-junit:0
+# dev-java/junit:4
+# dev-java/xmlunit:1
+# dev-java/mockito:0
+# )"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+ ant-core
+ batik-1.9
+ fontbox-1.7
+ commons-io-1
+ commons-logging
+ servlet-api-3.0
+ avalon-framework-4.2
+ xmlgraphics-commons-2
+ xml-commons-external-1.3
+"
+
+TARGETS=(
+ resourcegen
+ jar-hyphenation
+ jar-sandbox
+ jar-main
+)
+
+java_prepare() {
+ find "${S}"/lib -type f | xargs rm -v
+}
+
+src_compile() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=554386
+ # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+ java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+ java-pkg_jar-from --into lib xmlgraphics-commons-2
xmlgraphics-commons.jar
+ java-pkg_jar-from --into lib commons-logging commons-logging.jar
+ java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+ java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+ java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+ java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+ java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+ java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
+
+ for target in ${TARGETS[@]}; do
+ EANT_BUILD_TARGET="${target}" \
+ java-pkg-2_src_compile
+ done
+
+ if use doc; then
+ sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;'
./build.xml
+ EANT_BUILD_TARGET="javadocs" \
+ java-pkg-2_src_compile
+ fi
+}
+
+src_install() {
+ java-pkg_dojar \
+ build/${PN}.jar \
+ build/${PN}-sandbox.jar \
+ build/${PN}-hyph.jar
+
+ java-pkg_dolauncher \
+ ${PN} --main org.apache.fop.cli.Main \
+ -pre "${FILESDIR}/headless-launcher.bash"
+
+ dodoc NOTICE README
+
+ if use doc; then
+ java-pkg_dojavadoc \
+ build/javadocs
+ fi
+
+ if use examples; then
+ java-pkg_doexamples \
+ examples/* conf
+ fi
+
+ if use source; then
+ java-pkg_dosrc \
+ src/java/org \
+ src/sandbox/org
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 20940c8bfee572205a4779bdf5b0c0871e327603
Author: Patrice Clement gentoo org>
AuthorDate: Fri Oct 27 19:20:23 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Oct 27 19:20:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20940c8b
dev-java/fop: clean up old.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-java/fop/fop-2.0-r2.ebuild | 129 -
1 file changed, 129 deletions(-)
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
deleted file mode 100644
index b24807e14b2..000
--- a/dev-java/fop/fop-2.0-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs'
ant target), currently it cannot
-# be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/;
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="dev-java/batik:1.8
- dev-java/ant-core:0
- dev-java/fontbox:1.7
- dev-java/commons-io:1
- dev-java/commons-logging:0
- java-virtuals/servlet-api:3.0
- dev-java/avalon-framework:4.2
- dev-java/xmlgraphics-commons:2
- dev-java/xml-commons-external:1.3
- dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-# test? (
-# dev-java/ant-junit:0
-# dev-java/junit:4
-# dev-java/xmlunit:1
-# dev-java/mockito:0
-# )"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
- ant-core
- batik-1.8
- fontbox-1.7
- commons-io-1
- commons-logging
- servlet-api-3.0
- avalon-framework-4.2
- xmlgraphics-commons-2
- xml-commons-external-1.3
-"
-
-TARGETS=(
- resourcegen
- jar-hyphenation
- jar-sandbox
- jar-main
-)
-
-java_prepare() {
- find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
- # https://bugs.gentoo.org/show_bug.cgi?id=554386
- # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
- java-pkg_jar-from --into lib qdox-1.12 qdox.jar
- java-pkg_jar-from --into lib xmlgraphics-commons-2
xmlgraphics-commons.jar
- java-pkg_jar-from --into lib commons-logging commons-logging.jar
- java-pkg_jar-from --into lib commons-io-1 commons-io.jar
- java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
- java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
- java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
- java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
- java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
- for target in ${TARGETS[@]}; do
- EANT_BUILD_TARGET="${target}" \
- java-pkg-2_src_compile
- done
-
- if use doc; then
- sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;'
./build.xml
- EANT_BUILD_TARGET="javadocs" \
- java-pkg-2_src_compile
- fi
-}
-
-src_install() {
- java-pkg_dojar \
- build/${PN}.jar \
- build/${PN}-sandbox.jar \
- build/${PN}-hyph.jar
-
- java-pkg_dolauncher \
- ${PN} --main org.apache.fop.cli.Main \
- -pre "${FILESDIR}/headless-launcher.bash"
-
- dodoc NOTICE README
-
- if use doc; then
- java-pkg_dojavadoc \
- build/javadocs
- fi
-
- if use examples; then
- java-pkg_doexamples \
- examples/* conf
- fi
-
- if use source; then
- java-pkg_dosrc \
- src/java/org \
- src/sandbox/org
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: c890fd0c160ed02f26d8a9617b91c985dc74aaea
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Feb 17 22:08:57 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Feb 18 09:04:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c890fd0c
dev-java/fop: 2.0-r2 stable on amd64, ppc64, x86 using ALLARCHES
Package-Manager: portage-2.2.27
dev-java/fop/fop-2.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
index 3c9485a..1e5f9fb 100644
--- a/dev-java/fop/fop-2.0-r2.ebuild
+++ b/dev-java/fop/fop-2.0-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Formatting Objects Processor is a print
formatter driven by XSL"
HOMEPAGE="http://xmlgraphics.apache.org/fop/;
SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-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"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/
commit: 588bf9efb7abaab4add9fff5a9fcb6f8b2597de8
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Feb 17 22:10:33 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Feb 18 09:04:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588bf9ef
dev-java/fop: Remove old, closes bug #569808
Package-Manager: portage-2.2.27
dev-java/fop/fop-2.0-r1.ebuild | 128 -
1 file changed, 128 deletions(-)
diff --git a/dev-java/fop/fop-2.0-r1.ebuild b/dev-java/fop/fop-2.0-r1.ebuild
deleted file mode 100644
index 2b2229a..000
--- a/dev-java/fop/fop-2.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs'
ant target), currently it cannot
-# be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/;
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="dev-java/batik:1.8
- dev-java/ant-core:0
- dev-java/fontbox:1.7
- dev-java/commons-io:1
- dev-java/commons-logging:0
- java-virtuals/servlet-api:3.0
- dev-java/avalon-framework:4.2
- dev-java/xmlgraphics-commons:2
- dev-java/xml-commons-external:1.3
- dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-# test? (
-# dev-java/ant-junit:0
-# dev-java/junit:4
-# dev-java/xmlunit:1
-# dev-java/mockito:0
-# )"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
- ant-core
- batik-1.8
- fontbox-1.7
- commons-io-1
- commons-logging
- servlet-api-3.0
- avalon-framework-4.2
- xmlgraphics-commons-2
- xml-commons-external-1.3
-"
-
-TARGETS=(
- resourcegen
- jar-hyphenation
- jar-sandbox
- jar-main
-)
-
-java_prepare() {
- find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
- # https://bugs.gentoo.org/show_bug.cgi?id=554386
- # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
- java-pkg_jar-from --into lib qdox-1.12 qdox.jar
- java-pkg_jar-from --into lib xmlgraphics-commons-2
xmlgraphics-commons.jar
- java-pkg_jar-from --into lib commons-logging commons-logging.jar
- java-pkg_jar-from --into lib commons-io-1 commons-io.jar
- java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
- java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
- java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
- java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
- java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
- for target in ${TARGETS[@]}; do
- EANT_BUILD_TARGET="${target}" \
- java-pkg-2_src_compile
- done
-
- if use doc; then
- sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;'
./build.xml
- EANT_BUILD_TARGET="javadocs" \
- java-pkg-2_src_compile
- fi
-}
-
-src_install() {
- java-pkg_dojar \
- build/${PN}.jar \
- build/${PN}-sandbox.jar \
- build/${PN}-hyph.jar
-
- java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
-
- dodoc NOTICE README
-
- if use doc; then
- java-pkg_dojavadoc \
- build/javadocs
- fi
-
- if use examples; then
- java-pkg_doexamples \
- examples/* conf
- fi
-
- if use source; then
- java-pkg_dosrc \
- src/java/org \
- src/sandbox/org
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/files/, dev-java/fop/
commit: eb31649bd0c09b4b195f8fb1204bee517d87a703
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Jan 13 20:57:05 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Jan 13 20:58:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb31649b
dev-java/fop: Set headless flag in launcher, except when -awt given
fop will die if the value of DISPLAY is invalid. This was breaking
other package builds for some users. A real display is needed when the
-awt option is given though so make this conditional. See bug #569808.
Package-Manager: portage-2.2.26
dev-java/fop/files/headless-launcher.bash | 1 +
dev-java/fop/fop-2.0-r2.ebuild| 130 ++
2 files changed, 131 insertions(+)
diff --git a/dev-java/fop/files/headless-launcher.bash
b/dev-java/fop/files/headless-launcher.bash
new file mode 100644
index 000..a01c56f
--- /dev/null
+++ b/dev-java/fop/files/headless-launcher.bash
@@ -0,0 +1 @@
+[[ "${!#}" = "-awt" ]] || gjl_java_args="-Djava.awt.headless=true"
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
new file mode 100644
index 000..af0e1c7
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: if 'doc' use flag is used then should build also extra docs ('docs'
ant target), currently it cannot
+# be built as it needs forrest which we do not have
+# TODO: package and use optional dependency jeuclid
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="http://xmlgraphics.apache.org/fop/;
+SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+# Tests are broken even in 2.0
+RESTRICT="test"
+
+CDEPEND="dev-java/batik:1.8
+ dev-java/ant-core:0
+ dev-java/fontbox:1.7
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+ java-virtuals/servlet-api:3.0
+ dev-java/avalon-framework:4.2
+ dev-java/xmlgraphics-commons:2
+ dev-java/xml-commons-external:1.3
+ dev-java/qdox:1.12"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+# test? (
+# dev-java/ant-junit:0
+# dev-java/junit:4
+# dev-java/xmlunit:1
+# dev-java/mockito:0
+# )"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+ ant-core
+ batik-1.8
+ fontbox-1.7
+ commons-io-1
+ commons-logging
+ servlet-api-3.0
+ avalon-framework-4.2
+ xmlgraphics-commons-2
+ xml-commons-external-1.3
+"
+
+TARGETS=(
+ resourcegen
+ jar-hyphenation
+ jar-sandbox
+ jar-main
+)
+
+java_prepare() {
+ find "${S}"/lib -type f | xargs rm -v
+}
+
+src_compile() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=554386
+ # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+ java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+ java-pkg_jar-from --into lib xmlgraphics-commons-2
xmlgraphics-commons.jar
+ java-pkg_jar-from --into lib commons-logging commons-logging.jar
+ java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+ java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+ java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+ java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+ java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+ java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
+
+ for target in ${TARGETS[@]}; do
+ EANT_BUILD_TARGET="${target}" \
+ java-pkg-2_src_compile
+ done
+
+ if use doc; then
+ sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;'
./build.xml
+ EANT_BUILD_TARGET="javadocs" \
+ java-pkg-2_src_compile
+ fi
+}
+
+src_install() {
+ java-pkg_dojar \
+ build/${PN}.jar \
+ build/${PN}-sandbox.jar \
+ build/${PN}-hyph.jar
+
+ java-pkg_dolauncher \
+ ${PN} --main org.apache.fop.cli.Main \
+ -pre "${FILESDIR}/headless-launcher.bash"
+
+ dodoc NOTICE README
+
+ if use doc; then
+ java-pkg_dojavadoc \
+ build/javadocs
+ fi
+
+ if use examples; then
+ java-pkg_doexamples \
+ examples/* conf
+ fi
+
+ if use source; then
+
