java-utils-2.eclass: Use insinto & insopts instead of vars, #566480

Replace INSDESTTREE and INSOPTIONS internal variable references with
correct calls to insinto & insopts, using a subshell to scope them.

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 65e7197ef427c8785c31e5e405f0ee58d6e1b36e..3b58a25dbb39858288e24d4118c62c46554d10f1 100644 (file)
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -348,8 +348,10 @@ java-pkg_dojar() {
                                #but first check class version when in strict mode.
                                is-java-strict && java-pkg_verify-classes "${jar}"
 
-                               INSDESTTREE="${JAVA_PKG_JARDEST}" \
-                                       doins "${jar}" || die "failed to install ${jar}"
+                               (
+                                       insinto "${JAVA_PKG_JARDEST}"
+                                       doins "${jar}"
+                               ) || die "failed to install ${jar}"
                                java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
                                debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
                        # make a symlink to the original jar if it's symlink
@@ -493,9 +495,11 @@ java-pkg_doso() {
                if [[ -e "${lib}" ]] ; then
                        # install if it isn't a symlink
                        if [[ ! -L "${lib}" ]] ; then
-                               INSDESTTREE="${JAVA_PKG_LIBDEST}" \
-                                       INSOPTIONS="-m0755" \
-                                       doins "${lib}" || die "failed to install ${lib}"
+                               (
+                                       insinto "${JAVA_PKG_LIBDEST}"
+                                       insopts -m0755
+                                       doins "${lib}"
+                               ) || die "failed to install ${lib}"
                                java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
                                debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
                        # otherwise make a symlink to the symlink's origin
@@ -724,8 +728,10 @@ java-pkg_dosrc() {
        done
 
        # Install the zip
-       INSDESTTREE=${JAVA_PKG_SOURCESPATH} \
-               doins ${zip_path} || die "Failed to install source"
+       (
+               insinto "${JAVA_PKG_SOURCESPATH}"
+               doins ${zip_path}
+       ) || die "Failed to install source"
 
        JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
 
@@ -864,9 +870,11 @@ java-pkg_dowar() {
                fi
 
                # Install those files like you mean it
-               INSOPTIONS="-m 0644" \
-                       INSDESTTREE=${JAVA_PKG_WARDEST} \
+               (
+                       insopts -m0644
+                       insinto "${JAVA_PKG_WARDEST}"
                        doins ${warpath}
+               )
        done
 }