Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 591160 | Differences between
and this patch

Collapse All | Expand All

(-)a/eclass/java-ant-2.eclass (-5 / +5 lines)
Lines 245-256 java-ant_bsfix_files() { Link Here
245
		done
245
		done
246
246
247
		# for javadoc target and all in one pass, we need the new rewriter.
247
		# for javadoc target and all in one pass, we need the new rewriter.
248
		local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py"
248
		local rewriter3="${EPREFIX}/usr/share/javatoolkit/xml-rewrite-3.py"
249
		if [[ ! -f ${rewriter3} ]]; then
249
		if [[ ! -f ${rewriter3} ]]; then
250
			rewriter3="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
250
			rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
251
		fi
251
		fi
252
252
253
		local rewriter4="/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite"
253
		local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite"
254
254
255
		if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then
255
		if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then
256
			[[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g"
256
			[[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g"
Lines 458-465 java-ant_ignore-system-classes() { Link Here
458
# @DESCRIPTION:
458
# @DESCRIPTION:
459
# Run the right xml-rewrite binary with the given arguments
459
# Run the right xml-rewrite binary with the given arguments
460
java-ant_xml-rewrite() {
460
java-ant_xml-rewrite() {
461
	local gen2="/usr/bin/xml-rewrite-2.py"
461
	local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py"
462
	local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
462
	local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
463
	# gen1 is deprecated
463
	# gen1 is deprecated
464
	if [[ -x "${gen2}" ]]; then
464
	if [[ -x "${gen2}" ]]; then
465
		${gen2} "${@}" || die "${gen2} failed"
465
		${gen2} "${@}" || die "${gen2} failed"

Return to bug 591160