diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2014-04-09 21:55:12 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2014-04-09 21:55:12 +0000 |
| commit | 2e55d93dcc22183e7dbf95eb10eb5215f523a5ad (patch) | |
| tree | d1a018b3f7eb2601274f0e8ead1ac7068d507476 | |
| parent | Version bump, requested by proxy maintainer (diff) | |
| download | gentoo-2-2e55d93dcc22183e7dbf95eb10eb5215f523a5ad.tar.gz gentoo-2-2e55d93dcc22183e7dbf95eb10eb5215f523a5ad.tar.bz2 gentoo-2-2e55d93dcc22183e7dbf95eb10eb5215f523a5ad.zip | |
Only refer to DESTTREE within the src_install phase.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cbf50a75ca5c..0b25e5bfdb52 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1201 2014/04/09 21:34:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1202 2014/04/09 21:55:12 radhermit Exp $ + + 09 Apr 2014; Tim Harder <radhermit@gentoo.org> java-utils-2.eclass: + Only refer to DESTTREE within the src_install phase. 09 Apr 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass: Re-enable the python_gen_usedep empty argument check. diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index b61e1bd630e5..43e3c3317429 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.155 2013/10/06 14:37:31 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.156 2014/04/09 21:55:12 radhermit Exp $ # @ECLASS: java-utils-2.eclass # @MAINTAINER: @@ -192,6 +192,7 @@ java-pkg_doexamples() { [[ ${#} -lt 1 ]] && die "At least one argument needed" java-pkg_check-phase install + java-pkg_init_paths_ local dest=/usr/share/doc/${PF}/examples if [[ ${1} == --subdir ]]; then @@ -543,6 +544,7 @@ java-pkg_dojavadoc() { # QA checks java-pkg_check-phase install + java-pkg_init_paths_ [[ -z "${dir}" ]] && die "Must specify a directory!" [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" @@ -2060,7 +2062,6 @@ java-pkg_init() { java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack" fi - java-pkg_init_paths_ java-pkg_switch-vm PATH=${JAVA_HOME}/bin:${PATH} @@ -2222,7 +2223,6 @@ java-pkg_init_paths_() { [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" - # TODO maybe only print once? debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}" debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}" |