Skip to content

Commit 228d474

Browse files
Nowa-AmmerlaanTheChymera
authored andcommitted
dev-java/jeuclid-core: EAPI bump, version bump, add keyword
Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net> Signed-off-by: Horea Christian <chr@chymera.eu> Closes: gentoo#1024
1 parent 487d6d2 commit 228d474

4 files changed

Lines changed: 27 additions & 40 deletions

File tree

‎dev-java/jeuclid-core/Manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DIST jeuclid-parent-3.1.9-src.zip 8858746 BLAKE2B db3a7b9dc20e7cadd4b8bf6c4820a6e8895c9533bc5e3c55b1a6296c01ec3067d6a7782b0958c475fd0324e8d44587e4016e2af23a54e9a0acf47538a7ebd97c SHA512 ae55ffa469664abbf5545479d7968fd36e003ccc3f21687a43e79d843d6d3855b779ebeca3d38cc0c4a466c2de21bffce8e7d14cb2199f57e125b58ac100f203
1+
DIST jeuclid-core-3.1.14.tar.gz 7244186 BLAKE2B 9cada848e516aba942ef87e7b746296f9565d5271a1ce6635e80e6559edcedac3245c4bde28e8d1053cacc5774e6a015079b0281802559e86366a75223b8ea2c SHA512 7b52491d7fac40a13f41176a49f36411681c957aba95c23bb6396f4e1248f5463afcd5394b0bb8e3dfbdd498d3290ac5f787e876636f5f282b703a72799eff4e

‎dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎dev-java/jeuclid-core/files/jeuclid-core-no-freehep.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- build.xml.orig 2010-01-22 17:46:35.000000000 +0000
2-
+++ build.xml 2010-01-22 17:49:07.000000000 +0000
1+
--- a/build.xml 2010-01-22 17:46:35.000000000 +0000
2+
+++ b/build.xml 2010-01-22 17:49:07.000000000 +0000
33
@@ -113,6 +113,7 @@
44
<src>
55
<pathelement location="src/main/java"/>

dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild renamed to dev-java/jeuclid-core/jeuclid-core-3.1.14.ebuild

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,52 @@
1-
# Copyright 1999-2015 Gentoo Foundation
1+
# Copyright 1999-2021 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

4-
EAPI=5
4+
EAPI=7
55
JAVA_PKG_IUSE="source"
66
inherit eutils java-pkg-2 java-ant-2
77

88
DESCRIPTION="Core module of MathML rendering solution"
9-
HOMEPAGE="http://jeuclid.sourceforge.net/"
10-
SRC_URI="mirror://sourceforge/jeuclid/jeuclid-parent-${PV}-src.zip"
9+
HOMEPAGE="https://github.com/rototor/jeuclid"
10+
SRC_URI="https://github.com/rototor/jeuclid/archive/jeuclid-parent-${PV}.tar.gz -> ${P}.tar.gz"
1111

1212
LICENSE="Apache-2.0"
1313
SLOT="0"
14-
KEYWORDS=""
15-
IUSE=""
16-
17-
COMMON_DEPEND="dev-java/ant-core
18-
dev-java/batik:1.8=
19-
dev-java/commons-logging
20-
dev-java/jcip-annotations
14+
KEYWORDS="~amd64"
15+
16+
COMMON_DEPEND="
17+
dev-java/ant-core:0
18+
dev-java/batik:1.9
19+
dev-java/commons-logging:0
20+
dev-java/jcip-annotations:0
21+
dev-java/jsr305:0
2122
dev-java/xml-commons-external:1.3
22-
dev-java/xmlgraphics-commons:2"
23+
dev-java/xmlgraphics-commons:2
24+
"
2325

24-
RDEPEND=">=virtual/jre-1.5
26+
RDEPEND=">=virtual/jre-1.7
2527
${COMMON_DEPEND}"
2628

27-
DEPEND=">=virtual/jdk-1.5
28-
app-arch/unzip
29+
DEPEND=">=virtual/jdk-1.7
2930
${COMMON_DEPEND}"
3031

31-
S="${WORKDIR}/jeuclid-parent-${PV}/${PN}"
32+
S="${WORKDIR}/jeuclid-jeuclid-parent-${PV}/${PN}"
33+
34+
PATCHES=(
35+
"${FILESDIR}"/${PN}-no-freehep.patch
36+
)
3237

3338
src_prepare() {
34-
epatch "${FILESDIR}"/${PN}-no-freehep.patch \
35-
"${FILESDIR}"/${PN}-cast-issue.patch
39+
default
3640

3741
# create directory for dependencies
3842
mkdir lib && cd lib || die
3943

4044
# add dependencies into the lib dir
4145
java-pkg_jar-from ant-core ant.jar
42-
java-pkg_jar-from batik-1.8 batik-all.jar
46+
java-pkg_jar-from batik-1.9 batik-all.jar
4347
java-pkg_jar-from commons-logging,jcip-annotations,xml-commons-external-1.3
4448
java-pkg_jar-from xml-commons-external-1.3,xmlgraphics-commons-2
49+
java-pkg_jar-from jsr305
4550
}
4651

4752
src_install() {

0 commit comments

Comments
 (0)