17 files changed, 68 insertions, 823 deletions
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
new file mode 100644
index 000000000000..b6e814faf939
--- /dev/null
+++ b/dev-java/ant-core/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 40aa3e15b499670f159be6f3c96753d3 ant-core-1.5.4.ebuild 3037
+MD5 8cec8253518c1ee0751248c4b05681ad ant-core-1.6.2.ebuild 2224
+MD5 913d10751ca851a8d51184584d6633c8 ChangeLog 13725
+MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
+MD5 b876b365c3d68c3dc528148056af16f9 files/1.5.4-ant 2278
+MD5 6826a8f87a7bfcc6d56c36a8cc9fff47 files/1.6.2-ant 4974
+MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
+MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
+MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4 70
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBQgSk/rLF9B432nYRAnAhAKCYI/sDTtasIbOL9Bf6c2lbpQcsLACgy+6u
+fXMZKrWF/CnK4ZhcD1kU+tE=
+=4DlJ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 491e53eb25d2..062386b8eada 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,363 +1,12 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.80 2004/09/06 08:44:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.81 2004/09/10 19:41:39 axxo Exp $
 
-  06 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -files/1.6.0-r3/ant,
-  -files/1.6.1/ant, -files/1.6.2-r2/ant, -files/1.6.2-r3/ant,
-  -ant-1.6.0-r3.ebuild, -ant-1.6.1-r1.ebuild, -ant-1.6.1.ebuild,
-  -ant-1.6.2-r2.ebuild, -ant-1.6.2-r3.ebuild, ant-1.6.2-r5.ebuild:
-  remove older ebuild that use ant-optional
+*ant-1.6.2-r6 (10 Sep 2004)
 
-  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-r5/ant,
-  ant-1.6.2-r5.ebuild:
-  move jython-bin -> jython, regexp-bin -> regexp
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -files/20ant,
+  -files/build.sh-exit-fix.patch.gz, -files/rpmbuild.patch.gz,
+  -files/1.5.4/ant, -files/1.6.2-r5/ant, -ant-1.5.4-r1.ebuild,
+  +ant-1.5.4-r2.ebuild, -ant-1.6.2-r5.ebuild, +ant-1.6.2-r6.ebuild:
+  This is now a metapackage for ant-core & ant-tasks
 
-  01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-r5/ant,
-  ant-1.6.2-r5.ebuild:
-  remove ant-optional from wrapper, move block on optional to tasks, add block
-  on older ant-tasks
-
-  31 Aug 2004; Thomas Matthijs <axxo@gentoo.org> -files/1.6.2-r4/ant,
-  -ant-1.6.2-r4.ebuild:
-  remove since its broken
-
-*ant-1.6.2-r5 (31 Aug 2004)
-
-  31 Aug 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2-r5/ant,
-  +ant-1.6.2-r5.ebuild:
-  fix ant wrapper script to use ant-tasks,and some (-bin)
-
-  31 Aug 2004; Thomas Matthijs <axxo@gentoo.org> ant-1.6.2-r4.ebuild:
-  block ant-optional, depending on new ant-tasks-1.6.2-r3
-
-*ant-1.6.2-r4 (30 Aug 2004)
-
-  30 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
-  Fixed dependency on ant-optional to ant-tasks.
-
-  27 Aug 2004; Thomas Matthijs <axxo@gentoo.org>
-  -files/1.5.3/1_6_backport-jdk142.patch.gz, -files/1.5.3/ant,
-  -files/1.6.0-r2/ant, -files/1.6.2/ant, -files/1.6.2-r1/ant,
-  -ant-1.5.3-r5.ebuild, -ant-1.6.0-r2.ebuild, -ant-1.6.2-r1.ebuild,
-  -ant-1.6.2.ebuild:
-  remove older versions
-
-  27 Aug 2004; Thomas Matthijs <axxo@gentoo.org> metadata.xml,
-  ant-1.6.2-r3.ebuild:
-  x86
-
-  27 Aug 2004; <SeJo@gentoo.org> ant-1.6.0-r3.ebuild, ant-1.6.2-r2.ebuild:
-  stable on ppc
-
-*ant-1.6.2-r3 (27 Aug 2004)
-
-  27 Aug 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2-r3/ant,
-  +ant-1.6.2-r3.ebuild:
-  fix bug 60991
-
-*ant-1.6.2-r2 (29 Jul 2004)
-
-  29 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2-r2/ant,
-  +ant-1.6.2-r2.ebuild:
-  actualy use the fixed wrapper script
-
-*ant-1.6.2-r1 (23 Jul 2004)
-
-  23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2-r1/ant,
-  +ant-1.6.2-r1.ebuild:
-  fix ant script wrapper script and depends
-
-  18 Jul 2004; Thomas Matthijs <axxo@gentoo.org> ant-1.6.2.ebuild:
-  added ~amd64
-
-*ant-1.6.2 (17 Jul 2004)
-
-  17 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2/ant,
-  +ant-1.6.2.ebuild:
-  Version bump
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ant-1.5.3-r5.ebuild,
-  ant-1.5.4-r1.ebuild, ant-1.6.0-r2.ebuild, ant-1.6.0-r3.ebuild,
-  ant-1.6.1-r1.ebuild, ant-1.6.1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  12 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.6.1.ebuild,
-  ant-1.6.1-r1.ebuild: Added some extra symlinks. Fixes #49128.
-
-  16 May 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.6.1-r1.ebuild,
-  ant-1.6.1.ebuild:
-  Updated license to Apache 2.0
-
-  09 May 2004; Jason Wever <weeve@gentoo.org> ant-1.6.1-r1.ebuild:
-  Added ~sparc keyword, helps resolve bug #50407.
-
-  04 May 2004; <SeJo@gentoo.org> ant-1.6.1.ebuild:
-  added ~ppc keyword to the ant-1.6.1.ebuild
-
-  23 Mar 2004; David Holm <dholm@gentoo.org> ant-1.6.1-r1.ebuild:
-  Backed out from ~ppc.
-
-  22 Mar 2004; David Holm <dholm@gentoo.org> ant-1.6.1-r1.ebuild:
-  Added to ~ppc.
-
-  20 Mar 2004; Chris Aniszczyk <zx@gentoo.org> files/1.6.1/ant:
-  Updated ant to use the new launcher interface.
-  Thanks to Thomas Wutsch <twutsch@iicm.edu> for the updates. Closes #44804
-
-*ant-1.6.1-r1 (17 Mar 2004)
-
-  11 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.6.0-r2.ebuild,
-  ant-1.6.1.ebuild:
-  Added some fixes. Thanks to Pavel <hlobil@sympatico.ca> for some input.
-
-*ant-1.6.1 (10 Mar 2004)
-
-  10 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.5.4-r1.ebuild,
-  ant-1.6.1.ebuild:
-  Version bump + fixes. Closes #43398, #42850, #41414
-
-  25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> ant-1.5.4-r1.ebuild,
-  ant-1.6.0-r2.ebuild, ant-1.6.0-r3.ebuild:
-  Added amd64 keyword to ant-1.5.4-r1.   removed ~ppc from 1.6.0-r3 due to bad 
-  dependencies.  1.6.0 seems broken for PropertyFile tasks anyway, so it is
-  being moved into package.mask.
-
-  16 Feb 2004; David Holm <dholm@gentoo.org> ant-1.6.0-r3.ebuild:
-  Ok, lets try adding this to ~ppc one more time. Someone needs a lecture in CVS
-  and how to handle conflicts. ;)
-
-  16 Feb 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.6.0-r3.ebuild:
-  Bug Fix #39021
-
-*ant-1.6.0-r3 (10 Feb 2004)
-
-  10 Feb 2004; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r3.ebuild:
-  Removed some USE flags for this package since people dont use them,
-  and create a lot of bug reports about it.
-
-  20 Jan 2004; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r2.ebuild:
-  Added ~x86 keyword.
-
-  19 Jan 2004; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r2.ebuild:
-  Added amd64 keyword.
-
-  18 Jan 2004; Adrian Almenar <strider@gentoo.org> files/1.6.0-r2/ant:
-  Redirect java-config stderr output to /dev/null.
-
-*ant-1.6.0-r2 (18 Jan 2004)
-
-  18 Jan 2004; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r2.ebuild:
-  New method for building ant.
-
-*ant-1.6.0 (25 Dec 2003)
-
-  25 Dec 2003; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r1.ebuild, ant-1.6.0.ebuild,
-  files/1.6.0/ant:
-  Updated ant to latest available version.
-
-  20 Nov 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.4-r1.ebuild:
-  Moved to stable on all arches.
-
-  20 Oct 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.4-r1.ebuild,
-  ant-1.5.4-r2.ebuild:
-  This should fix bug #31545, Thanks Azarah for your help.
-
-*ant-1.5.4-r2 (18 Oct 2003)
-
-  18 Oct 2003; root <strider@gentoo.org> ant-1.5.4-r2.ebuild:
-  New process to build ant from sources.
-
-  18 Oct 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r5.ebuild,
-  ant-1.5.4-r1.ebuild, ant-1.5.4.ebuild, files/1.5.3/ant, files/1.5.4/ant:
-  Fixes bug #31006
-
-*ant-1.5.4-r1 (13 Oct 2003)
-
-  13 Oct 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.4-r1.ebuild:
-  Thanks to Gunnlaugur Thor Briem <gthb@hi.is>.
-  Fix http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14650
-  (RPM package builds using rpm task failed with newer rpm versions
-  such as the current stable one in portage)
-
-*ant-1.5.4 (21 Sep 2003)
-
-  21 Sep 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r3.ebuild,
-  ant-1.5.3-r4.ebuild, ant-1.5.3-r5.ebuild, ant-1.5.4.ebuild, files/1.5.4/ant:
-  Added but masked 1.5.4, updated ant ebuild so now can use bcel support if
-  available, also updated patches
-
-  11 Aug 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r5.ebuild:
-  Updating ant as its working ok, has been tested.
-
-*ant-1.5.3-r5 (08 Aug 2003)
-
-  08 Aug 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r5.ebuild,
-  files/build.sh-exit-fix.patch.gz, files/1.5.3/1_6_backport-jdk142.patch.gz:
-  Added new ebuild with patches from Carsten Frewert <gentoo@frewert.de>.
-  Thanks. Marked as testing. It also solves bug #23874.
-
-*ant-1.5.3-r4 (26 May 2003)
-
-  26 May 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.3-r4.ebuild:
-  Time to unmask 1.5.3. -r4 includes a fix to include the supporting scripts to
-  close bug #19885.
-
-*ant-1.5.3-r3 (26 Apr 2003)
-
-  26 Apr 2003; Dylan Carlson <absinthe@gentoo.org> :
-  Switched to java-pkg eclass; added detection routines for antlr, beanutils,
-  junitreport, oro and xerces classes for optional ant tasks.
-
-*ant-1.5.3-r2 (23 Apr 2003)
-
-  26 Apr 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r2.ebuild:
-  Updated SRC_URI so this ebuild uses apache mirrors.
-  
-  23 Apr 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.3-r2.ebuild:
-  Many fixes, improvements:
-   - ant now builds from source instead of using the binaries
-     (thanks to Ryan Shaw in # 10364, belatedly)
-   - fixed SRC_URI
-   - fixed HOMEPAGE (ant.apache.org now)
-   - improved DESCRIPTION
-
-*ant-1.5.3-r1 (18 Apr 2003)
-
-  26 Apr 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r1.ebuild:
-  Updated SRC_URI so this ebuild uses apache mirrors. Updated Homepage.
-
-  18 Apr 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.3-r1.ebuild,
-  ant-1.5.3.ebuild, ant-1.5.3.ebuild:
-  Version bump to close #19505.  Still masked for testing.
-
-*ant-1.5.3 (15 Apr 2003)
-
-  15 Apr 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.3.ebuild,
-  files/1.5.3/ant:
-  Version bump.  Closes # 17097.
-
-*ant-1.5.2 (21 Mar 2003)
-
-  26 Apr 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.2.ebuild:
-  Updated SRC_URI so this ebuild uses apache mirrors. Updated Homepage.
-
-  06 Apr 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.2.ebuild:
-  ppc sparc moved to stable.
-
-  21 Mar 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.2.ebuild, 
-  files/1.5.2/ant:
-  Version bump.  Unmasked for x86.
-
-*ant-1.5.1-r4 (16 Mar 2003)
-
-  17 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> ant-1.5.1-r4.ebuild:
-  Added ~ppc keyword
-
-  16 Mar 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.1-r4.ebuild:
-  Added 'doc' USE flag for developer's documentation.
-
-*ant-1.5.1-r3 (01 Dec 2002)
-
-  05 Mar 2003; Will Woods <wwoods@gentoo.org> ant-1.5.1-r3.ebuild:
-  Added ~alpha keyword
-
-  20 Feb 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r3.ebuild :
-  Changed to stable keyword only on x86.
-
-  08 Dec 2002; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r3.ebuild :
-  Added Sparc keyword "~sparc" after testing it.
-
-  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> ant-1.5.1-r2.ebuild, ant-1.4.1-r3.ebuild :
-  Changed sparc64 to sparc keyword
-  
-  01 Dec 2002; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r3.ebuild
-  Doesnt need to download from a gentoo mirror.
-
-  01 Dec 2002; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r3.ebuild files/digest-ant-1.5.1-r3
-  I have created this ebuild cause building it from sources causes circular
-  dependencies (See bug #10360 and #10364) cause optional.jar doesnt have
-  all classes compiled. KEYWORDS are set only to "~x86". This ebuild should
-  fix some strange errors with ant. If somebody complains about this please
-  let me know. Also ant project changed how them distribute their files so we
-  need to mirror it now (Cant be downloaded automatically from their site).
-  Fixed ebuild to follow policy (Missing IUSE, Missing RDEPEND).
-
-*ant-1.5.1-r2 (18 Nov 2002)
-  
-  25 Nov 2002; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r2.ebuild
-  Unmasking ant for sparc64, as it looks like its working very well.
-
-  22 Nov 2002; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r2.ebuild
-  Changed Keywords "~x86 ~ppc" to "x86 ppc", inserting "~sparc64". Needs more
-  tests on sparc64 not only me.
-
-  18 Nov 2002; Adrian Almenar <strider@gentoo.org> ant-1.5.1-r2.ebuild files/digest-ant-1.5.1-r2: Added (Marked for Testing)
-  files/1.5.1/ant: Changed
-  User Classpath get overwrited by "gentooized" ant script, Fixes bug #10061.
-
-*ant-1.5.1-r1 (02 Nov 2002)
-
-  02 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.5.1-r1.ebuild files/digest-ant-1.5.1-r1:
-  Now uses Green threads on PPC. Fixes #7706.
-  Removed ant-1.5.1.ebuild files/digest-ant-1.5.1
-
-  16 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant:
-  Improved slightly, thanks to #9394.
-
-*ant-1.5.1 (25 Oct 2002)
-
-  25 Oct 2002; Maik Schreiber <blizzy@gentoo.org> ant-1.5.1.ebuild,
-  files/1.5.1/ant: New version.
-
-  25 Oct 2002; Maik Schreiber <blizzy@gentoo.org> ant-1.5.ebuild: Changed
-  KEYWORDS to "x86 ~ppc".
-
-  18 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant:
-  Fixed nasty oversight in script.
-
-  14 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant:
-  Fixed bugs with script as reported in #7732. Marked for testing. 
-
-*ant-1.5 (26 Jul 2002)
-
-  26 Jul 2002; William McArthur <sandymac@gentoo.org> ant-1.5.ebuild,
-  files/1.5/ant: Upgraded to Ant 1.5, rewrote the Gentoo specific ant script to
-  take avantage of java-config. It also looked like the Gentoo ant-1.4.1
-  script was based an older version of ant.
-
-  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
-  Added test in pkg_setup() to ensure that a proper system VM is installed. 
-  This is a special-case, we should not bother about adding similar tests to
-  all other java packages.
-
-  24 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
-  Added extra install-time test to verify that all files install properly. 
-  Some users manage to install a faulty ant, for some reason.
-
-  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> ant-1.4.1-r3.ebuild:
-  added ppc keyword
-
-  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
-  Added SLOT, KEYWORDS and LICENSE. Ebuild originally submitted by Achim
-  Gottinger <achim@gentoo.org>.
-
-*ant-1.4.1-r3 (03 May 2002)
-
-  03 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
-  Now handles the case of multiple occurrences of JAVA_HOME in the Java
-  environment setting, thanks to Florian L. Klein <kleinf@gmx.de>.
-
-  Removed ant-1.4.1-r2.ebuild files/digest-ant-1.4.1-r2
-
-*ant-1.4.1-r2 (10 Apr 2002)
-
-  10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r2.ebuild:
-  The JAVA_HOME env var is now picked from $HOME/.gentoo/java-env if it exists,
-  /etc/env.d/20java if not. An error is emitted if both files are missing.
-
-  Removed ant-1.4.1-r1.ebuild files/digest-ant-1.4.1-r1
-
-*ant-1.4.1-r1 (01 Feb 2002)
-
-  01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog:
-  Added initial ChangeLog.
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index dd02fc8a0580..806042e95456 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,21 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0a9e579c0585e31fa0f608df4fc596ab ant-1.5.4-r1.ebuild 3013
-MD5 1c32cf321566b712cf581daa76820de9 ant-1.6.2-r5.ebuild 2220
-MD5 a833a5807679d0593148982e4cf3c473 ChangeLog 13450
+MD5 8dc52446cb66040e15b4c0b5cc67b006 ant-1.6.2-r6.ebuild 476
+MD5 f11077b37250f9e923d7aceced92edbf ChangeLog 536
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
-MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
-MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
-MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
-MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-1.5.4-r1 70
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r5 74
-MD5 cf3e02894f5e6ceebcf81e03e473ee2c files/1.6.2-r5/ant 4962
-MD5 f8c9e03bf0f5924ebf9162718bf15169 files/1.5.4/ant 2275
+MD5 1e54d978c2dc4251878340f5bcd70076 ant-1.5.4-r2.ebuild 442
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.5.4-r2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.6.2-r6 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBPCPB/rLF9B432nYRAsXMAKCSB91T9TEBOerWvP4MVmr44V1sjwCgoIey
-PD0PWDYIuklrB43k7mMMKgs=
-=upWL
+iD8DBQFBQgPs/rLF9B432nYRAhYbAJ9+fQKka7XZSV0V944COTBKLq7FwQCgzehB
+BH1EnWsU9Okwx4jHykaBJNg=
+=nMuO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant/ant-1.5.4-r1.ebuild b/dev-java/ant/ant-1.5.4-r1.ebuild
deleted file mode 100644
index 5f0e55e3c509..000000000000
--- a/dev-java/ant/ant-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r1.ebuild,v 1.14 2004/07/02 04:18:20 eradicator Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="http://archive.apache.org/dist/ant/source/apache-${PN}-${PV}-src.zip"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=virtual/jdk-1.3
-	>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.3
-	app-shells/bash"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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
-	# This patch will be used until ant 1.6 is released
-	epatch ${FILESDIR}/rpmbuild.patch.gz
-}
-
-src_compile() {
-	addwrite "/proc/self/maps"
-
-	[ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die
-
-	export JAVA_HOME=${JDK_HOME}
-	if [ `arch` == "ppc" ] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
-
-	# Make sure junit tasks get built if we have junit
-	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
-		export CLASSPATH="/usr/share/junit/lib/junit.jar"
-		export DEP_APPEND="junit"
-		if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then
-			export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar"
-			export DEP_APPEND="${DEP_APPEND} xalan"
-		fi
-	fi
-
-	# Add Xerces in if we have it
-	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
-		export DEP_APPEND="${DEP_APPEND} xerces"
-	fi
-
-	# Add oro in if we have it
-	if [ -f "/usr/share/oro/lib/oro.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
-		export DEP_APPEND="${DEP_APPEND} oro"
-	fi
-
-	# Add beanutils if we have it
-	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
-		export DEP_APPEND="${DEP_APPEND} commons-beanutils"
-	fi
-
-	# add antlr if we have it
-	if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
-		export DEP_APPEND="${DEP_APPEND} antlr"
-	fi
-
-	# add bcel if we have it
-	if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar"
-		export DEP_APPEND="${DEP_APPEND} bcel"
-	fi
-
-	./build.sh -Ddist.dir=${D}/usr/share/ant || die
-}
-
-src_install() {
-	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
-
-	exeinto /usr/bin
-	doexe src/ant
-	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
-		dobin ${S}/src/script/${each}
-	done
-
-	java-pkg_dojar build/lib/*.jar
-
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
-	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/ant/ant-1.5.4-r2.ebuild b/dev-java/ant/ant-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..7592c65e64e8
--- /dev/null
+++ b/dev-java/ant/ant-1.5.4-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r2.ebuild,v 1.5 2004/09/10 19:41:39 axxo Exp $
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc sparc"
+IUSE=""
+
+DEPEND="=dev-java/ant-core-${PV}*"
diff --git a/dev-java/ant/ant-1.6.2-r5.ebuild b/dev-java/ant/ant-1.6.2-r5.ebuild
deleted file mode 100644
index c167aeaa26d8..000000000000
--- a/dev-java/ant/ant-1.6.2-r5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r5.ebuild,v 1.3 2004/09/04 12:58:31 axxo Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc sparc"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	!<dev-java/ant-tasks-${PV}
-	>=dev-java/java-config-1.2"
-RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
-	>=dev-java/java-config-1.2"
-PDEPEND="=dev-java/ant-tasks-1.6.2-r4"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-pkg_setup() {
-	if [ -n "$JAVA_HOME" ] ; then
-		export CLASSPATH=".:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/jre/lib/rt.jar:."
-	else
-		einfo "Warning: JAVA_HOME environment variable is not set (or not exported)."
-		einfo "  If build fails because sun.* classes could not be found"
-		einfo "  you will need to set the JAVA_HOME environment variable"
-		einfo "  to the installation directory of java."
-		einfo "  Try using java-config script"
-		die
-	fi
-
-	if [ `arch` == "ppc" ] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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
-}
-
-src_compile() {
-	addwrite "/proc/self/maps"
-
-	local myc
-	myc="${myc} -Ddist.dir=${D}/usr/share/ant"
-	myc="${myc} -Djavac.target=1.4"
-
-	echo $CLASSPATH
-	./build.sh -Ddist.dir=${D}/usr/share/ant || die
-}
-
-src_install() {
-	cp ${FILESDIR}/${PVR}/ant ${S}/src/ant
-
-	exeinto /usr/bin
-	doexe src/ant
-
-	dodir /usr/share/ant/bin
-	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
-		dobin ${S}/src/script/${each}
-		dosym /usr/bin/${each} /usr/share/ant/bin/${each}
-	done
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/20ant
-
-	java-pkg_dojar build/lib/ant.jar
-	java-pkg_dojar build/lib/ant-launcher.jar
-
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
-	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/ant/ant-1.6.2-r6.ebuild b/dev-java/ant/ant-1.6.2-r6.ebuild
new file mode 100644
index 000000000000..0460c26f39ca
--- /dev/null
+++ b/dev-java/ant/ant-1.6.2-r6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r6.ebuild,v 1.1 2004/09/10 19:41:39 axxo Exp $
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ppc sparc"
+IUSE="doc"
+
+DEPEND="=dev-java/ant-tasks-${PV}*
+		=dev-java/ant-core-${PV}*"
+
diff --git a/dev-java/ant/files/1.5.4/ant b/dev-java/ant/files/1.5.4/ant
deleted file mode 100644
index 07f0c00f8162..000000000000
--- a/dev-java/ant/files/1.5.4/ant
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/bash
-
-#   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
-#   reserved.
-#   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.5.4/ant,v 1.4 2004/07/18 02:50:14 dragonheart Exp $
-
-if [ -f $HOME/.gentoo/java-env ] ; then
-  source $HOME/.gentoo/java-env
-else
-  JAVA_HOME=`java-config --jdk-home`
-  CLASSPATH=`java-config --classpath`:${CLASSPATH}
-fi
-
-if [ -z $JAVA_HOME ] ; then
-  echo "Error: No JDK found!"
-  echo "Try using java-config script to set your JDK"
-  echo "Remember that you need a JDK not a JRE"
-  exit 1
-fi
-
-# load system-wide ant configuration
-if [ -f "/etc/ant.conf" ] ; then 
-  . /etc/ant.conf
-fi
-
-# provide default values for people who don't use RPMs
-if [ -z "$rpm_mode" ] ; then
-  rpm_mode=false;
-fi
-if [ -z "$usejikes" ] ; then
-  usejikes=false;
-fi
-
-# load user ant configuration
-if [ -f "$HOME/.antrc" ] ; then 
-  . "$HOME/.antrc"
-fi
-
-ANT_HOME=/usr/share/ant
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-JAVACMD="`java-config --java`"
- 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH="$CLASSPATH"
-fi
-
-# add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant`"
-
-if [ -n "$JAVA_HOME" ] ; then
-  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
-  fi
-
-  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
-  fi
-
-else
-  echo "Warning: JAVA_HOME environment variable is not set (or not exported)."
-  echo "  If build fails because sun.* classes could not be found"
-  echo "  you will need to set the JAVA_HOME environment variable"
-  echo "  to the installation directory of java."
-  echo "  Try using java-config script"
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
-  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-# 2002-11-02, karltk@gentoo.org:
-# The Blackdown JDK on PPC hiccups with native threads
-#
-if [ "`arch`" == "ppc" ] ; then
-	export THREADS_FLAG="green"
-fi
-
-"$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
diff --git a/dev-java/ant/files/1.6.2-r5/ant b/dev-java/ant/files/1.6.2-r5/ant
deleted file mode 100644
index 48600fd48a97..000000000000
--- a/dev-java/ant/files/1.6.2-r5/ant
+++ /dev/null
@@ -1,166 +0,0 @@
-#! /bin/bash
-
-#   Copyright 2001-2004 The Apache Software Foundation
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-#   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r5/ant,v 1.3 2004/09/04 12:58:31 axxo Exp $
-
-# Extract launch and ant arguments, (see details below).
-ant_exec_args=
-no_config=false
-use_jikes_default=false
-ant_exec_debug=false
-show_help=false
-for arg in "$@" ; do
-  if [ "$arg" = "--noconfig" ] ; then
-    no_config=true
-  elif [ "$arg" = "--usejikes" ] ; then
-    use_jikes_default=true
-  elif [ "$arg" = "--execdebug" ] ; then
-    ant_exec_debug=true
-  elif [ my"$arg" = my"--h"  -o my"$arg" = my"--help"  ] ; then
-    show_help=true
-    ant_exec_args="$ant_exec_args -h"
-  else
-    if [  my"$arg" = my"-h"  -o  my"$arg" = my"-help" ] ; then
-      show_help=true
-    fi
-    ant_exec_args="$ant_exec_args \"$arg\""
-  fi
-done
-
-# Source/default ant configuration
-if $no_config ; then
-  rpm_mode=false
-  usejikes=$use_jikes_default
-else
-  # load system-wide ant configuration
-  if [ -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
-  fi
-
-  # load user ant configuration
-  if [ -f "$HOME/.ant/ant.conf" ] ; then
-    . $HOME/.ant/ant.conf
-  fi
-  if [ -f "$HOME/.antrc" ] ; then
-    . "$HOME/.antrc"
-  fi
-
-  # provide default configuration values
-  if [ -z "$rpm_mode" ] ; then
-    rpm_mode=false
-  fi
-  if [ -z "$usejikes" ] ; then
-    usejikes=$use_jikes_default
-  fi
-fi
-
-if [ -f $HOME/.gentoo/java-env ] ; then
-  source $HOME/.gentoo/java-env
-else
-  JAVA_HOME=`java-config --jdk-home`
-  CLASSPATH=`java-config --classpath`:${CLASSPATH}
-fi
-
-if [ -z $JAVA_HOME ] ; then
-  echo "Error: No JDK found!"
-  echo "Try using java-config script to set your JDK"
-  echo "Remember that you need a JDK not a JRE"
-  exit 1
-fi
-
-ANT_HOME=/usr/share/ant
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-JAVACMD="`java-config --java`"
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-if [ -z "$LOCALCLASSPATH" ] ; then
-  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
-else
-  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
-fi
-
-# add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`"
-
-if [ -n "$JAVA_HOME" ] ; then
-  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
-  fi
-
-  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
-  fi
-
-else
-  echo "Warning: JAVA_HOME environment variable is not set (or not exported)."
-  echo "  If build fails because sun.* classes could not be found"
-  echo "  you will need to set the JAVA_HOME environment variable"
-  echo "  to the installation directory of java."
-  echo "  Try using java-config script"
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
-  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-# Show script help if requested
-if $show_help ; then
-  echo $0 '[script options] [options] [target [target2 [target3] ..]]'
-  echo 'Script Options:'
-  echo '  --help, --h            print this message and ant help'
-  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
-  echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
-  echo '                         configuration files'
-  echo '  --usejikes             enable use of jikes by default, unless'
-  echo '                         set explicitly in configuration files'
-  echo '  --execdebug            print ant exec line generated by this'
-  echo '                         launch script'
-  echo '  '
-fi
-
-# Execute ant using eval/exec to preserve spaces in paths,
-# java options, and ant args
-ant_sys_opts=
-
-
-if [ -n "$JIKESPATH" ]; then
-	ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
-fi
-
-# 2002-11-02, karltk@gentoo.org:
-# The Blackdown JDK on PPC hiccups with native threads
-#
-if [ "`arch`" == "ppc" ] ; then
-	export THREADS_FLAG="green"
-fi
-
-
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\" $ant_exec_args"
-
-if $ant_exec_debug ; then
-  echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/dev-java/ant/files/20ant b/dev-java/ant/files/20ant
deleted file mode 100644
index b4bcea575eff..000000000000
--- a/dev-java/ant/files/20ant
+++ /dev/null
@@ -1 +0,0 @@
-ANT_HOME="/usr/share/ant"
diff --git a/dev-java/ant/files/build.sh-exit-fix.patch.gz b/dev-java/ant/files/build.sh-exit-fix.patch.gz
deleted file mode 100644
index 541f796dd7ef..000000000000
--- a/dev-java/ant/files/build.sh-exit-fix.patch.gz
+++ /dev/null
diff --git a/dev-java/ant/files/digest-ant-1.5.4-r1 b/dev-java/ant/files/digest-ant-1.5.4-r1
deleted file mode 100644
index 80802420362a..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61ce45f5e62d304def5027d7ca36211e apache-ant-1.5.4-src.zip 6610843
diff --git a/dev-java/ant/files/digest-ant-1.5.4-r2 b/dev-java/ant/files/digest-ant-1.5.4-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.4-r2
diff --git a/dev-java/ant/files/digest-ant-1.6.2-r5 b/dev-java/ant/files/digest-ant-1.6.2-r5
deleted file mode 100644
index 511c4167d672..000000000000
--- a/dev-java/ant/files/digest-ant-1.6.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
diff --git a/dev-java/ant/files/digest-ant-1.6.2-r6 b/dev-java/ant/files/digest-ant-1.6.2-r6
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.2-r6
diff --git a/dev-java/ant/files/rpmbuild.patch.gz b/dev-java/ant/files/rpmbuild.patch.gz
deleted file mode 100644
index 0a86f9559513..000000000000
--- a/dev-java/ant/files/rpmbuild.patch.gz
+++ /dev/null
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index f72f6d83a3c6..113c0722ebfb 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff91102ca2497f20e0192beb0da008e9 bcel-5.1.ebuild 1173
-MD5 a0eda9738de6c8f30ac87037139c38d7 ChangeLog 1538
+MD5 87c79d69431d4f29db0604ac5d1ae0f9 bcel-5.1.ebuild 1192
+MD5 6744ec40e9db02d3a292f0df82774ec1 ChangeLog 1626
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 e908f81e51167a747ab8527dacc3ee4e files/digest-bcel-5.1 66
 MD5 88f16b1c12a8814d078c5eb3906d2218 files/bcel-5.1-gentoo.diff 457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBObyU/rLF9B432nYRAo+EAJwMXvQAW89JOElhjkIEz9G1gBkeHgCcCLRO
-bWIuzBdiJTXjRmpSVWzF7Tc=
-=ofBK
+iD8DBQFBQgTi/rLF9B432nYRAsvUAJsGl2hrRFgm7F4fHEYiow3NNf9r/ACgoyBR
+8746+mrN8iSkDcVRFQ/e0uc=
+=vNMW
 -----END PGP SIGNATURE-----