10 files changed, 178 insertions, 30 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index c96a593c4458..1dd62a4dcce2 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.36 2006/01/20 04:42:53 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.37 2006/02/05 11:05:30 blubb Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  05 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  +files/build.sh-exit-fix.patch, -files/build.sh-exit-fix.patch.gz,
+  +files/rpmbuild.patch, -files/rpmbuild.patch.gz, ant-core-1.5.4-r2.ebuild,
+  ant-core-1.6.2-r5.ebuild, ant-core-1.6.5-r2.ebuild:
+  no need to gzip smallish patches
+
   20 Jan 2006; Joshua Nichols <nichoj@gentoo.org> ant-core-1.5.4-r2.ebuild:
   No longer exports CLASSPATH as per bug #50306.
 
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 0edd3dfccfbe..aa90b1c7bf13 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,14 +1,42 @@
-MD5 e817e23ae6921e354fbe43a1588475df ChangeLog 19324
-MD5 b8acadb64ab126f0a52640527d293388 ant-core-1.5.4-r2.ebuild 3030
-MD5 6faae273dea0a4f931058e09fefe3dae ant-core-1.6.2-r5.ebuild 2084
-MD5 274bb7b92120e8eecafb2bcf01f31db7 ant-core-1.6.5-r2.ebuild 1999
+MD5 ff8fc036111d64621462b00705937d31 ChangeLog 19608
+RMD160 e5d134143a0d29766ced34984bd5474594657d94 ChangeLog 19608
+SHA256 7fd996ecabbcfa92ca96d5aa2f186326c72661138ca2cb85508c92b3c105729b ChangeLog 19608
+MD5 ae30cd07e7ef7a314369a39335bea5ef ant-core-1.5.4-r2.ebuild 3023
+RMD160 79fa3893c54c81d8b95c409b7996661fa723fc19 ant-core-1.5.4-r2.ebuild 3023
+SHA256 3eb6d9fec6c6911695f96ecd8a1c30b38fa80f11e322477bdbcd3ea5505d5c83 ant-core-1.5.4-r2.ebuild 3023
+MD5 45c826152c7de9789493fe41efd87b27 ant-core-1.6.2-r5.ebuild 2082
+RMD160 cd1d8c23383397d05206ed7256a281aeaa90deb4 ant-core-1.6.2-r5.ebuild 2082
+SHA256 e0a55354a9149fcdb77a157c65ff8cf7110fca89a19d2a7f84cffdfbe86d9d2c ant-core-1.6.2-r5.ebuild 2082
+MD5 28fb623be0093d929803aeaefc530b06 ant-core-1.6.5-r2.ebuild 1997
+RMD160 b119db5164d14a4e689386483450d41bcecca347 ant-core-1.6.5-r2.ebuild 1997
+SHA256 02b88a7eb30e246265b9282f20bb01972ff7f5b50157ad095bfeb205c9ced452 ant-core-1.6.5-r2.ebuild 1997
 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
+RMD160 be9af8449dda65d400bbe171eb85ffc352ae3d2e files/1.5.4-ant 2283
+SHA256 047a187757706ffcaacd48bac55145b63fa782537e40fa95a8bd5abbed70ceaa files/1.5.4-ant 2283
 MD5 816ea8a6a51471da4c8df2f59434fc9d files/1.6.2-ant 5058
+RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 files/1.6.2-ant 5058
+SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071 files/1.6.2-ant 5058
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
+RMD160 ec85134b9c10d603e893ebae068197761efc1b4b files/1.6.2-scp.patch 877
+SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a files/1.6.2-scp.patch 877
 MD5 851886c1a13240befce87e1577f057f1 files/1.6.5-ant 5063
-MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
+RMD160 82bfc6233cbb7e8f05099af12564a2cc27c2b53c files/1.6.5-ant 5063
+SHA256 d9a45d747aae54531f3cc4018e1d17d1dc6bacbc64051d50f1d217dce376b942 files/1.6.5-ant 5063
+MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
+RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
+SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/build.sh-exit-fix.patch 345
 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70
+RMD160 30c2ffb6c5b5db4c16003434222407a0930841d7 files/digest-ant-core-1.5.4-r2 70
+SHA256 61267c8a183abcfd2ab540391b003c37316bcefb01b41986d30f2a87e2936db3 files/digest-ant-core-1.5.4-r2 70
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r5 74
+RMD160 66d373bf435d3a4609fb0a1da03ff25e3fc783cb files/digest-ant-core-1.6.2-r5 74
+SHA256 a9b153951e9ca3deb84b3506fe73a6f37ed2b21283ab5c584abdf6bbc0c8a4fd files/digest-ant-core-1.6.2-r5 74
 MD5 181609c8f2d789fc7abf5cd39a027130 files/digest-ant-core-1.6.5-r2 74
-MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
+RMD160 c64b4cb369c92ec53a5a607900e143dd18da9fd5 files/digest-ant-core-1.6.5-r2 74
+SHA256 0662811901b318c5dc3b4ce05e8b03bdb7dfa600bfe2ceaf66d293b485815d50 files/digest-ant-core-1.6.5-r2 74
+MD5 d956471b5a9d9f51778afe97db252d5d files/rpmbuild.patch 3116
+RMD160 c30ff8e1d3011946753ed250485ef944237b54ab files/rpmbuild.patch 3116
+SHA256 8980a3210e84ce2b8fce34c5f541ebe22c406c281e47e0dbf202aceefeec736e files/rpmbuild.patch 3116
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
+SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
diff --git a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
index e0a8f842a711..816cbdaba9bc 100644
--- a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.6 2006/01/20 04:42:53 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.7 2006/02/05 11:05:30 blubb Exp $
 
 inherit java-pkg eutils
 
@@ -29,9 +29,9 @@ src_unpack() {
 
 	# Patch build.sh to die with non-zero exit code in case of errors.
 	# This patch may be useful for all ant versions.
-	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
+	epatch ${FILESDIR}/build.sh-exit-fix.patch
 	# This patch will be used until ant 1.6 is released
-	epatch ${FILESDIR}/rpmbuild.patch.gz
+	epatch ${FILESDIR}/rpmbuild.patch
 }
 
 src_compile() {
diff --git a/dev-java/ant-core/ant-core-1.6.2-r5.ebuild b/dev-java/ant-core/ant-core-1.6.2-r5.ebuild
index c1e173761292..c8175eb88889 100644
--- a/dev-java/ant-core/ant-core-1.6.2-r5.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r5.ebuild,v 1.1 2005/09/11 11:26:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r5.ebuild,v 1.2 2006/02/05 11:05:30 blubb Exp $
 
 inherit java-pkg eutils
 
@@ -35,7 +35,7 @@ src_unpack() {
 
 	# Patch build.sh to die with non-zero exit code in case of errors.
 	# This patch may be useful for all ant versions.
-	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
+	epatch ${FILESDIR}/build.sh-exit-fix.patch
 }
 
 src_compile() {
diff --git a/dev-java/ant-core/ant-core-1.6.5-r2.ebuild b/dev-java/ant-core/ant-core-1.6.5-r2.ebuild
index 622c815dab49..c120b646d7b3 100644
--- a/dev-java/ant-core/ant-core-1.6.5-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r2.ebuild,v 1.1 2005/09/11 11:26:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r2.ebuild,v 1.2 2006/02/05 11:05:30 blubb Exp $
 
 inherit java-pkg eutils toolchain-funcs
 
@@ -33,7 +33,7 @@ src_unpack() {
 
 	# Patch build.sh to die with non-zero exit code in case of errors.
 	# This patch may be useful for all ant versions.
-	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
+	epatch ${FILESDIR}/build.sh-exit-fix.patch
 }
 
 src_compile() {
diff --git a/dev-java/ant-core/files/build.sh-exit-fix.patch b/dev-java/ant-core/files/build.sh-exit-fix.patch
new file mode 100644
index 000000000000..53170617f98a
--- /dev/null
+++ b/dev-java/ant-core/files/build.sh-exit-fix.patch
@@ -0,0 +1,11 @@
+--- build.sh.orig	2003-04-16 11:28:29.000000000 +0200
++++ build.sh	2003-07-02 16:10:06.000000000 +0200
+@@ -18,7 +18,7 @@
+ 
+ if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
+   echo Bootstrap FAILED
+-  exit
++  exit 1
+ fi
+ 
+ LOCALCLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:bootstrap/lib/ant.jar
diff --git a/dev-java/ant-core/files/build.sh-exit-fix.patch.gz b/dev-java/ant-core/files/build.sh-exit-fix.patch.gz
deleted file mode 100644
index 541f796dd7ef..000000000000
--- a/dev-java/ant-core/files/build.sh-exit-fix.patch.gz
+++ /dev/null
diff --git a/dev-java/ant-core/files/rpmbuild.patch b/dev-java/ant-core/files/rpmbuild.patch
new file mode 100644
index 000000000000..5dfbb740923a
--- /dev/null
+++ b/dev-java/ant-core/files/rpmbuild.patch
@@ -0,0 +1,95 @@
+--- src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java	2003-10-13 02:19:42.000000000 +0000
++++ src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java	2003-10-13 02:24:16.000000000 +0000
+@@ -59,6 +59,8 @@
+ import java.io.BufferedOutputStream;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
++import java.util.Enumeration;
++import java.util.Vector;
+ import org.apache.tools.ant.Task;
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Project;
+@@ -67,7 +69,9 @@
+ import org.apache.tools.ant.taskdefs.LogOutputStream;
+ import org.apache.tools.ant.taskdefs.PumpStreamHandler;
+ import org.apache.tools.ant.taskdefs.Execute;
++import org.apache.tools.ant.taskdefs.condition.Os;
+ import org.apache.tools.ant.types.Commandline;
++import org.apache.tools.ant.types.Path;
+ 
+ /**
+  * Invokes the rpm tool to build a Linux installation file.
+@@ -91,6 +95,12 @@
+     private String command = "-bb";
+ 
+     /**
++     * The executable to use for building the packages.
++     * @since Ant 1.6
++     */
++    private String rpmBuildCommand = null;
++  	 
++    /**
+      * clean BUILD directory
+      */
+     private boolean cleanBuildDir = false;
+@@ -119,6 +129,9 @@
+         
+         Commandline toExecute = new Commandline();
+ 
+-        toExecute.setExecutable("rpm");
++        toExecute.setExecutable(rpmBuildCommand == null
++                                ? guessRpmBuildCommand()
++                                : rpmBuildCommand);
++
+         if (topDir != null) {
+             toExecute.createArgument().setValue("--define");
+@@ -260,4 +273,49 @@
+     public void setError(File error) {
+         this.error = error;
+     }
++  	 
++    /**
++     * The executable to run when building; optional.
++     * The default is <code>rpmbuild</code>.
++     *
++     * @since Ant 1.6
++     * @param c the rpm build executable
++     */
++    public void setRpmBuildCommand(String c) {
++        this.rpmBuildCommand = c;
++    }
++
++    /**
++     * Checks whether <code>rpmbuild</code> is on the PATH and returns
++     * the absolute path to it - falls back to <code>rpm</code>
++     * otherwise.
++     *
++     * @since 1.6
++     */
++    protected String guessRpmBuildCommand() {
++        Vector env = Execute.getProcEnvironment();
++        String path = null;
++        for (Enumeration enum = env.elements(); enum.hasMoreElements();) {
++            String var = (String) enum.nextElement();
++            if (var.startsWith("PATH=") || var.startsWith("Path=")) {
++                path = var.substring(6 /* "PATH=".length() + 1 */);
++                break;
++            }
++        }
++
++        if (path != null) {
++            Path p = new Path(getProject(), path);
++            String[] pElements = p.list();
++            for (int i = 0; i < pElements.length; i++) {
++                File f = new File(pElements[i],
++                                  "rpmbuild"
++                                  + (Os.isFamily("dos") ? ".exe" : ""));
++                if (f.canRead()) {
++                    return f.getAbsolutePath();
++                }
++            }
++        }
++
++        return "rpm";
++    }
+ }
diff --git a/dev-java/ant-core/files/rpmbuild.patch.gz b/dev-java/ant-core/files/rpmbuild.patch.gz
deleted file mode 100644
index 0a86f9559513..000000000000
--- a/dev-java/ant-core/files/rpmbuild.patch.gz
+++ /dev/null
diff --git a/dev-java/openjms/Manifest b/dev-java/openjms/Manifest
index c3d873fad3cb..1de8c35723c0 100644
--- a/dev-java/openjms/Manifest
+++ b/dev-java/openjms/Manifest
@@ -1,19 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c0879888396a9d3c01ac4f9a7c8dda44 ChangeLog 1159
+MD5 10d26ec16069787c9e2f0e5ee44b73d6 ChangeLog 1406
+RMD160 a49917850a8e9778671c3e24d0370f37d1388309 ChangeLog 1406
+SHA256 4dd7cc0b5b97dbb6eb52dc7a0a72b8319577ee6eacdc7a1ba30af7cbfa11bd60 ChangeLog 1406
 MD5 c515bd2931ce697be23219be4556b62e files/0.7.6.1/10openjms-0.7.6.1 37
-MD5 11397a4bdb1b5d7d6a489766a6c58279 files/0.7.6.1/buildfile.patch.bz2 797
+RMD160 1e3bdb44fc5f3b2b85e0e7bc363276167a16d6a0 files/0.7.6.1/10openjms-0.7.6.1 37
+SHA256 e4d28e93a3fa47d572ff383a099d3533892fd9871f7f01a43148e30f06e2dd0b files/0.7.6.1/10openjms-0.7.6.1 37
+MD5 10555b8e72881a5f0a1395f3d4375b86 files/0.7.6.1/buildfile.patch 3609
+RMD160 8f8afb47c34ae467b01ce71f3166c6d1974e0403 files/0.7.6.1/buildfile.patch 3609
+SHA256 3e168a28fafee04b9ca422bfea1fb37403d59ad330e92723423610a88160b3ab files/0.7.6.1/buildfile.patch 3609
 MD5 fdae6fd4595f87aba37b3a3674faf490 files/0.7.6.1/conf 21
+RMD160 64cd5a2e8b5d1300394c50e49bdccc671f228494 files/0.7.6.1/conf 21
+SHA256 d9636940e3b513b24534121c4744d754fb50c24d381cee96910d222612c863ad files/0.7.6.1/conf 21
 MD5 d1af3351d5e9ab88690027aab468d22b files/0.7.6.1/rc2 759
-MD5 2b897d3922776b256092ce64beb2792c files/0.7.6.1/source.patch.bz2 2628
+RMD160 b0a8586acefb52fddee5ea1aa6fe7251247dcc60 files/0.7.6.1/rc2 759
+SHA256 bfb2f4319164f1d3bfb5447f3dc3f10f0b375d5cbc43ee8844e1826d0ba0d86e files/0.7.6.1/rc2 759
+MD5 d6f2fba810ccac7aa980e2d1235c33e6 files/0.7.6.1/source.patch 19624
+RMD160 45cb1711b342717fd62535e2b3f868fa57393cfe files/0.7.6.1/source.patch 19624
+SHA256 00e26e2c4a356564940c2b662e7994d74583474354c85a9cfafb2cd39edd6028 files/0.7.6.1/source.patch 19624
 MD5 34edc166c8f579300fc1cf16650b3c9e files/digest-openjms-0.7.6.1-r1 145
+RMD160 45e57f03fa721b80e0b3e6e972c413286d0611dd files/digest-openjms-0.7.6.1-r1 145
+SHA256 08ef0afb0e450b51907247284ba6f4acb5334a71ccd9eb987950639a3a000781 files/digest-openjms-0.7.6.1-r1 145
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 fd3dd60dffca4d34353d3ea9715f1eef openjms-0.7.6.1-r1.ebuild 2302
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD1sOTndWRXhKOboURApQiAJ9Vz8R+zwfl+6Qz5+2U1/7pcnz0dACZAf+1
-aSqpXb9MFonKYgiwcdPP1oM=
-=W5Ph
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 18034833a9ba961a688ef6b5b87b5767 openjms-0.7.6.1-r1.ebuild 2293
+RMD160 c269d615e6d3463c78a712b13c1a367179a67799 openjms-0.7.6.1-r1.ebuild 2293
+SHA256 d292e33832a47b65bb984be0cdedf691acbc3561b483fd1a4566aa6906229712 openjms-0.7.6.1-r1.ebuild 2293