Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/jamvm/
Date: Sun, 05 Dec 2021 10:57:26
Message-Id: 1638701809.ca511696af9a1eba2b603935a5c86a3f61876374.flow@gentoo
1 commit: ca511696af9a1eba2b603935a5c86a3f61876374
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 5 10:56:49 2021 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 5 10:56:49 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=ca511696
7
8 dev-java/jamvm: update to EAPI 6
9
10 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
11
12 dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 15 +++++++++------
13 1 file changed, 9 insertions(+), 6 deletions(-)
14
15 diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
16 index 311dd65c..2e431766 100644
17 --- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
18 +++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
19 @@ -1,8 +1,7 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2021 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23 -# $Id$
24
25 -EAPI=5
26 +EAPI=6
27
28 inherit eutils flag-o-matic multilib java-vm-2 autotools
29
30 @@ -22,10 +21,14 @@ DEPEND="dev-java/gnu-classpath:0
31 sparc? ( virtual/libffi )"
32 RDEPEND="${DEPEND}"
33
34 -src_prepare() {
35 +PATCHES=(
36 # without this patch, classes.zip is not found at runtime
37 - epatch "${FILESDIR}/classes-location.patch"
38 - epatch "${FILESDIR}/noexecstack.patch"
39 + "${FILESDIR}/classes-location.patch"
40 + "${FILESDIR}/noexecstack.patch"
41 +)
42 +
43 +src_prepare() {
44 + eapply_user
45 eautoreconf
46
47 # These come precompiled.