Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 01 Nov 2015 20:51:03
Message-Id: 1446410767.92093dee341a1b01d8152df36d14d04bf90d3e25.chewi@gentoo
1 commit: 92093dee341a1b01d8152df36d14d04bf90d3e25
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 1 20:46:07 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 1 20:46:07 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92093dee
7
8 java-pkg-simple.eclass: Rename JAVA_CLASSPATH_EXTRA
9
10 …to JAVA_GENTOO_CLASSPATH_EXTRA to make this consistent with the EANT
11 variables. Only one ebuild to fix.
12
13 eclass/java-pkg-simple.eclass | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
17 index 48d0757..8c9ca04 100644
18 --- a/eclass/java-pkg-simple.eclass
19 +++ b/eclass/java-pkg-simple.eclass
20 @@ -40,7 +40,7 @@ S="${WORKDIR}"
21 # JAVA_GENTOO_CLASSPATH="foo,bar-2"
22 # @CODE
23
24 -# @ECLASS-VARIABLE: JAVA_CLASSPATH_EXTRA
25 +# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA
26 # @DEFAULT_UNSET
27 # @DESCRIPTION:
28 # Extra list of colon separated path elements to be put on the
29 @@ -93,7 +93,7 @@ java-pkg-simple_src_compile() {
30 mkdir -p ${classes} || die "Could not create target directory"
31
32 # compile
33 - local classpath="${JAVA_CLASSPATH_EXTRA}" dependency
34 + local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency
35 for dependency in ${JAVA_GENTOO_CLASSPATH}; do
36 classpath="${classpath}:$(java-pkg_getjars ${dependency})" \
37 || die "getjars failed for ${dependency}"