[gentoo-commits] repo/gentoo:master commit in: eclass/

[James Le Cuirot]

commit:     92093dee341a1b01d8152df36d14d04bf90d3e25
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 20:46:07 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 20:46:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92093dee

java-pkg-simple.eclass: Rename JAVA_CLASSPATH_EXTRA

…to JAVA_GENTOO_CLASSPATH_EXTRA to make this consistent with the EANT
variables. Only one ebuild to fix.

 eclass/java-pkg-simple.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 48d0757..8c9ca04 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -40,7 +40,7 @@ S="${WORKDIR}"
 #      JAVA_GENTOO_CLASSPATH="foo,bar-2"
 # @CODE
 
-# @ECLASS-VARIABLE: JAVA_CLASSPATH_EXTRA
+# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Extra list of colon separated path elements to be put on the
@@ -93,7 +93,7 @@ java-pkg-simple_src_compile() {
        mkdir -p ${classes} || die "Could not create target directory"
 
        # compile
-       local classpath="${JAVA_CLASSPATH_EXTRA}" dependency
+       local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency
        for dependency in ${JAVA_GENTOO_CLASSPATH}; do
                classpath="${classpath}:$(java-pkg_getjars ${dependency})" \
                        || die "getjars failed for ${dependency}"