radhermit 14/04/09 21:55:12 Modified: ChangeLog java-utils-2.eclass Log: Only refer to DESTTREE within the src_install phase.
Revision Changes Path 1.1202 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1202&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1202&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1201&r2=1.1202 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1201 retrieving revision 1.1202 diff -u -r1.1201 -r1.1202 --- ChangeLog 9 Apr 2014 21:34:10 -0000 1.1201 +++ ChangeLog 9 Apr 2014 21:55:12 -0000 1.1202 @@ -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 <[email protected]> java-utils-2.eclass: + Only refer to DESTTREE within the src_install phase. 09 Apr 2014; Michał Górny <[email protected]> python-r1.eclass: Re-enable the python_gen_usedep empty argument check. 1.156 eclass/java-utils-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.156&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.156&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.155&r2=1.156 Index: java-utils-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- java-utils-2.eclass 6 Oct 2013 14:37:31 -0000 1.155 +++ java-utils-2.eclass 9 Apr 2014 21:55:12 -0000 1.156 @@ -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 @@ [[ ${#} -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 @@ # 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_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 @@ [[ -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}"
