From 6fdcbe4d9a57f5431fffe3a23db001b87d0306ea Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Mon, 17 May 2021 01:37:21 +0000 Subject: Adding metadata --- .../ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild | 50 ++++ .../ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild | 50 ---- dev-java/antlr/antlr-2.7.7-r8.ebuild | 47 ---- dev-java/antlr/antlr-2.7.7-r9.ebuild | 49 ++++ dev-java/antlr/antlr-3.2-r1.ebuild | 101 ++++++++ dev-java/antlr/antlr-3.2.ebuild | 96 -------- dev-java/antlr/files/3.2-test-fixes.patch | 16 +- .../avalon-framework-4.2.0-r2.ebuild | 2 +- dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild | 2 +- dev-java/commons-codec/commons-codec-1.15.ebuild | 2 +- .../commons-collections-4.1-r1.ebuild | 2 +- dev-java/commons-io/commons-io-2.8.0.ebuild | 2 +- dev-java/commons-lang/commons-lang-3.11-r1.ebuild | 2 +- .../commons-logging/commons-logging-1.2-r3.ebuild | 2 +- dev-java/commons-math/commons-math-3.6.1-r1.ebuild | 2 +- dev-java/easymock/easymock-3.3.1-r1.ebuild | 2 +- dev-java/jackcess/jackcess-4.0.0.ebuild | 2 +- dev-java/jaxen/Manifest | 1 - dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml | 200 ---------------- dev-java/jaxen/jaxen-1.1.4-r1.ebuild | 51 ---- dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 10 +- dev-java/jdom/jdom-2.0.6-r4.ebuild | 64 ----- dev-java/jdom/jdom-2.0.6-r5.ebuild | 2 +- dev-java/jflex/jflex-1.6.1-r1.ebuild | 2 +- dev-java/joda-time/Manifest | 1 - dev-java/joda-time/files/joda-time-2.7-build.xml | 262 --------------------- dev-java/joda-time/joda-time-2.7-r1.ebuild | 61 ----- dev-java/log4j/log4j-1.2.17-r3.ebuild | 2 +- dev-java/objenesis-test/objenesis-test-3.2.ebuild | 2 +- dev-java/objenesis/objenesis-3.2.ebuild | 2 +- .../oracle-javamail-1.5.6-r1.ebuild | 2 +- dev-java/poi/poi-5.0.0.ebuild | 2 +- dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild | 2 +- dev-java/snakeyaml/Manifest | 1 - dev-java/snakeyaml/snakeyaml-1.16.ebuild | 50 ---- dev-java/sparsebitset/sparsebitset-1.2.ebuild | 2 +- dev-java/sun-jms/sun-jms-1.1-r2.ebuild | 2 +- dev-java/swt/swt-4.10-r1.ebuild | 174 ++++++++++++++ dev-java/swt/swt-4.10.ebuild | 172 -------------- .../tomcat-servlet-api-7.0.108.ebuild | 2 +- .../tomcat-servlet-api-8.5.65.ebuild | 2 +- .../tomcat-servlet-api-9.0.45.ebuild | 2 +- dev-java/xom/Manifest | 3 - dev-java/xom/files/xom-1.2.6.patch | 49 ---- dev-java/xom/files/xom-strip-fallback-parser.patch | 18 -- dev-java/xom/xom-1.2.10.ebuild | 79 ------- dev-java/xom/xom-1.3.2.ebuild | 42 ---- dev-java/xom/xom-1.3.7.ebuild | 2 +- 48 files changed, 411 insertions(+), 1284 deletions(-) create mode 100644 dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild delete mode 100644 dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild delete mode 100644 dev-java/antlr/antlr-2.7.7-r8.ebuild create mode 100644 dev-java/antlr/antlr-2.7.7-r9.ebuild create mode 100644 dev-java/antlr/antlr-3.2-r1.ebuild delete mode 100644 dev-java/antlr/antlr-3.2.ebuild delete mode 100644 dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml delete mode 100644 dev-java/jaxen/jaxen-1.1.4-r1.ebuild delete mode 100644 dev-java/jdom/jdom-2.0.6-r4.ebuild delete mode 100644 dev-java/joda-time/files/joda-time-2.7-build.xml delete mode 100644 dev-java/joda-time/joda-time-2.7-r1.ebuild delete mode 100644 dev-java/snakeyaml/snakeyaml-1.16.ebuild create mode 100644 dev-java/swt/swt-4.10-r1.ebuild delete mode 100644 dev-java/swt/swt-4.10.ebuild delete mode 100644 dev-java/xom/files/xom-1.2.6.patch delete mode 100644 dev-java/xom/files/xom-strip-fallback-parser.patch delete mode 100644 dev-java/xom/xom-1.2.10.ebuild delete mode 100644 dev-java/xom/xom-1.3.2.ebuild (limited to 'dev-java') diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild new file mode 100644 index 000000000000..478fe1efa829 --- /dev/null +++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple prefix + +DMF="R-${PV}-202003050155" + +DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" + +LICENSE="EPL-1.0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +SLOT="4.15" +IUSE="" + +CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} + dev-java/ant-core:0" +RDEPEND="${CDEPEND} + >=virtual/jre-11:*" +DEPEND="${CDEPEND} + >=virtual/jdk-11:*" +BDEPEND="app-arch/unzip" + +JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" + +src_prepare() { + default + + # Remove everything but the Ant component. + find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die + + rm build.xml || die +} + +src_compile() { + java-pkg-simple_src_compile + find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" +} + +src_install() { + java-pkg-simple_src_install + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" + eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT} +} diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild deleted file mode 100644 index 27aab2586f93..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202003050155" - -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" -HOMEPAGE="http://www.eclipse.org/" -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -SLOT="4.15" -IUSE="" - -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} - dev-java/ant-core:0" -RDEPEND="${CDEPEND} - >=virtual/jre-11" -DEPEND="${CDEPEND} - app-arch/unzip - >=virtual/jdk-11" - -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" - -src_prepare() { - default - - # Remove everything but the Ant component. - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die - - rm build.xml || die -} - -src_compile() { - java-pkg-simple_src_compile - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - insinto /usr/share/java-config-2/compiler - doins "${FILESDIR}/ecj-${SLOT}" - eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT} -} diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild deleted file mode 100644 index 3ca31ab70cf0..000000000000 --- a/dev-java/antlr/antlr-2.7.7-r8.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A parser generator for many languages" -HOMEPAGE="https://www.antlr2.org/" -SRC_URI="https://www.antlr2.org/download/${P}.tar.gz" -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples" - -RDEPEND=">=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.6" - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="${S}/${PN}" - -DOCS=( CHANGES.txt README.txt ) - -src_prepare() { - default - java-pkg_clean - - # Delete build files from examples. - find examples \( -name Makefile.in -o -name shiplist \) -delete || die -} - -# Avoid configure script. -src_configure() { :; } - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher antlr --main antlr.Tool - - use doc && java-pkg_dohtml -r doc/* - use examples && java-pkg_doexamples examples/java - use source && java-pkg_dosrc antlr - - einstalldocs -} diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild new file mode 100644 index 000000000000..f7a428518635 --- /dev/null +++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A parser generator for many languages" +HOMEPAGE="https://www.antlr2.org/" +SRC_URI="https://www.antlr2.org/download/${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +S="${WORKDIR}/${P}" + +JAVA_SRC_DIR="${S}/${PN}" + +DOCS=( CHANGES.txt README.txt ) + +src_prepare() { + default + java-pkg_clean + + # Delete build files from examples. + find examples \( -name Makefile.in -o -name shiplist \) -delete || die +} + +# Avoid configure script. +src_configure() { :; } + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher antlr --main antlr.Tool + + use doc && java-pkg_dohtml -r doc/* + use examples && java-pkg_doexamples examples/java + use source && java-pkg_dosrc antlr + + # https://bugs.gentoo.org/789582 + einstalldocs +} diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild b/dev-java/antlr/antlr-3.2-r1.ebuild new file mode 100644 index 000000000000..fba666dc5ad6 --- /dev/null +++ b/dev-java/antlr/antlr-3.2-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc test" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A parser generator for many languages" +HOMEPAGE="https://www.antlr3.org/" +SRC_URI="https://www.antlr3.org/download/${P}.tar.gz + https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed. + +LICENSE="BSD" +SLOT="3" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +RESTRICT="!test? ( test )" + +CDEPEND=">=dev-java/antlr-2.7.7-r7:0 + dev-java/stringtemplate:0" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/junit:4 )" + +PATCHES=( + # These fixes have been applied in 3.5. + "${FILESDIR}/${PV}-test-fixes.patch" + "${FILESDIR}/${PV}-java-8.patch" +) + +S="${WORKDIR}/${P}" +JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar" +JAVA_GENTOO_CLASSPATH="antlr,stringtemplate" + +src_unpack() { + unpack ${P}.tar.gz +} + +src_prepare() { + default + java-pkg_clean + + # Some tests fail under Java 8 in ways that probably aren't limited + # to the tests. This is bad but upstream is never going to update + # 3.2 even though other projects still rely on it. If any issues + # arise, we can only put pressure on those projects to upgrade. + if java-pkg_is-vm-version-ge 1.8; then + rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die + fi + + # 3.2 has strange hidden files. + find -type f -name "._*.*" -delete || die +} + +src_compile() { + cd "${S}/runtime/Java/src/main" || die + JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" java-pkg-simple_src_compile + + cd "${S}/tool/src/main" || die + + local G; for G in antlr codegen antlr.print assign.types buildnfa define; do # from pom.xml + antlr -o antlr2/org/antlr/grammar/v2/{,${G}.g} || die + done + + # We have applied a patch to fix this version under Java 8. Trouble + # is that we need to run a prebuilt version before we can build our + # own and that version doesn't have the fix applied. We work around + # this by building just the offending class against the prebuilt + # version and then putting them together in the classpath. That + # isn't all. Due to a compiler limitation that Chewi doesn't fully + # understand, this class cannot be compiled by itself without a + # couple of tweaks that have been applied in the Java 8 patch. + ejavac -classpath "${DISTDIR}/${P}.jar" java/org/antlr/tool/CompositeGrammar.java + + java -classpath "java:${DISTDIR}/${P}.jar" org.antlr.Tool $(find antlr3 -name "*.g") || die + JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile + java-pkg_addres "${S}/${PN}-tool.jar" resources +} + +src_install() { + java-pkg_dojar ${PN}-{runtime,tool}.jar + java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool + use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api +} + +src_test() { + cd tool/src/test/java || die + local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" + + local TESTS=$(find * -name "Test*.java") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild deleted file mode 100644 index 3efa97660287..000000000000 --- a/dev-java/antlr/antlr-3.2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch java-pkg-2 java-pkg-simple - -DESCRIPTION="A parser generator for many languages" -HOMEPAGE="https://www.antlr3.org/" -SRC_URI="https://www.antlr3.org/download/${P}.tar.gz - https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed. -LICENSE="BSD" -SLOT="3" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -CDEPEND=">=dev-java/antlr-2.7.7-r7:0 - dev-java/stringtemplate:0" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.6" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.6 - test? ( dev-java/junit:4 )" - -S="${WORKDIR}/${P}" -JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar" -JAVA_GENTOO_CLASSPATH="antlr,stringtemplate" - -src_unpack() { - unpack ${P}.tar.gz -} - -java_prepare() { - java-pkg_clean - - # These fixes have been applied in 3.5. - epatch "${FILESDIR}/${PV}-test-fixes.patch" - epatch "${FILESDIR}/${PV}-java-8.patch" - - # Some tests fail under Java 8 in ways that probably aren't limited - # to the tests. This is bad but upstream is never going to update - # 3.2 even though other projects still rely on it. If any issues - # arise, we can only put pressure on those projects to upgrade. - if java-pkg_is-vm-version-ge 1.8; then - rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die - fi - - # 3.2 has strange hidden files. - find -type f -name "._*.*" -delete || die -} - -src_compile() { - cd "${S}/runtime/Java/src/main" || die - JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile - - cd "${S}/tool/src/main" || die - - local G; for G in antlr codegen antlr.print assign.types buildnfa define; do # from pom.xml - antlr -o antlr2/org/antlr/grammar/v2/{,${G}.g} || die - done - - # We have applied a patch to fix this version under Java 8. Trouble - # is that we need to run a prebuilt version before we can build our - # own and that version doesn't have the fix applied. We work around - # this by building just the offending class against the prebuilt - # version and then putting them together in the classpath. That - # isn't all. Due to a compiler limitation that Chewi doesn't fully - # understand, this class cannot be compiled by itself without a - # couple of tweaks that have been applied in the Java 8 patch. - ejavac -classpath "${DISTDIR}/${P}.jar" java/org/antlr/tool/CompositeGrammar.java - - java -classpath "java:${DISTDIR}/${P}.jar" org.antlr.Tool $(find antlr3 -name "*.g") || die - JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile - java-pkg_addres "${S}/${PN}-tool.jar" resources -} - -src_install() { - java-pkg_dojar ${PN}-{runtime,tool}.jar - java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool - use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api -} - -src_test() { - cd tool/src/test/java || die - local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" - - local TESTS=$(find * -name "Test*.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -classpath "${CP}" $(find -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch index 0544b7006170..28068edb76ba 100644 --- a/dev-java/antlr/files/3.2-test-fixes.patch +++ b/dev-java/antlr/files/3.2-test-fixes.patch @@ -1,5 +1,5 @@ ---- tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000 -+++ tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100 +--- a/tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000 ++++ b/tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100 @@ -130,8 +130,8 @@ try { Process process = @@ -43,8 +43,8 @@ buf.append(line); buf.append('\n'); line = in.readLine(); ---- tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100 -+++ tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000 +--- a/tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100 ++++ b/tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000 @@ -49,7 +49,7 @@ g.addEdge("F", "H"); g.addEdge("E", "F"); @@ -72,8 +72,8 @@ List nodes = g.sort(); String result = nodes.toString(); assertEquals(expecting, result); ---- tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100 -+++ tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000 +--- a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100 ++++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000 @@ -731,19 +731,23 @@ "c : a\n" + " | b\n" + @@ -111,8 +111,8 @@ } @Test ---- tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000 -+++ tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000 +--- a/tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000 ++++ b/tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000 @@ -439,20 +439,15 @@ ErrorManager.setErrorListener(equeue); Grammar g = new Grammar( diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild index 71b22b19ab46..b04d776db7a1 100644 --- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild +++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="4.2" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="" CDEPEND="dev-java/avalon-logkit:2.0 diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild index f66302f731e8..efbc19a52df0 100644 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit" HOMEPAGE="https://avalon.apache.org/closed.html" SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" LICENSE="Apache-2.0" SLOT="2.0" IUSE="" diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild index de13bb85fb75..f56a3146485a 100644 --- a/dev-java/commons-codec/commons-codec-1.15.ebuild +++ b/dev-java/commons-codec/commons-codec-1.15.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ppc64 ~x86 ~amd64-linux ~x86-linux" # Compile dependencies # POM: ${P}-src/pom.xml diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild index 3cbb9daf5282..228b947a439d 100644 --- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild +++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut HOMEPAGE="https://commons.apache.org/collections/" SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz" LICENSE="Apache-2.0" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-java/commons-io/commons-io-2.8.0.ebuild b/dev-java/commons-io/commons-io-2.8.0.ebuild index 6b1a3a17f7b6..730f099a18c1 100644 --- a/dev-java/commons-io/commons-io-2.8.0.ebuild +++ b/dev-java/commons-io/commons-io-2.8.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-io/" SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/commons-lang/commons-lang-3.11-r1.ebuild b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild index bb2399c94a7a..fe748bed2f36 100644 --- a/dev-java/commons-lang/commons-lang-3.11-r1.ebuild +++ b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://commons.apache.org/lang" SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.6" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" CDEPEND=" dev-java/easymock:3.2 diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild index adffeb36c057..1be76e85241d 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="avalon-framework avalon-logkit log4j servletapi test" RESTRICT="!test? ( test ) !servletapi? ( test )" diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild index fd1f6c61c92c..3ef7e38716d8 100644 --- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild +++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild @@ -21,4 +21,4 @@ RDEPEND=">=virtual/jre-1.8:*" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild index 3b4e321ccffe..bef9d66247ab 100644 --- a/dev-java/easymock/easymock-3.3.1-r1.ebuild +++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.2" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64 x86" CDEPEND=" dev-java/cglib:3 diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild index 503f94c45ff4..683921e1ae89 100644 --- a/dev-java/jackcess/jackcess-4.0.0.ebuild +++ b/dev-java/jackcess/jackcess-4.0.0.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" # Common dependencies # POM: pom.xml diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest index b1138e4df534..e9646ad9808e 100644 --- a/dev-java/jaxen/Manifest +++ b/dev-java/jaxen/Manifest @@ -1,3 +1,2 @@ -DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53 diff --git a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml deleted file mode 100644 index efbdd2074bb2..000000000000 --- a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Proxy used : - Proxy host [${proxy.host}] - Proxy port [${proxy.port}] - Proxy user [${proxy.username}] - - - - Proxy not used. - - - - - - diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild deleted file mode 100644 index 8968d7a7d6f0..000000000000 --- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A Java XPath Engine" -HOMEPAGE="http://jaxen.org" -SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz" - -LICENSE="JDOM" -SLOT="1.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -CDEPEND=" - dev-java/xom:0 - dev-java/jdom:0 - dev-java/dom4j:1" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.4" - -DEPEND=" - ${CDEPEND} - test? ( dev-java/ant-junit:0 ) - >=virtual/jdk-1.4" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom" -EANT_TEST_EXTRA_ARGS="-DJunit.present=true" - -java_prepare() { - cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar "target/${P}.jar" - - use doc && java-pkg_dojavadoc dist/docs/api - use examples && java-pkg_doexamples src/java/samples - use source && java-pkg_dosrc src/java/main/* -} diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild index 3722e883f75b..211abc53f20a 100644 --- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild +++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD-2" SLOT="1.2" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" IUSE="dom4j jdom xom" # It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen @@ -47,13 +47,13 @@ RDEPEND=" >=virtual/jre-1.8:* " -S="${WORKDIR}" +S="${WORKDIR}/${P}" -DOCS=( "${P}"/{LICENSE.txt,README.md} ) +DOCS=( "${S}"/{LICENSE.txt,README.md} ) -JAVA_SRC_DIR="${P}/src/java/main" +JAVA_SRC_DIR="src/java/main" -JAVA_TEST_SRC_DIR="${P}/src/java/test" +JAVA_TEST_SRC_DIR="src/java/test" JAVA_TEST_GENTOO_CLASSPATH="junit" src_prepare() { diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild deleted file mode 100644 index 8549f9e42e10..000000000000 --- a/dev-java/jdom/jdom-2.0.6-r4.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_P="JDOM-${PV}" -JAVA_PKG_IUSE="doc source" - -inherit epatch java-pkg-2 java-ant-2 - -DESCRIPTION="Java API to manipulate XML data" -SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz" -HOMEPAGE="http://www.jdom.org" -LICENSE="Apache-1.1" -SLOT="2" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - dev-java/xalan:0 - dev-java/jaxen:1.1 - dev-java/iso-relax:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6 - test? ( dev-java/ant-junit:0 )" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_BUILD_TARGET="jars" -EANT_TEST_TARGET="junit" -EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan" -S="${WORKDIR}/${PN}-${MY_P}" - -PATCHES=( - "${FILESDIR}/build-xml-2.patch" -) - -java_prepare() { - java-pkg_clean - - epatch "${PATCHES[@]}" - - # Remove Android stuff to avoid junit RDEPEND. - rm -vr contrib/src/java/org/jdom2/contrib/android || die -} - -src_install() { - java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar - java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar - - dodoc {CHANGES,COMMITTERS,README,TODO}.txt - use doc && java-pkg_dojavadoc build/apidocs - use source && java-pkg_dosrc {contrib,core}/src/java/* -} - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild index 74fde49b3c18..772c36da6de7 100644 --- a/dev-java/jdom/jdom-2.0.6-r5.ebuild +++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org" LICENSE="Apache-1.1" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild index 7df78eee922a..80b924fcbda7 100644 --- a/dev-java/jflex/jflex-1.6.1-r1.ebuild +++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos" IUSE="examples test vim-syntax" RESTRICT="!test? ( test )" diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest index e095d554d3be..a0252fc34687 100644 --- a/dev-java/joda-time/Manifest +++ b/dev-java/joda-time/Manifest @@ -1,2 +1 @@ DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943 -DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 diff --git a/dev-java/joda-time/files/joda-time-2.7-build.xml b/dev-java/joda-time/files/joda-time-2.7-build.xml deleted file mode 100644 index fa1fd5e25a39..000000000000 --- a/dev-java/joda-time/files/joda-time-2.7-build.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/joda-time/joda-time-2.7-r1.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild deleted file mode 100644 index f492d319c95b..000000000000 --- a/dev-java/joda-time/joda-time-2.7-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc examples source test" -JAVA_ANT_REWRITE_CLASSPATH="true" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A quality open-source replacement for the Java Date and Time classes" -HOMEPAGE="https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/" -SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" - -RESTRICT="test" - -DEPEND=">=virtual/jdk-1.8 - dev-java/joda-convert:0 - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - )" -RDEPEND=">=virtual/jre-1.8" - -src_prepare() { - default - - rm -v *.jar || die "Failed to remove bundled jars." - cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file." - - mkdir -p "${S}"/target/classes || die "Failed to create target classes directory." - cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data." - - mkdir -p "${S}"/target/classes/org/joda/time/format || die "Failed to create target classes subdirectory." - cp -Rv "${S}"/src/main/java/org/joda/time/format/*properties "${S}"/target/classes/org/joda/time/format/ || die "Failed to copy message bundles." -} - -src_compile() { - EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)" - - java-pkg-2_src_compile -} - -src_test() { - EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)" - - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${P}.jar - - dodoc NOTICE.txt RELEASE-NOTES.txt - - use doc && java-pkg_dojavadoc target/site/apidocs - use examples && java-pkg_doexamples src/example - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild index 0fa931af9d40..ee8247958b42 100644 --- a/dev-java/log4j/log4j-1.2.17-r3.ebuild +++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz" HOMEPAGE="http://logging.apache.org/log4j/" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux" IUSE="javamail jms" CDEPEND=" diff --git a/dev-java/objenesis-test/objenesis-test-3.2.ebuild b/dev-java/objenesis-test/objenesis-test-3.2.ebuild index d3ef97a3bf1a..a4285de9bf73 100644 --- a/dev-java/objenesis-test/objenesis-test-3.2.ebuild +++ b/dev-java/objenesis-test/objenesis-test-3.2.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/easymock/objenesis/archive/refs/tags/${PV}.tar.gz -> LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64 x86" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild index 87362be1d570..893f78715071 100644 --- a/dev-java/objenesis/objenesis-3.2.ebuild +++ b/dev-java/objenesis/objenesis-3.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64 x86" # Compile dependencies # POM: ${P}/main/pom.xml diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild index 8e469d1a6cc7..f56700c34bec 100644 --- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild +++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$ # either of these LICENSE="CDDL GPL-2 BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND=" diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild index 32cac97d164d..a87e7cb910a5 100644 --- a/dev-java/poi/poi-5.0.0.ebuild +++ b/dev-java/poi/poi-5.0.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://poi.apache.org/" SRC_URI="https://archive.apache.org/dist/${PN}/release/src/${PN}-src-${PV}-20210120.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64 ~x86" # Common dependencies # POM: ${P}/sonar/main/pom.xml diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild index b1522d481d56..ef4a91e9b8c8 100644 --- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild +++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64 x86" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest index 585b73ed3681..6fb3ce63e073 100644 --- a/dev-java/snakeyaml/Manifest +++ b/dev-java/snakeyaml/Manifest @@ -1,2 +1 @@ DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c -DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4 diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild deleted file mode 100644 index 84d47f987398..000000000000 --- a/dev-java/snakeyaml/snakeyaml-1.16.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple vcs-snapshot - -DESCRIPTION="A YAML 1.1 parser and emitter for Java 5" -HOMEPAGE="https://bitbucket.org/asomov/snakeyaml" -SRC_URI="https://bitbucket.org/asomov/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=">=virtual/jdk-1.6 - test? ( - dev-java/joda-time:0 - dev-java/junit:4 )" - -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src/main/java" - -java_prepare() { - # Remove some tests with tricky dependencies. - rm -rv src/test/java/{examples/SpringTest.java,org/yaml/snakeyaml/{emitter/template/VelocityTest.java,issues/issue9}} || die -} - -src_install() { - java-pkg-simple_src_install - dodoc README.md src/etc/announcement.msg -} - -src_test() { - local DIR="src/test/java" - local CP="${DIR}/../resources:${DIR}:${PN}.jar:$(java-pkg_getjars joda-time,junit-4)" - - local TESTS=$(find "${DIR}" -name "*Test.java" ! -name AbstractTest.java ! -name PyImportTest.java) - TESTS="${TESTS//src\/test\/java\/}" - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} diff --git a/dev-java/sparsebitset/sparsebitset-1.2.ebuild b/dev-java/sparsebitset/sparsebitset-1.2.ebuild index bfada3fb296e..00667707eaa4 100644 --- a/dev-java/sparsebitset/sparsebitset-1.2.ebuild +++ b/dev-java/sparsebitset/sparsebitset-1.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/Spars LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64 ~x86" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild index fc11510e058b..610e73d56983 100644 --- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild +++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="${At}" LICENSE="sun-bcla-jms" SLOT=0 -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="doc" RDEPEND=">=virtual/jre-1.3" diff --git a/dev-java/swt/swt-4.10-r1.ebuild b/dev-java/swt/swt-4.10-r1.ebuild new file mode 100644 index 000000000000..527f20631194 --- /dev/null +++ b/dev-java/swt/swt-4.10-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.10" +KEYWORDS="~amd64 ~ppc64" +IUSE="cairo opengl webkit" + +COMMON_DEP=" + >=dev-libs/atk-1.10.2 + >=dev-libs/glib-2.32 + >=x11-libs/gtk+-2.6.8:2 + x11-libs/libXtst + cairo? ( >=x11-libs/cairo-1.4.14 ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.8:* + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' + +PATCHES=( + "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch +) + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +src_prepare() { + # Replace the build.xml to allow compilation without Eclipse tasks + cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" + mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" + + # Apply patches + default + + # Define missing g_thread_supported() to be already started. + sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die + + # Webext is also in the library directory + sed -i 's|findResource([^,]\+|findResource("swt"|' \ + "${S}"/src/org/eclipse/swt/browser/WebKit.java || die +} + +src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + local AWT_ARCH + local JAWTSO="libjawt.so" + if [[ $(tc-arch) == 'ppc64' ]] ; then + # no big-endian support + AWT_ARCH="ppc64le" + else + AWT_ARCH="amd64" + fi + if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" + elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" + elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then + export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" + elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then + export AWT_LIB_PATH="${JAVA_HOME}/lib" + else + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + export SWT_PTR_CFLAGS=-DJNI64 + + # Bug #461784, g_thread_init is deprecated since glib-2.32. + append-cflags -DNO__1g_1thread_1init + + local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building WebKit component" + ${make} make_webkit make_webkit2extension + fi + + einfo "Building JNI libraries" + eant compile + + einfo "Copying missing files" + cp -i "${S}/version.txt" "${S}/build/version.txt" || die + cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ + "${S}/build/org/eclipse/swt/internal/" || die + unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die + + einfo "Packing JNI libraries" + eant jar +} + +src_install() { + local swtArch=${ARCH} + use amd64 && swtArch=x86_64 + + sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die + remove_from_manifest() { + local subpkg=$1 + sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die + } + use cairo || remove_from_manifest cairo + use opengl || remove_from_manifest opengl.glx + use webkit || remove_from_manifest webkit + java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" + + java-pkg_sointo "/usr/$(get_libdir)/swt" + java-pkg_doso *.so + + dodoc about.html +} diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild deleted file mode 100644 index 13b1abd63b38..000000000000 --- a/dev-java/swt/swt-4.10.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/" -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.10" -KEYWORDS="~amd64 ~ppc64" -IUSE="cairo opengl webkit" - -COMMON_DEP=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.32 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( - net-libs/webkit-gtk:4 - )" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8 - app-arch/unzip - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' - -PATCHES=( - "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch -) - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -src_prepare() { - # Replace the build.xml to allow compilation without Eclipse tasks - cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" - mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - - # Apply patches - default - - # Define missing g_thread_supported() to be already started. - sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die - - # Webext is also in the library directory - sed -i 's|findResource([^,]\+|findResource("swt"|' \ - "${S}"/src/org/eclipse/swt/browser/WebKit.java || die -} - -src_compile() { - append-cflags -fcommon # https://bugs.gentoo.org/707838 - - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - local AWT_ARCH - local JAWTSO="libjawt.so" - if [[ $(tc-arch) == 'ppc64' ]] ; then - # no big-endian support - AWT_ARCH="ppc64le" - else - AWT_ARCH="amd64" - fi - if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" - elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" - elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then - export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" - elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then - export AWT_LIB_PATH="${JAVA_HOME}/lib" - else - eerror "${JAWTSO} not found in the JDK being used for compilation!" - die "cannot build AWT library" - fi - - # Fix the pointer size for AMD64 - export SWT_PTR_CFLAGS=-DJNI64 - - # Bug #461784, g_thread_init is deprecated since glib-2.32. - append-cflags -DNO__1g_1thread_1init - - local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" - - einfo "Building AWT library" - ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" - - einfo "Building SWT library" - ${make} make_swt - - einfo "Building JAVA-AT-SPI bridge" - ${make} make_atk - - if use cairo ; then - einfo "Building CAIRO support" - ${make} make_cairo - fi - - if use opengl ; then - einfo "Building OpenGL component" - ${make} make_glx - fi - - if use webkit ; then - einfo "Building WebKit component" - ${make} make_webkit make_webkit2extension - fi - - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" || die - cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ - "${S}/build/org/eclipse/swt/internal/" || die - unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die - - einfo "Packing JNI libraries" - eant jar -} - -src_install() { - local swtArch=${ARCH} - use amd64 && swtArch=x86_64 - - sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die - remove_from_manifest() { - local subpkg=$1 - sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - } - use cairo || remove_from_manifest cairo - use opengl || remove_from_manifest opengl.glx - use webkit || remove_from_manifest webkit - java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" - - java-pkg_sointo "/usr/$(get_libdir)/swt" - java-pkg_doso *.so - - dodoc about.html -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild index c750d5ea6f6f..0a4f99352d99 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild index d5d3aa1096eb..8846bfbc900c 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.1" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild index 12c59541c7f8..6a6fd33a63f6 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="4.0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest index 2a4c459fafe7..8c6360068295 100644 --- a/dev-java/xom/Manifest +++ b/dev-java/xom/Manifest @@ -1,4 +1 @@ -DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309 -DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680 -DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4 DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262 diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch deleted file mode 100644 index 3187e437306b..000000000000 --- a/dev-java/xom/files/xom-1.2.6.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nur XOM/build.xml XOM_patched/build.xml ---- XOM/build.xml 2010-06-21 06:03:14.000000000 +0300 -+++ XOM_patched/build.xml 2011-03-13 07:05:01.000000000 +0200 -@@ -21,7 +21,6 @@ - subject line. The XOM home page is http://www.xom.nu/ - --> - -- - - Build XOM - -@@ -71,7 +70,7 @@ - - - -- -+ - - - -@@ -226,7 +225,7 @@ - encoding="UTF-8" - fork="true" - includeAntRuntime="false" -- excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> -+excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/"> - - - -@@ -323,7 +322,7 @@ - - - -+ classpath="${lib.dir}/jarjar.jar"/> - - - -- -- -+ - -Don't build and install fallback parser relying on internel classes of -SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119 - ---- /tmp/build.xml -+++ /tmp/build.xml -@@ -235,10 +235,6 @@ - ${version} - - -- -- -- - - - diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild deleted file mode 100644 index 434b57752e5d..000000000000 --- a/dev-java/xom/xom-1.2.10.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-ant-2 - -JAXEN_V="1.1.6" -JAXEN_P="jaxen-${JAXEN_V}" - -DESCRIPTION="A new XML object model" -HOMEPAGE="http://cafeconleche.org/XOM/index.html" -# Bundled jaxen as its moved under XOM's namespace -SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz - http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" - -COMMON_DEPEND="dev-java/xerces:2 - dev-java/xml-commons-external:1.3 - examples? ( java-virtuals/servlet-api:2.4 )" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPEND}" - -DEPEND=">=virtual/jdk-1.4 - dev-java/jarjar:1 - ${COMMON_DEPEND}" - -S="${WORKDIR}/XOM" - -# Test require network access to pass. -# They need a redirected http document on public web. -RESTRICT="test" - -java_prepare() { - epatch "${FILESDIR}/${PN}-1.2.6.patch" - epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119 - - # Delete test files as they aren't installed - rm -vr src/nu/xom/tests || die - - # Delete bundled jars - rm -v *.jar lib/*.jar || die - - # Delete bundled classes - find . -name "*.class" -delete -print || die - - # Move bundled jaxen to where the build.xml expects it - mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die - - java-pkg_jar-from --into lib/ xml-commons-external-1.3 - java-pkg_jar-from --into lib/ xerces-2 - java-pkg_jar-from --build-only --into lib/ jarjar-1 - - # Tagsoup is only needed to run betterdoc but we use the pregenerated ones. -} - -src_compile() { - local ant_flags="-Ddebug=off" - use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servlet-api-2.4 servlet-api.jar)" - - ANT_TASKS="jarjar-1" eant jar ${ant_flags}\ - $(use examples && echo samples) -} - -src_install() { - java-pkg_newjar build/${P}.jar ${PN}.jar - use examples && java-pkg_dojar build/xom-samples.jar - dodoc Todo.txt - - use doc && java-pkg_dojavadoc apidocs/ - use source && java-pkg_dosrc src/* - use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples -} diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild deleted file mode 100644 index b7321e970a26..000000000000 --- a/dev-java/xom/xom-1.3.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="XML Object Model" -HOMEPAGE="http://cafeconleche.org/XOM/index.html" -SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" - -CDEPEND=" - dev-java/xerces:2 - dev-java/jaxen:1.1 - dev-java/xml-commons-external:1.3" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6" - -JAVA_GENTOO_CLASSPATH=" - xerces-2 - jaxen-1.1 - xml-commons-external-1.3" - -JAVA_SRC_DIR="nu" - -src_prepare() { - default - - rm -r nu/xom/integrationtests/ || die -} diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild index 87dbb6c9df9b..5289b1b22b80 100644 --- a/dev-java/xom/xom-1.3.7.ebuild +++ b/dev-java/xom/xom-1.3.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.g LICENSE="LGPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" CDEPEND=" dev-java/jaxen:1.2 -- cgit v1.3.1