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

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 7e86bc065212dc962a7f561e6cb016b5fdd2f17d..baded78e40ac85784448cb1f08f030e5d19f1118 100644 (file)
--- 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/Manifest b/dev-java/log4j/Manifest
index e219167be34633d019eaca62e4bd8e94057e0a6d..12639304b19065708a264e3d355c4d28b13ca918 100644 (file)
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,7 +1,7 @@
 DIST apache-log4j-1.2.15.tar.gz 2099264 RMD160 280adfcd45c291d5bd45fbc5d5a9b0585374e4e0 SHA1 d6daea1586b932b1e38dc3fbac68624372bec6db SHA256 f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
 DIST logging-log4j-1.2.14.tar.gz 2771881 RMD160 d640c0182deebe1aabf14105b7b89294601bacce SHA1 2365021f8f277e77e281b0e01333ecea7c721e3e SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c
-EBUILD log4j-1.2.14-r1.ebuild 2194 RMD160 64bd7ef30ef4340298a2e11a4a22acf1ebd4e0ee SHA1 a2eb6b2bf1169570e7f8a914ed6bec73f2af0bb3 SHA256 d298d3e2049a2a53889ef7d8cd82f28ec780dc5991aa571fe23f3be33dcda955
-EBUILD log4j-1.2.14-r2.ebuild 2209 RMD160 a2fa914e5b7b9303913cbcd8df540e08c5262128 SHA1 6f43b21512909519b99e734e69c92d7ed4150931 SHA256 e5a8a2d9e2acd1d861be966dd7cf1ecd0b1ecb4146c1d36612d71a5c799cabb6
-EBUILD log4j-1.2.15.ebuild 2382 RMD160 be673864d5916a9215f4b28e7a6996f3e920f942 SHA1 750be7a7f64377433eeae84c310ff4f16c4c023a SHA256 ce4e5703d8c6eb7dc69a65d874aed1e31986450e09ed12af8b604e7b983e7c97
-MISC ChangeLog 7326 RMD160 9a201052094de8daf0d5ca29211641743be2879b SHA1 1c66641a0785ee3a183a6179dda6613ebc8c1193 SHA256 44af53e3c3dc34c574ad98dc2b2655903bf86cd5aeb98a94ed28e82d8f9bf203
+EBUILD log4j-1.2.14-r1.ebuild 2203 RMD160 9645a72741ecbf6ded33bbe55470da76ab5b0dc4 SHA1 cd46504ba69a3f9d5f33ee3baa9d6b827fc8120d SHA256 cb81f2366f02c0b8b025e86356131eef6e258984fef0e92265990d509d8b2d5e
+EBUILD log4j-1.2.14-r2.ebuild 2215 RMD160 6482073ced3798bb79c965c77c1eba83c160d235 SHA1 a011978da149c50daa3269a4b0c83c9bc076aafd SHA256 8f6f6b208726fa2305a35b7a708deba19693d9ab305b8de7eb629089839717f6
+EBUILD log4j-1.2.15.ebuild 2388 RMD160 08ed62c62754e06a0f8180e11d1773ddb29a5a40 SHA1 df241e6ba03acf13286f77ba7093ac74f9e8d7ee SHA256 c56cc24a32f46d25fcad608a13484893ac3cea0b7f89e496f4e9045f4a977935
+MISC ChangeLog 7547 RMD160 7dda836a3db32a1a0506eace166cbc39d3f94d52 SHA1 1f96bad19dcfb9d4a983830a4529f51b1f1c5322 SHA256 8661e8ba68a18dea97586324da9ddcd07a5815dff35a38683315c34bd0dc3f58
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9

diff --git a/dev-java/log4j/log4j-1.2.14-r1.ebuild b/dev-java/log4j/log4j-1.2.14-r1.ebuild
index 9dd04eb07a093dee00c27138ef0bed87b1e4be1a..e407b4442031f1b78cd6f1e2ddc9bd050f073097 100644 (file)
--- 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 dee3f3acebe64739e5ad64521f86d3da7547f1e3..d46a091d11a946b4a9178acaeeb4de550df3a708 100644 (file)
--- 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 cdc0319d93276c4d033b8c8d81b0ab89999c69b6..8a269543cda284188f0e54255c000654e236d254 100644 (file)
--- 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
 }