--- java-ant-2.eclass.orig	2008-01-03 16:31:16.000000000 +1300
+++ java-ant-2.eclass	2008-01-09 22:01:53.000000000 +1300
@@ -224,7 +224,16 @@
 	else
 		local files
 
-		[[ -x "/usr/bin/xml-rewrite-2.py" ]] && local using_new="true"
+		local using_new=""
+		local xml_rewrite_2="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
+		if [[ -x "${xml_rewrite_2}" ]]; then
+			using_new="true"
+		else
+			xml_rewrite_2="/usr/bin/xml-rewrite-2.py"
+			if [[ -x "${xml_rewrite_2}" ]]; then
+				using_new="true"
+			fi
+		fi
 
 		for file in "${@}"; do
 			debug-print "${FUNCNAME}: ${file}"
@@ -241,12 +250,17 @@
 
 			if [[ -z "${using_new}" ]]; then
 				echo "Rewriting $file (using xml-rewrite.py)"
+
+				local xml_rewrite="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite.py"
+				if [[ ! -x "${xml_rewrite}" ]]; then
+					xml_rewrite="/usr/bin/xml-rewrite.py"
+				fi
 				# Doing this twice because otherwise the source attributes would
 				# get added to target tags too and javadoc does not like target
-				xml-rewrite.py -f "${file}" \
+				eval ${xml-rewrite} -f "${file}" \
 					-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
 					-a source -v ${want_source} || _bsfix_die "xml-rewrite failed: ${file}"
-				xml-rewrite.py -f "${file}" \
+				eval ${xml-rewrite} -f "${file}" \
 					-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
 					-a target -v ${want_target} || _bsfix_die "xml-rewrite failed: ${file}"
 			fi
@@ -259,21 +273,25 @@
 			fi
 
 			# for javadoc target and all in one pass, we need the new rewriter.
-			local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py"
+			local rewriter3="/usr/$(get_libdir)}/javatoolkit/bin/xml-rewrite-3.py"
+			if [[ ! -f ${rewriter3} ]]; then
+				rewriter3="/usr/bin/xml-rewrite-3.py"
+			fi
+
 			if [[ ! -f ${rewriter3} ]]; then
 				debug-print "Using second generation rewriter"
 				eval echo "Rewriting source attributes" ${output}
-				eval xml-rewrite-2.py ${files} \
+				eval ${xml_rewrite_2} ${files} \
 					-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
 					-a source -v ${want_source} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
 
 				eval echo "Rewriting target attributes" ${output}
-				eval xml-rewrite-2.py ${files} \
+				eval ${xml_rewrite_2} ${files} \
 					-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
 					-a target -v ${want_target} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
 
 				eval echo "Rewriting nowarn attributes" ${output}
-				eval xml-rewrite-2.py ${files} \
+				eval ${xml_rewrite_2} ${files} \
 					-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
 					-a nowarn -v yes ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
 			else
@@ -410,10 +428,17 @@
 # ------------------------------------------------------------------------------
 java-ant_xml-rewrite() {
 	local bindir="${ROOT}/usr/bin/"
+	local newbindir="${ROOT}/usr/$(get_libdir)/javatoolkit/bin"
 	local gen2="${bindir}/xml-rewrite-2.py"
+	local gen2_1="${newbindir}/xml-rewrite-2.py"
 	local gen1="${bindir}/xml-rewrite.py"
-	if [[ -x "${gen2}" ]]; then
+	local gen1_1="${newbindir}/xml-rewrite.py"
+	if [[ -x "${gen2_1}" ]]; then
+		${gen2_1} "${@}" || die "${gen2_1} failed"
+	elif [[ -x "${gen2}" ]]; then
 		${gen2} "${@}" || die "${gen2} failed"
+	elif [[ -x "${gen1_1}" ]]; then
+		${gen1_1} "${@}"
 	elif [[ -x "${gen1}" ]]; then
 		${gen1} "${@}" || die "${gen1} failed"
 	else