Replacing direct execution of xml-rewrite.py with a call to java-ant_xml-rewrite. see #209956

(Portage version: 2.1.4.4)

4 files changed, 16 insertions, 11 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 7e86bc065212..baded78e40ac 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,18 +1,23 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.58 2008/02/06 16:47:53 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.59 2008/02/13 04:16:05 ali_bush Exp $
+
+  13 Feb 2008; Alistair Bush <ali_bush@gentoo.org> log4j-1.2.14-r1.ebuild,
+  log4j-1.2.14-r2.ebuild, log4j-1.2.15.ebuild:
+  Replacing direct execution of xml-rewrite.py with a call to
+  java-ant_xml-rewrite. see #209956
 
 *log4j-1.2.15 (06 Feb 2008)
 
   06 Feb 2008; Miroslav Šulc <fordfrog@gentoo.org> +log4j-1.2.15.ebuild:
   Version bump
 
-  28 Nov 2007; <alistair@gentoo.org> log4j-1.2.14-r2.ebuild:
+  28 Nov 2007; <ali_bush@gentoo.org> log4j-1.2.14-r2.ebuild:
   Dropping ~arch's not keyworded in java-virtuals/javamail yet.
 
 *log4j-1.2.14-r2 (20 Nov 2007)
 
-  20 Nov 2007; <alistair@gentoo.org> +log4j-1.2.14-r2.ebuild:
+  20 Nov 2007; <ali_bush@gentoo.org> +log4j-1.2.14-r2.ebuild:
   Bumping to support javamail virtual.
 
   24 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
diff --git a/dev-java/log4j/log4j-1.2.14-r1.ebuild b/dev-java/log4j/log4j-1.2.14-r1.ebuild
index 9dd04eb07a09..e407b4442031 100644
--- a/dev-java/log4j/log4j-1.2.14-r1.ebuild
+++ b/dev-java/log4j/log4j-1.2.14-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/log4j/log4j-1.2.14-r1.ebuild,v 1.6 2007/07/24 08:40:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14-r1.ebuild,v 1.7 2008/02/13 04:16:05 ali_bush Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -39,7 +39,7 @@ src_unpack() {
 	cd ${S}
 	rm -rf dist/
 	# Takes javamail from system env without this
-	xml-rewrite.py -f build.xml -c -e available -a ignoresystemclasses -v "true"
+	java-ant_xml-rewrite -f build.xml -c -e available -a ignoresystemclasses -v "true"
 	java-pkg_filter-compiler jikes
 }
 
diff --git a/dev-java/log4j/log4j-1.2.14-r2.ebuild b/dev-java/log4j/log4j-1.2.14-r2.ebuild
index dee3f3acebe6..d46a091d11a9 100644
--- a/dev-java/log4j/log4j-1.2.14-r2.ebuild
+++ b/dev-java/log4j/log4j-1.2.14-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/log4j/log4j-1.2.14-r2.ebuild,v 1.3 2007/11/28 07:35:56 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14-r2.ebuild,v 1.4 2008/02/13 04:16:05 ali_bush Exp $
 
 JAVA_PKG_IUSE="doc javamail jms jmx source"
 
@@ -42,7 +42,7 @@ src_unpack() {
 	cd "${S}"
 	rm -rf dist/
 	# Takes javamail from system env without this
-	xml-rewrite.py -f build.xml -c -e available -a ignoresystemclasses -v "true"
+	java-ant_xml-rewrite -f build.xml -c -e available -a ignoresystemclasses -v "true"
 	java-pkg_filter-compiler jikes
 }
 
diff --git a/dev-java/log4j/log4j-1.2.15.ebuild b/dev-java/log4j/log4j-1.2.15.ebuild
index cdc0319d9327..8a269543cda2 100644
--- a/dev-java/log4j/log4j-1.2.15.ebuild
+++ b/dev-java/log4j/log4j-1.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.15.ebuild,v 1.1 2008/02/06 16:47:53 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.15.ebuild,v 1.2 2008/02/13 04:16:05 ali_bush Exp $
 
 JAVA_PKG_IUSE="doc javamail jms jmx source"
 
@@ -42,7 +42,7 @@ src_unpack() {
 	cd "${S}"
 	rm -rf dist/
 	# Takes javamail from system env without this
-	xml-rewrite.py -f build.xml -c -e available -a ignoresystemclasses -v "true"
+	java-ant_xml-rewrite -f build.xml -c -e available -a ignoresystemclasses -v "true"
 	java-pkg_filter-compiler jikes
 }