diff options
Diffstat (limited to 'dev-java/jeuclid-core')
| -rw-r--r-- | dev-java/jeuclid-core/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch | 18 | ||||
| -rw-r--r-- | dev-java/jeuclid-core/files/jeuclid-core-no-freehep.patch | 4 | ||||
| -rw-r--r-- | dev-java/jeuclid-core/jeuclid-core-3.1.14.ebuild (renamed from dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild) | 43 |
4 files changed, 27 insertions, 40 deletions
diff --git a/dev-java/jeuclid-core/Manifest b/dev-java/jeuclid-core/Manifest index 5591eeba1..6df1751b1 100644 --- a/dev-java/jeuclid-core/Manifest +++ b/dev-java/jeuclid-core/Manifest @@ -1 +1 @@ -DIST jeuclid-parent-3.1.9-src.zip 8858746 BLAKE2B db3a7b9dc20e7cadd4b8bf6c4820a6e8895c9533bc5e3c55b1a6296c01ec3067d6a7782b0958c475fd0324e8d44587e4016e2af23a54e9a0acf47538a7ebd97c SHA512 ae55ffa469664abbf5545479d7968fd36e003ccc3f21687a43e79d843d6d3855b779ebeca3d38cc0c4a466c2de21bffce8e7d14cb2199f57e125b58ac100f203 +DIST jeuclid-core-3.1.14.tar.gz 7244186 BLAKE2B 9cada848e516aba942ef87e7b746296f9565d5271a1ce6635e80e6559edcedac3245c4bde28e8d1053cacc5774e6a015079b0281802559e86366a75223b8ea2c SHA512 7b52491d7fac40a13f41176a49f36411681c957aba95c23bb6396f4e1248f5463afcd5394b0bb8e3dfbdd498d3290ac5f787e876636f5f282b703a72799eff4e diff --git a/dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch b/dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch deleted file mode 100644 index 2ff46700a..000000000 --- a/dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java -=================================================================== ---- jeuclid-parent-3.1.9.orig/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java 2010-02-12 15:10:32.000000000 +0100 -+++ jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java 2013-08-20 14:55:16.000000000 +0200 -@@ -52,10 +52,10 @@ - */ - @SuppressWarnings("unchecked") - protected ConverterRegistry() { -- final Iterator<ConverterDetector> it = Service -- .providers(ConverterDetector.class); -+ final Iterator<Object> it = Service -+ .providers(ConverterDetector.class); - while (it.hasNext()) { -- final ConverterDetector det = it.next(); -+ final ConverterDetector det = (ConverterDetector) it.next(); - det.detectConversionPlugins(this); - } - } diff --git a/dev-java/jeuclid-core/files/jeuclid-core-no-freehep.patch b/dev-java/jeuclid-core/files/jeuclid-core-no-freehep.patch index 798dac293..daf123c92 100644 --- a/dev-java/jeuclid-core/files/jeuclid-core-no-freehep.patch +++ b/dev-java/jeuclid-core/files/jeuclid-core-no-freehep.patch @@ -1,5 +1,5 @@ ---- build.xml.orig 2010-01-22 17:46:35.000000000 +0000 -+++ build.xml 2010-01-22 17:49:07.000000000 +0000 +--- a/build.xml 2010-01-22 17:46:35.000000000 +0000 ++++ b/build.xml 2010-01-22 17:49:07.000000000 +0000 @@ -113,6 +113,7 @@ <src> <pathelement location="src/main/java"/> diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild b/dev-java/jeuclid-core/jeuclid-core-3.1.14.ebuild index 73e4e85d6..81910f356 100644 --- a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild +++ b/dev-java/jeuclid-core/jeuclid-core-3.1.14.ebuild @@ -1,47 +1,52 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="source" inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Core module of MathML rendering solution" -HOMEPAGE="http://jeuclid.sourceforge.net/" -SRC_URI="mirror://sourceforge/jeuclid/jeuclid-parent-${PV}-src.zip" +HOMEPAGE="https://github.com/rototor/jeuclid" +SRC_URI="https://github.com/rototor/jeuclid/archive/jeuclid-parent-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" -IUSE="" - -COMMON_DEPEND="dev-java/ant-core - dev-java/batik:1.8= - dev-java/commons-logging - dev-java/jcip-annotations +KEYWORDS="~amd64" + +COMMON_DEPEND=" + dev-java/ant-core:0 + dev-java/batik:1.9 + dev-java/commons-logging:0 + dev-java/jcip-annotations:0 + dev-java/jsr305:0 dev-java/xml-commons-external:1.3 - dev-java/xmlgraphics-commons:2" + dev-java/xmlgraphics-commons:2 +" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=">=virtual/jre-1.7 ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip +DEPEND=">=virtual/jdk-1.7 ${COMMON_DEPEND}" -S="${WORKDIR}/jeuclid-parent-${PV}/${PN}" +S="${WORKDIR}/jeuclid-jeuclid-parent-${PV}/${PN}" + +PATCHES=( + "${FILESDIR}"/${PN}-no-freehep.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-no-freehep.patch \ - "${FILESDIR}"/${PN}-cast-issue.patch + default # create directory for dependencies mkdir lib && cd lib || die # add dependencies into the lib dir java-pkg_jar-from ant-core ant.jar - java-pkg_jar-from batik-1.8 batik-all.jar + java-pkg_jar-from batik-1.9 batik-all.jar java-pkg_jar-from commons-logging,jcip-annotations,xml-commons-external-1.3 java-pkg_jar-from xml-commons-external-1.3,xmlgraphics-commons-2 + java-pkg_jar-from jsr305 } src_install() { |