Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/geogebra/
Date: Tue, 21 Nov 2017 10:21:12
Message-Id: 1511259627.e9742e25a4746e6e4b2cf97cc5428689bcfc0d9d.amynka@gentoo
1 commit: e9742e25a4746e6e4b2cf97cc5428689bcfc0d9d
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 21 10:17:53 2017 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 21 10:20:27 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9742e25
7
8 sci-mathematics/geogebra: enable oracle-jdk-bin during buildtime
9
10 Closes:https://bugs.gentoo.org/615884
11
12 Package-Manager: Portage-2.3.8, Repoman-2.3.3
13
14 ...9.0_p20170308.ebuild => geogebra-5.0.339.0_p20170308-r1.ebuild} | 7 ++++++-
15 1 file changed, 6 insertions(+), 1 deletion(-)
16
17 diff --git a/sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308.ebuild b/sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308-r1.ebuild
18 similarity index 99%
19 rename from sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308.ebuild
20 rename to sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308-r1.ebuild
21 index 22c7ea2ca1a..2ff4ab0b084 100644
22 --- a/sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308.ebuild
23 +++ b/sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308-r1.ebuild
24 @@ -3,7 +3,7 @@
25
26 EAPI=6
27
28 -inherit eutils gnome2-utils xdg
29 +inherit eutils gnome2-utils xdg java-pkg-2
30
31 MY_COMMIT_HASH="7d5ac993d3f88f6701f56edbfe325d86afcaad87"
32
33 @@ -242,6 +242,7 @@ IUSE=""
34 RESTRICT="bindist"
35 DEPEND="dev-java/oracle-jdk-bin[javafx]
36 >=dev-java/gradle-bin-3.0"
37 +
38 # Requires oracle-jdk/jre-bin because there is no openjfx ebuild as of now
39 RDEPEND="|| (
40 dev-java/oracle-jre-bin[javafx]
41 @@ -250,6 +251,10 @@ RDEPEND="|| (
42
43 S="${WORKDIR}/${PN}-${MY_COMMIT_HASH}/"
44
45 +JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
46 +JAVA_PKG_WANT_SOURCE="1.8"
47 +JAVA_PKG_WANT_TARGET="1.8"
48 +
49 # Override the repositories with our local maven repository
50 # so that it doesn't attemp to fetch from the network
51 __set_gradle_repositories() {