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

Package-Manager: portage-2.1.4.1

diff --git a/dev-java/xpp2/ChangeLog b/dev-java/xpp2/ChangeLog
index f192b0d12cc57e49e14da0a9f6ac45f2e0176872..3ea3c8eba8acbaf217cab331aafb40d637e208f6 100644 (file)
--- 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/Manifest b/dev-java/xpp2/Manifest
index 9f1c16627f6f75b2bca45f35a4b0534c64957752..9d376594ee475c928f57dc56885f0658258ee36f 100644 (file)
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST PullParser2.1.10.tgz 2310288 RMD160 339414a0c499fe7532bf733daf72388936175a2a SHA1 136a43817c2955a23b8d1962cc1b544e37b68bfc SHA256 ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf
-EBUILD xpp2-2.1.10-r1.ebuild 1802 RMD160 20aa43e461488c5de91ce7d2cdeacf3733b37b4f SHA1 633f34b9581a21063ddf0f4f285b2349e6dc8e58 SHA256 1b64273e0ecd0d752171004a09b117f1576a22aa9ca7a1f54c7366541f54f6b7
-MISC ChangeLog 2439 RMD160 7a845cdedef357dde805ff5ee63ce3de4072fa94 SHA1 6532d8072297df57be3a9b987fb2ed978ac8f988 SHA256 fad6bd7e0616b81ee8ca6b75d8ce97816ee7787e317ec5092edeecbd050214d2
+EBUILD xpp2-2.1.10-r1.ebuild 1826 RMD160 4315f884402eec1534c481f9ae82ebc868ab0263 SHA1 1b55df6c8b0790b3a1cafd578fe069c7bfef8cd2 SHA256 e48a74be046c077a69f7fc7bfbd4421b06407f97a75e58e92b00e35b59c1460d
+MISC ChangeLog 2606 RMD160 cfa4cf30de9ff0271717e01ab06464673177216a SHA1 c6050926ec0359474773a138ef4da6f55cc9233d SHA256 22f902e59912a8172ac6ca6ca507848d1657b4531c62799a8d1812b874eb3cef
 MISC metadata.xml 383 RMD160 e715bf28cf0d57355eecd0634a4726399c1b147a SHA1 5550ded53b534968f942377d95b127ccf75fa1d0 SHA256 f374397f7f31d3a657df2bd45e94f531bb29d8a2b3314355b0507dbde906c603
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsy1CcxLzpIGCsLQRAg+5AJ4yZ8s7wZ3xVMVjy32lLPuYmwkOuACfeJea
+urjkeJGhC+V4FrU2lBB+UjU=
+=XjJ5
+-----END PGP SIGNATURE-----

diff --git a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
index 094cc6cb30be8d61b79fd111ac5b130864718b15..af97fe70daaae6d49abd878098751414276c6535 100644 (file)
--- 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/*
 }