Don't use xml-rewrite.py directly. Fixes bug #209956. Switch to EAPI=1 for slot deps.

(Portage version: 2.1.4.1)

2 files changed, 18 insertions, 15 deletions

diff --git a/dev-java/xpp2/ChangeLog b/dev-java/xpp2/ChangeLog
index f192b0d12cc5..3ea3c8eba8ac 100644
--- a/dev-java/xpp2/ChangeLog
+++ b/dev-java/xpp2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xpp2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/ChangeLog,v 1.20 2007/06/03 22:37:36 betelgeuse Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/ChangeLog,v 1.21 2008/02/13 17:47:37 betelgeuse Exp $
+
+  13 Feb 2008; Petteri Räty <betelgeuse@gentoo.org> xpp2-2.1.10-r1.ebuild:
+  Don't use xml-rewrite.py directly. Fixes bug #209956. Switch to EAPI=1 for
+  slot deps.
 
   03 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> -xpp2-2.1.10.ebuild:
   Remove generation 1 ebuild.
diff --git a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
index 094cc6cb30be..af97fe70daaa 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10-r1.ebuild,v 1.12 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10-r1.ebuild,v 1.13 2008/02/13 17:47:37 betelgeuse Exp $
 
+EAPI=1
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -18,9 +19,8 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 S="${WORKDIR}/${MY_P}"
 
-CDEPEND=">=dev-java/xerces-2.7"
+CDEPEND="dev-java/xerces:2"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.6
 	${CDEPEND}"
 RDEPEND=">=virtual/jre-1.3
 	${CDEPEND}"
@@ -28,24 +28,23 @@ RDEPEND=">=virtual/jre-1.3
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	rm lib/*/*.jar
-	rm build/*/*.jar
+	rm -v lib/*/*.jar build/*/*.jar || die
 	find build/ -name '*.jar' -o -name '*.class' -delete
 
 	# add xercesImpl.jar to relevant javac classpaths
-	xml-rewrite.py -f build.xml -e javac -a classpath -i 7 -c -v \
+	java-ant_xml-rewrite -f build.xml -e javac -a classpath -i 7 -c -v \
 		'${build_intf}:lib/xercesImpl.jar' -i 7
-	xml-rewrite.py -f build.xml -e javac -a classpath -i 8 -c -v \
+	java-ant_xml-rewrite -f build.xml -e javac -a classpath -i 8 -c -v \
 		'${build_intf}:${build_impl_tag}:${build_x2impl_pp}:${build_impl_node}:${build_impl_format}:lib/xercesImpl.jar'
 
 	cd lib
 	java-pkg_jar-from xerces-2
 }
 
-src_compile() {
-	# override check for xerces-2 presence
-	eant -Dx2_present=true compile $(use_doc api)
-}
+# override check for xerces-2 presence
+EANT_EXTRA_ARGS="-Dx2_present=true"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="api"
 
 src_install() {
 	java-pkg_newjar build/lib/${MY_PN}-${PV}.jar ${MY_PN}.jar
@@ -53,7 +52,7 @@ src_install() {
 	java-pkg_newjar build/lib/${MY_PN}-standard-${PV}.jar ${MY_PN}-standard.jar
 	java-pkg_newjar build/lib/${MY_PN}-x2-${PV}.jar ${MY_PN}-x2.jar
 
-	dohtml README.html
+	dohtml README.html || die
 	use doc && java-pkg_dojavadoc doc/api
 	use source && java-pkg_dosrc src/java/*
 }