1 |
commit: b78ea64a3278405e67a596d7a8ab9f6effbb40c2 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 10 22:18:52 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 10 22:18:52 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b78ea64a |
7 |
|
8 |
dev-java/freemarker: fix VariableScope (EROOT) |
9 |
|
10 |
Let's use ${EPREFIX} for now as we're on EAPI 6. |
11 |
(But it seems right anyway.) |
12 |
|
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-java/freemarker/freemarker-2.3.25.ebuild | 4 ++-- |
16 |
1 file changed, 2 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild |
19 |
index 8c7f2fd962d..a2a490feb6c 100644 |
20 |
--- a/dev-java/freemarker/freemarker-2.3.25.ebuild |
21 |
+++ b/dev-java/freemarker/freemarker-2.3.25.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2018 Gentoo Authors |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
@@ -54,7 +54,7 @@ src_prepare() { |
29 |
sed -i \ |
30 |
-e '/<ivy:cachepath/d' \ |
31 |
-e 's/"ivy\.dep[^"]*"/"gentoo.classpath"/g' \ |
32 |
- -e "s:javacchome=\"[^\"]*\":javacchome=\"${EROOT}usr/share/javacc/lib\":g" \ |
33 |
+ -e "s:javacchome=\"[^\"]*\":javacchome=\"${EPREFIX%/}/usr/share/javacc/lib\":g" \ |
34 |
build.xml || die |
35 |
|
36 |
java-pkg-2_src_prepare |