summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-contrib/Manifest1
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild75
-rw-r--r--dev-java/ant-contrib/metadata.xml1
-rw-r--r--dev-java/bcel/bcel-6.5.0-r1.ebuild80
-rw-r--r--dev-java/commons-math/Manifest1
-rw-r--r--dev-java/commons-math/commons-math-2.1-r2.ebuild42
-rw-r--r--dev-java/commons-math/commons-math-3.2-r1.ebuild (renamed from dev-java/commons-math/commons-math-3.2.ebuild)12
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r1.ebuild (renamed from dev-java/commons-math/commons-math-3.6.1.ebuild)8
-rw-r--r--dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch19
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild48
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild (renamed from dev-java/snakeyaml/snakeyaml-1.28.ebuild)4
11 files changed, 170 insertions, 121 deletions
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 8290b6b58b9c..8b26c2ae497b 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1 +1,2 @@
+DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
new file mode 100644
index 000000000000..1bb5cc2dc7a3
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
+DESCRIPTION="Ant-contrib tasks for Apache Ant"
+HOMEPAGE="https://sourceforge.net/projects/ant-contrib/:80"
+SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
+# org.apache.ant:ant:1.9.15 -> >=dev-java/ant-core-1.10.9:0
+# org.apache.bcel:bcel:5.1 -> >=dev-java/bcel-6.5.0:0
+# org.apache.ivy:ivy:2.5.0 -> >=dev-java/ant-ivy-2.5.0:2
+# org.jvnet.hudson:ivy:1.4.1 -> !!!groupId-not-found!!!
+# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
+
+CDEPEND="
+ >=dev-java/ant-core-1.10.9:0
+ >=dev-java/ant-ivy-2.3.0:2
+ >=dev-java/bcel-6.5.0:0
+ >=dev-java/commons-httpclient-3.1:3
+ >=dev-java/xerces-2.12.0:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+ test? (
+ >=dev-java/ant-core-1.10.9:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
+
+# JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_SRC_DIR="test/src"
+JAVA_TEST_RESOURCE_DIRS="test/resources"
+
+src_prepare() {
+ default
+ sed -i \
+ -e '/^import/s/fr.jayasoft.ivy.ant/org.apache.ivy.ant/' \
+ src/main/java/net/sf/antcontrib/net/Ivy14Adapter.java || die
+}
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
index 3119e6af05cf..7883f4c823e7 100644
--- a/dev-java/ant-contrib/metadata.xml
+++ b/dev-java/ant-contrib/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">ant-contrib</remote-id>
+ <remote-id type="github">cniweb/ant-contrib</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-java/bcel/bcel-6.5.0-r1.ebuild b/dev-java/bcel/bcel-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..183c85a56fa3
--- /dev/null
+++ b/dev-java/bcel/bcel-6.5.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0-r1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.bcel:bcel:6.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
+SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? net.java.dev.jna:jna:5.5.0 -> !!!groupId-not-found!!!
+# test? net.java.dev.jna:jna-platform:5.5.0 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ !arm? (
+ !arm64? (
+ !ppc64? (
+ test? (
+ dev-java/commons-collections:4
+ dev-java/commons-lang:3.6
+ dev-java/jna:4
+ dev-java/jmh-core:0
+ dev-java/oracle-javamail:0
+ )
+ )
+ )
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+RESTRICT="!test? ( test ) arm? ( test ) arm64? ( test ) ppc64? ( test )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+ # Invalid test class
+ "org.apache.bcel.data.AnonymousClassTest"
+ "org.apache.bcel.verifier.tests.TestArray01"
+ "org.apache.bcel.verifier.tests.TestArrayAccess01"
+ "org.apache.bcel.verifier.tests.TestArrayAccess02Creator"
+ "org.apache.bcel.verifier.tests.TestArrayAccess03Creator"
+ "org.apache.bcel.verifier.tests.TestArrayAccess04Creator"
+ "org.apache.bcel.verifier.tests.TestLegalInvokeInterface01"
+ "org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01"
+ "org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02"
+ "org.apache.bcel.verifier.tests.TestLegalInvokeStatic01"
+ "org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01"
+ "org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02"
+ "org.apache.bcel.verifier.tests.TestReturn01Creator"
+ "org.apache.bcel.verifier.tests.TestReturn02"
+ "org.apache.bcel.verifier.tests.TestCreator"
+ "org.apache.bcel.verifier.tests.TestReturn03Creator"
+)
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index ff7a701a4109..753de6caac6a 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,3 +1,2 @@
-DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
diff --git a/dev-java/commons-math/commons-math-2.1-r2.ebuild b/dev-java/commons-math/commons-math-2.1-r2.ebuild
deleted file mode 100644
index b18fc803124f..000000000000
--- a/dev-java/commons-math/commons-math-2.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc test source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="https://commons.apache.org/math/"
-SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- >=virtual/jdk-1.6
- test? (
- dev-java/ant-junit4
- dev-java/hamcrest-core:0
- )"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=( "${FILESDIR}"/${PF}-buildfixes.patch )
-
-src_test() {
- java-pkg_jar-from junit-4
- java-pkg_jar-from hamcrest-core
- ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc target/apidocs
- use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild b/dev-java/commons-math/commons-math-3.2-r1.ebuild
index 0fcdf307223b..504819e8dd6b 100644
--- a/dev-java/commons-math/commons-math-3.2.ebuild
+++ b/dev-java/commons-math/commons-math-3.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
# Tests are currently broken due to nasty -lib argument.
JAVA_PKG_IUSE="doc source" # test
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
-DEPEND=">=virtual/jdk-1.5"
+DEPEND=">=virtual/jdk-1.8:*"
# Tests are currently broken due to nasty -lib argument.
# test? (
@@ -27,11 +27,13 @@ DEPEND=">=virtual/jdk-1.5"
# dev-java/hamcrest-core:0
# )"
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${MY_P}-src"
-java_prepare() {
+src_prepare() {
+ default
+
cp "${FILESDIR}"/${P}-build.xml build.xml || die
sed -i 's/manifest=".*MANIFEST.MF"//g' build.xml || die
diff --git a/dev-java/commons-math/commons-math-3.6.1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index 71c61da8a32a..39c582e3688d 100644
--- a/dev-java/commons-math/commons-math-3.6.1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc examples source"
@@ -15,9 +15,9 @@ HOMEPAGE="https://commons.apache.org/math/"
SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
-> ${MY_P}.jar"
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="3"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch b/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
deleted file mode 100644
index 6d768969e79c..000000000000
--- a/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build.xml 2010-10-24 11:20:46.000000000 +0300
-+++ build.xml.fixed 2010-10-24 11:25:42.000000000 +0300
-@@ -114,6 +114,7 @@
- <pathelement location="${build.home}/classes"/>
- <pathelement location="${build.home}/test-classes"/>
- <pathelement location="${junit.jar}"/>
-+ <pathelement location="hamcrest-core.jar"/>
- <path refid="downloaded.lib.classpath"/>
- </path>
-
-@@ -232,7 +233,7 @@
-
- <!-- ========== Create Jar ================================================ -->
-
-- <target name="jar" depends="test" description="Create jar file">
-+ <target name="jar" depends="compile" description="Create jar file">
-
- <mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
deleted file mode 100644
index 50ea5b36cd6b..000000000000
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 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-ant-2
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
-HOMEPAGE="https://java.net/projects/javamail/pages/Home"
-SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
-
-# 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"
-IUSE=""
-
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6
-"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
- default
-
- # build.xml expects it here
- mkdir -p legal/src/main/resources/META-INF || die
- cp mail/src/main/resources/META-INF/LICENSE.txt \
- legal/src/main/resources/META-INF || die
-}
-
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
-
-src_install() {
- java-pkg_dojar target/release/mail.jar
-
- dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
- dohtml -r doc/release/{*.html,images}
-
- use doc && java-pkg_dojavadoc target/release/docs/javadocs
- use source && java-pkg_dosrc mail/src/main/java
-}
diff --git a/dev-java/snakeyaml/snakeyaml-1.28.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
index 2d332cd1d60d..1e82ec65a595 100644
--- a/dev-java/snakeyaml/snakeyaml-1.28.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
# Compile dependencies
# POM: pom.xml
@@ -35,7 +35,7 @@ DEPEND="
>=virtual/jdk-1.8:*
test? (
>=dev-java/commons-io-2.4:1
- >=dev-java/commons-lang-3.4:3.4
+ dev-java/commons-lang:3.6
>=dev-java/joda-time-2.10.10:0
>=dev-java/velocity-1.7:0
)