ant_src_unpack -> src_unpack

Package-Manager: portage-2.1.1_pre3-r3

55 files changed, 368 insertions, 77 deletions

diff --git a/dev-java/antenna/ChangeLog b/dev-java/antenna/ChangeLog
index 848a66f22ace..2953eef580de 100644
--- a/dev-java/antenna/ChangeLog
+++ b/dev-java/antenna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antenna
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.1 2006/07/09 16:51:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.2 2006/07/22 21:25:12 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  antenna-0.9.13-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *antenna-0.9.13-r1 (09 Jul 2006)
 
diff --git a/dev-java/antenna/antenna-0.9.13-r1.ebuild b/dev-java/antenna/antenna-0.9.13-r1.ebuild
index f6f55898dda1..a55916a89e11 100644
--- a/dev-java/antenna/antenna-0.9.13-r1.ebuild
+++ b/dev-java/antenna/antenna-0.9.13-r1.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/antenna/antenna-0.9.13-r1.ebuild,v 1.1 2006/07/09 16:51:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/antenna-0.9.13-r1.ebuild,v 1.2 2006/07/22 21:25:12 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -20,7 +20,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4
 	~dev-java/servletapi-2.3"
 
-ant_src_unpack() {
+src_unpack() {
 	mkdir ${S} && cd ${S}
 
 	unpack ${A}
diff --git a/dev-java/asm/ChangeLog b/dev-java/asm/ChangeLog
index 5e00e4fdcf7f..42fb6a49bd98 100644
--- a/dev-java/asm/ChangeLog
+++ b/dev-java/asm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/asm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.24 2006/07/02 06:09:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.25 2006/07/22 21:26:56 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> asm-1.4.1-r1.ebuild,
+  asm-1.4.3-r3.ebuild, asm-1.5.2-r2.ebuild, asm-2.0-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +asm-1.4.1-r1.ebuild,
   +asm-1.4.3-r3.ebuild, +asm-1.5.2-r2.ebuild, +asm-2.0-r1.ebuild:
diff --git a/dev-java/asm/asm-1.4.1-r1.ebuild b/dev-java/asm/asm-1.4.1-r1.ebuild
index e893d90e4384..18290e26e83f 100644
--- a/dev-java/asm/asm-1.4.1-r1.ebuild
+++ b/dev-java/asm/asm-1.4.1-r1.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/asm/asm-1.4.1-r1.ebuild,v 1.1 2006/07/02 06:09:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-1.4.1-r1.ebuild,v 1.2 2006/07/22 21:26:56 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.3"
 
 S=${WORKDIR}/ASM/dev/
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
diff --git a/dev-java/asm/asm-1.4.3-r3.ebuild b/dev-java/asm/asm-1.4.3-r3.ebuild
index 90b2b37c86c7..facdb3508454 100644
--- a/dev-java/asm/asm-1.4.3-r3.ebuild
+++ b/dev-java/asm/asm-1.4.3-r3.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/asm/asm-1.4.3-r3.ebuild,v 1.1 2006/07/02 06:09:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-1.4.3-r3.ebuild,v 1.2 2006/07/22 21:26:56 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.3
 	dev-java/ant-owanttask"
 RDEPEND=">=virtual/jre-1.3"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
diff --git a/dev-java/asm/asm-1.5.2-r2.ebuild b/dev-java/asm/asm-1.5.2-r2.ebuild
index 65257a2cb35f..ac23703545f7 100644
--- a/dev-java/asm/asm-1.5.2-r2.ebuild
+++ b/dev-java/asm/asm-1.5.2-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/asm/asm-1.5.2-r2.ebuild,v 1.1 2006/07/02 06:09:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-1.5.2-r2.ebuild,v 1.2 2006/07/22 21:26:56 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.3
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
diff --git a/dev-java/asm/asm-2.0-r1.ebuild b/dev-java/asm/asm-2.0-r1.ebuild
index ce33725f0a24..3b39e3826c74 100644
--- a/dev-java/asm/asm-2.0-r1.ebuild
+++ b/dev-java/asm/asm-2.0-r1.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/asm/asm-2.0-r1.ebuild,v 1.1 2006/07/02 06:09:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.0-r1.ebuild,v 1.2 2006/07/22 21:26:56 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.3
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
diff --git a/dev-java/avalon-framework/ChangeLog b/dev-java/avalon-framework/ChangeLog
index 8cb4151e10ff..31fed781f624 100644
--- a/dev-java/avalon-framework/ChangeLog
+++ b/dev-java/avalon-framework/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-framework
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.9 2006/07/02 20:14:51 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.10 2006/07/22 21:28:28 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  avalon-framework-4.1.5-r1.ebuild, avalon-framework-4.2.0-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +avalon-framework-4.1.5-r1.ebuild, +avalon-framework-4.2.0-r1.ebuild:
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
index e797584ed38a..da6283ae5ebe 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.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/avalon-framework/avalon-framework-4.1.5-r1.ebuild,v 1.1 2006/07/02 20:14:51 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild,v 1.2 2006/07/22 21:28:28 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,7 +25,7 @@ DEPEND=">=virtual/jdk-1.4
 
 S="${WORKDIR}/${PN}"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
index 4bea07caeb17..b74fa1be9cf0 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.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/avalon-framework/avalon-framework-4.2.0-r1.ebuild,v 1.1 2006/07/02 20:14:51 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild,v 1.2 2006/07/22 21:28:28 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -24,7 +24,7 @@ DEPEND=">=virtual/jdk-1.4
 
 S="${WORKDIR}/${PN}"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index b3f34c80a7a7..8d78d5b9e140 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.23 2006/07/02 20:47:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.24 2006/07/22 21:29:53 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  avalon-logkit-1.2-r1.ebuild, avalon-logkit-2.0-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +avalon-logkit-1.2-r1.ebuild, +avalon-logkit-2.0-r1.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild
index e23ad8af154d..f0e5ffff5450 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r1.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/avalon-logkit/avalon-logkit-1.2-r1.ebuild,v 1.1 2006/07/02 20:47:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild,v 1.2 2006/07/22 21:29:53 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -41,7 +41,7 @@ IUSE="doc javamail jms source"
 
 S=${WORKDIR}/LogKit-${PV}
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 	rm -f *.jar
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.0-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0-r1.ebuild
index 473a753fa354..dd03f2c339c4 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.0-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.0-r1.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/avalon-logkit/avalon-logkit-2.0-r1.ebuild,v 1.1 2006/07/02 20:47:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.0-r1.ebuild,v 1.2 2006/07/22 21:29:53 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -39,7 +39,7 @@ DEPEND="|| (
 
 S=${WORKDIR}/${P}.dev-0
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 3dfb41414795..769b62717987 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/backport-util-concurrent
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.7 2006/07/03 00:53:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.8 2006/07/22 21:44:22 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  backport-util-concurrent-1.1.01-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
   03 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +backport-util-concurrent-1.1.01-r1.ebuild:
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild
index 58a693d0562c..34b7a6c0dcf9 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.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/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild,v 1.1 2006/07/03 00:53:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild,v 1.2 2006/07/22 21:44:22 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -22,7 +22,7 @@ RDEPEND="=virtual/jre-1.4*"
 
 S="${WORKDIR}/${MY_P}-src"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}/external
 	rm -f *.jar
diff --git a/dev-java/bcel/ChangeLog b/dev-java/bcel/ChangeLog
index 5bcd2bb278df..4768afe085f7 100644
--- a/dev-java/bcel/ChangeLog
+++ b/dev-java/bcel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/bcel
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.33 2006/07/04 18:50:30 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.34 2006/07/22 21:41:50 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> bcel-5.1-r3.ebuild:
+  ant_src_unpack -> src_unpack
 
 *bcel-5.1-r3 (04 Jul 2006)
 
diff --git a/dev-java/bcel/bcel-5.1-r3.ebuild b/dev-java/bcel/bcel-5.1-r3.ebuild
index dd9aa15a0876..e1be997b8c17 100644
--- a/dev-java/bcel/bcel-5.1-r3.ebuild
+++ b/dev-java/bcel/bcel-5.1-r3.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/bcel/bcel-5.1-r3.ebuild,v 1.1 2006/07/04 18:50:30 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1-r3.ebuild,v 1.2 2006/07/22 21:41:50 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -20,7 +20,7 @@ DEPEND=">=virtual/jdk-1.3
 	source? ( app-arch/zip )
 	${COMMON_DEP}"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	unzip -q "${P}-src.zip" || die "failed to unpack"
 
diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index c56a504811f2..1ef5ff1a8347 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.27 2006/07/04 19:08:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.28 2006/07/22 21:45:50 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> bsf-2.3.0-r3.ebuild:
+  ant_src_unpack -> src_unpack
 
 *bsf-2.3.0-r3 (04 Jul 2006)
 
diff --git a/dev-java/bsf/bsf-2.3.0-r3.ebuild b/dev-java/bsf/bsf-2.3.0-r3.ebuild
index 868c59483f0e..6a7312fafa62 100644
--- a/dev-java/bsf/bsf-2.3.0-r3.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r3.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/bsf/bsf-2.3.0-r3.ebuild,v 1.1 2006/07/04 19:08:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r3.ebuild,v 1.2 2006/07/22 21:45:50 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -23,7 +23,7 @@ DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )
 	${COMMON_DEP}"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 
 	epatch ${WORKDIR}/bsf-rhino-1.5.patch
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index 9e103e2871c1..98b75a8b03a9 100644
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsh
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.29 2006/07/04 19:26:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.30 2006/07/22 21:47:19 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  bsh-2.0_beta4-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *bsh-2.0_beta4-r1 (04 Jul 2006)
 
diff --git a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
index f20a1ab145d1..18410ea853fa 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r1.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/bsh/bsh-2.0_beta4-r1.ebuild,v 1.1 2006/07/04 19:26:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r1.ebuild,v 1.2 2006/07/22 21:47:19 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/BeanShell-${MY_PV}
 
-ant_src_unpack() {
+src_unpack() {
 	jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack"
 	cd ${S}
 
diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index 1645b3caf0ae..2dd8d961edd0 100644
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/c3p0
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.15 2006/07/04 19:41:56 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.16 2006/07/22 21:49:12 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  c3p0-0.9.0_pre6-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *c3p0-0.9.0_pre6-r1 (04 Jul 2006)
 
diff --git a/dev-java/c3p0/c3p0-0.9.0_pre6-r1.ebuild b/dev-java/c3p0/c3p0-0.9.0_pre6-r1.ebuild
index 5540cd603a34..4f7bd6917a4f 100644
--- a/dev-java/c3p0/c3p0-0.9.0_pre6-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.0_pre6-r1.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/c3p0/c3p0-0.9.0_pre6-r1.ebuild,v 1.1 2006/07/04 19:41:56 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.0_pre6-r1.ebuild,v 1.2 2006/07/22 21:49:12 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -24,7 +24,7 @@ IUSE="doc"
 
 S=${WORKDIR}/${PN}-${MY_PV}.src
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "j2ee.jar.base.dir=${JAVA_HOME}" > build.properties
diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index e639939b2cb8..1e63dd17d75a 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/castor
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.23 2006/07/04 19:49:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.24 2006/07/22 21:38:21 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  castor-0.9.9.1-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *castor-0.9.9.1-r1 (04 Jul 2006)
 
diff --git a/dev-java/castor/castor-0.9.9.1-r1.ebuild b/dev-java/castor/castor-0.9.9.1-r1.ebuild
index b49e77a53240..7b1ec8e9f838 100644
--- a/dev-java/castor/castor-0.9.9.1-r1.ebuild
+++ b/dev-java/castor/castor-0.9.9.1-r1.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/castor/castor-0.9.9.1-r1.ebuild,v 1.1 2006/07/04 19:49:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r1.ebuild,v 1.2 2006/07/22 21:38:21 nelchael Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -33,7 +33,7 @@ DEPEND="|| (
 	>=dev-java/ant-core-1.5
 	${COMMON_DEP}"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 
 	cd ${S}
diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index e4980637f463..cccbf9c5b860 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.12 2006/07/12 13:52:04 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.13 2006/07/22 21:33:18 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> cglib-2.0.2-r2.ebuild,
+  cglib-2.1.3.ebuild:
+  ant_src_unpack -> src_unpack
 
   12 Jul 2006; Danny van Dyk <kugelfang@gentoo.org> cglib-2.1.3.ebuild:
   QA: Added source to IUSE.
diff --git a/dev-java/cglib/cglib-2.0.2-r2.ebuild b/dev-java/cglib/cglib-2.0.2-r2.ebuild
index c09744d9b335..4b2e7ce2dcce 100644
--- a/dev-java/cglib/cglib-2.0.2-r2.ebuild
+++ b/dev-java/cglib/cglib-2.0.2-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/cglib/cglib-2.0.2-r2.ebuild,v 1.1 2006/07/05 05:19:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r2.ebuild,v 1.2 2006/07/22 21:33:18 nelchael Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -23,7 +23,7 @@ IUSE="doc source"
 
 S=${WORKDIR}
 
-ant_src_unpack() {
+src_unpack() {
 	jar xf ${DISTDIR}/${A} || die "failed to unpack"
 
 	epatch ${FILESDIR}/${P}-asm-1.4.3.patch
diff --git a/dev-java/cglib/cglib-2.1.3.ebuild b/dev-java/cglib/cglib-2.1.3.ebuild
index 4c25535accde..768db64dc95e 100644
--- a/dev-java/cglib/cglib-2.1.3.ebuild
+++ b/dev-java/cglib/cglib-2.1.3.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/cglib/cglib-2.1.3.ebuild,v 1.2 2006/07/12 13:52:04 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.3 2006/07/22 21:33:18 nelchael Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -24,7 +24,7 @@ IUSE="doc source"
 
 S=${WORKDIR}
 
-ant_src_unpack() {
+src_unpack() {
 	jar xf ${DISTDIR}/${A} || die "failed to unpack"
 
 	cd ${S}/lib
diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index fc8d5c161e7e..91ea9c4da395 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-beanutils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.25 2006/07/07 02:33:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.26 2006/07/22 21:32:21 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  commons-beanutils-1.6.1-r3.ebuild, commons-beanutils-1.7.0-r2.ebuild:
+  ant_src_unpack -> src_unpack
 
 *commons-beanutils-1.7.0-r2 (07 Jul 2006)
 *commons-beanutils-1.6.1-r3 (07 Jul 2006)
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
index a0356ef0e1e7..82505bdbc57b 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.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/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.1 2006/07/07 02:33:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.2 2006/07/22 21:32:21 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,7 +25,7 @@ DEPEND=">=virtual/jdk-1.3
 
 S="${WORKDIR}/${P}-src"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
index 00371b9e3a1a..59eb7ceb1722 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-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/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild,v 1.1 2006/07/07 02:33:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild,v 1.2 2006/07/22 21:32:21 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,7 +25,7 @@ DEPEND=">=virtual/jdk-1.3
 
 S="${WORKDIR}/${P}-src"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 6487f00d5be8..3f2c334d1804 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-betwixt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.6 2006/07/13 21:59:14 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.7 2006/07/22 21:37:10 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  commons-betwixt-0.6-r2.ebuild, commons-betwixt-0.7-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *commons-betwixt-0.7-r1 (13 Jul 2006)
 *commons-betwixt-0.6-r2 (13 Jul 2006)
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild
index 677231b3b134..193c30812dae 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.6-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/commons-betwixt/commons-betwixt-0.6-r2.ebuild,v 1.1 2006/07/13 21:59:14 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild,v 1.2 2006/07/22 21:37:10 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -26,7 +26,7 @@ DEPEND=">=virtual/jdk-1.3
 
 S="${WORKDIR}/${P}-src/"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 
 	cd ${S}
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
index d0282be62070..c004b37fb5fd 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.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/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.1 2006/07/13 21:59:14 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.2 2006/07/22 21:37:10 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -27,7 +27,7 @@ DEPEND=">=virtual/jdk-1.3
 
 S="${WORKDIR}/${P}-src/"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/${P}-notests.patch
diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index 0895cd6d4e29..5e143f7084dc 100644
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-cli
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.22 2006/07/20 11:20:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.23 2006/07/22 21:50:36 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  commons-cli-1.0-r5.ebuild:
+  ant_src_unpack -> src_unpack
 
   20 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   commons-cli-1.0-r5.ebuild:
diff --git a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild
index be9326d6d03f..f46f20aa7f55 100644
--- a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.0-r5.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/commons-cli/commons-cli-1.0-r5.ebuild,v 1.2 2006/07/20 11:20:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r5.ebuild,v 1.3 2006/07/22 21:50:36 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -22,7 +22,7 @@ DEPEND=">=virtual/jdk-1.3
 	source? ( app-arch/zip )
 	>=dev-java/ant-core-1.6.2"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index b7149fd163de..94531ce7c2a8 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-el
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.13 2006/07/04 20:40:28 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.14 2006/07/22 21:51:56 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  commons-el-1.0-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *commons-el-1.0-r1 (04 Jul 2006)
 
diff --git a/dev-java/commons-el/commons-el-1.0-r1.ebuild b/dev-java/commons-el/commons-el-1.0-r1.ebuild
index 1c1d72660c22..9c3741908ee2 100644
--- a/dev-java/commons-el/commons-el-1.0-r1.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r1.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/commons-el/commons-el-1.0-r1.ebuild,v 1.1 2006/07/04 20:40:28 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r1.ebuild,v 1.2 2006/07/22 21:51:56 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -21,7 +21,7 @@ DEPEND=">=virtual/jdk-1.4
 
 S=${WORKDIR}/${P}-src
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	mv build.properties build.properties.old
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 9e61e9f94fc6..5f9f4abdfbc9 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.37 2006/07/20 11:21:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.38 2006/07/22 21:23:55 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  commons-logging-1.0.4-r2.ebuild:
+  ant_src_unpack -> src_unpack
 
 *commons-logging-1.0.4-r2 (20 Jul 2006)
 
diff --git a/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild b/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild
index 1942243364bf..b19069eb497a 100644
--- a/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.0.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/commons-logging/commons-logging-1.0.4-r2.ebuild,v 1.1 2006/07/20 11:21:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild,v 1.2 2006/07/22 21:23:55 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -24,7 +24,7 @@ DEPEND=">=virtual/jdk-1.3
 
 S="${WORKDIR}/${P}-src/"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index a0b5af9df8c3..29e5d725952b 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.27 2006/07/14 16:29:08 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.28 2006/07/22 21:18:57 nelchael Exp $
+
+*fop-0.20.5-r6 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> -fop-0.20.5-r5.ebuild,
+  +fop-0.20.5-r6.ebuild:
+  ant_src_unpack -> src_unpack
 
 *fop-0.20.5-r5 (14 Jul 2006)
 
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r6 b/dev-java/fop/files/digest-fop-0.20.5-r6
new file mode 100644
index 000000000000..f4b8ca285900
--- /dev/null
+++ b/dev-java/fop/files/digest-fop-0.20.5-r6
@@ -0,0 +1,3 @@
+MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
+RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
+SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/fop-0.20.5-r6.ebuild b/dev-java/fop/fop-0.20.5-r6.ebuild
new file mode 100644
index 000000000000..8788233d2e22
--- /dev/null
+++ b/dev-java/fop/fop-0.20.5-r6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r6.ebuild,v 1.1 2006/07/22 21:18:57 nelchael Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_V=${PV/_/}
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+SRC_URI="mirror://apache/xml/fop/fop-${MY_V}-src.tar.gz"
+HOMEPAGE="http://xml.apache.org/fop/"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples jai jimi"
+
+# Doesn't like Java 1.5
+COMMON_DEP="
+	jai? ( dev-java/sun-jai-bin )
+	jimi? ( dev-java/sun-jimi )
+	=dev-java/avalon-framework-4.1*
+	~dev-java/batik-1.5
+	dev-java/xalan
+	>=dev-java/xerces-2.6.2
+	!dev-java/fop-bin"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
+	${COMMON_DEP}"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
+	${COMMON_DEP}
+	>=dev-java/ant-1.5.4"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-buildxml.patch
+
+	cd ${S}/lib
+	rm -f *.jar
+	java-pkg_jar-from avalon-framework-4.1
+	java-pkg_jar-from batik-1.5 batik-all.jar batik.jar
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xerces-2
+	use jai && java-pkg_jar-from sun-jai-bin
+	use jimi && java-pkg_jar-from sun-jimi
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	eant package $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar build/fop.jar
+
+	dodir /etc/env.d/java/
+	echo 'FOP_HOME=/usr/share/fop/' > ${D}/etc/env.d/java/22fop
+	java-pkg_dolauncher ${PN} --main org.apache.fop.apps.Fop
+
+	if use doc; then
+		dodoc CHANGES STATUS README
+		java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -pPR examples ${D}/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-java/jakarta-regexp/ChangeLog b/dev-java/jakarta-regexp/ChangeLog
index 14d0820c0780..3eb7d6b120fb 100644
--- a/dev-java/jakarta-regexp/ChangeLog
+++ b/dev-java/jakarta-regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jakarta-regexp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.9 2006/07/20 11:29:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.10 2006/07/22 21:35:49 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  jakarta-regexp-1.3-r3.ebuild, jakarta-regexp-1.4.ebuild:
+  ant_src_unpack -> src_unpack
 
 *jakarta-regexp-1.4 (20 Jul 2006)
 
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
index 6ab3645cc814..c7bf2a975657 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.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/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild,v 1.1 2006/07/20 11:25:52 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild,v 1.2 2006/07/22 21:35:49 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	rm *.jar
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild
index d9f5c2c69acf..843c915a2c57 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4.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/jakarta-regexp/jakarta-regexp-1.4.ebuild,v 1.1 2006/07/20 11:29:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild,v 1.2 2006/07/22 21:35:49 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	rm *.jar
diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 69ed8b4fed9d..4d8b4184fd50 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.22 2006/07/04 18:40:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.23 2006/07/22 21:22:35 nelchael Exp $
+
+*jaxen-1.1_beta7-r2 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -jaxen-1.1_beta7-r1.ebuild, +jaxen-1.1_beta7-r2.ebuild:
+  ant_src_unpack -> src_unpack
 
 *jaxen-1.1_beta7-r1 (04 Jul 2006)
 
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r2 b/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r2
new file mode 100644
index 000000000000..a562287121e5
--- /dev/null
+++ b/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r2
@@ -0,0 +1,3 @@
+MD5 2e90bb426e52984f4dc942427015a757 jaxen-1.1-beta-7-src.tar.gz 274435
+RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 jaxen-1.1-beta-7-src.tar.gz 274435
+SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5 jaxen-1.1-beta-7-src.tar.gz 274435
diff --git a/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild b/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild
new file mode 100644
index 000000000000..5f5a14202339
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta7-r2.ebuild,v 1.1 2006/07/22 21:22:35 nelchael Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_P=${P/_beta/-beta-}
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
+
+LICENSE="jaxen"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc source test"
+
+RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
+	~dev-java/jdom-1.0
+	=dev-java/dom4j-1*
+	>=dev-java/xerces-2.6
+	dev-java/xom"
+
+DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* )
+	dev-java/ant-core
+	test? ( dev-java/ant-tasks )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	mkdir -p ${S}/target/lib
+	cd ${S}/target/lib
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from dom4j-1
+	java-pkg_jar-from jdom-1.0
+	java-pkg_jar-from xom
+
+	cd ${S}
+	# Make tests non-compuslatory
+	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
+}
+
+src_compile() {
+	eant jar -Dnoget=1 $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_P}-SNAPSHOT.jar ${PN}.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/main/*
+}
+
+src_test() {
+	if ! use test; then
+		ewarn "You must be using the 'test' USE flag in order to"
+		ewarn "get the dependencies to run tests."
+		ewarn "Skipping tests..."
+	else
+		eant test -Dnoget=true
+	fi
+}
diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 2bd38deea5cd..afa479cfd171 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.29 2006/07/18 01:28:00 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.30 2006/07/22 21:16:12 nelchael Exp $
+
+*jdbc-mysql-3.1.13-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -jdbc-mysql-3.1.13.ebuild, +jdbc-mysql-3.1.13-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
 *jdbc-mysql-3.1.13 (18 Jul 2006)
 
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r1 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r1
new file mode 100644
index 000000000000..9e1b9a4ef5e5
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r1
@@ -0,0 +1,3 @@
+MD5 b2fc8cc8990d85629b183f284a8f46d8 mysql-connector-java-3.1.13.tar.gz 10454933
+RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 mysql-connector-java-3.1.13.tar.gz 10454933
+SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f mysql-connector-java-3.1.13.tar.gz 10454933
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r1.ebuild
new file mode 100644
index 000000000000..9d848c5db5fa
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r1.ebuild,v 1.1 2006/07/22 21:16:12 nelchael Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="mysql-connector-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL JDBC driver"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
+SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="c3p0"
+COMMON_DEP="
+	dev-java/log4j
+	c3p0? ( dev-java/c3p0 )
+	dev-java/jdbc2-stdext"
+RDEPEND=">=virtual/jre-1.2
+	${COMMON_DEP}"
+# FIXME doesn't like Java 1.6's JDBC API
+DEPEND="|| (
+		=virtual/jdk-1.3*
+		=virtual/jdk-1.4*
+		=virtual/jdk-1.5*
+	)
+	${COMMON_DEP}
+	sys-apps/sed
+	dev-java/ant-core
+	dev-java/junit"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f *.jar
+
+	sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed"
+
+	mkdir src/lib-nodist # needed, or ant will fail
+	cd src/lib
+	rm -f *.jar
+	java-pkg_jar-from jdbc2-stdext
+	use c3p0 && java-pkg_jar-from c3p0
+}
+
+src_compile() {
+	eant dist
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
+	dodoc README CHANGES
+}
diff --git a/dev-java/saxon/ChangeLog b/dev-java/saxon/ChangeLog
index e68faf3942c1..4b8672ce9bd4 100644
--- a/dev-java/saxon/ChangeLog
+++ b/dev-java/saxon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/saxon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.16 2006/07/02 19:37:47 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.17 2006/07/22 21:34:41 nelchael Exp $
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> saxon-6.5.2-r1.ebuild,
+  saxon-8.4b-r1.ebuild:
+  ant_src_unpack -> src_unpack
 
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +saxon-6.5.2-r1.ebuild,
   +saxon-8.4b-r1.ebuild:
diff --git a/dev-java/saxon/saxon-6.5.2-r1.ebuild b/dev-java/saxon/saxon-6.5.2-r1.ebuild
index 71b3cc6e65ac..b14ec9cc1ba5 100644
--- a/dev-java/saxon/saxon-6.5.2-r1.ebuild
+++ b/dev-java/saxon/saxon-6.5.2-r1.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/saxon/saxon-6.5.2-r1.ebuild,v 1.1 2006/07/02 19:37:47 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/saxon-6.5.2-r1.ebuild,v 1.2 2006/07/22 21:34:41 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -30,7 +30,7 @@ DEPEND="=virtual/jdk-1.4*
 
 S="${WORKDIR}"
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 
 	unzip -qq source.zip -d src || die "failed to unpack"
diff --git a/dev-java/saxon/saxon-8.4b-r1.ebuild b/dev-java/saxon/saxon-8.4b-r1.ebuild
index 737f580edef4..5290379fb87b 100644
--- a/dev-java/saxon/saxon-8.4b-r1.ebuild
+++ b/dev-java/saxon/saxon-8.4b-r1.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/saxon/saxon-8.4b-r1.ebuild,v 1.1 2006/07/02 19:37:47 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/saxon-8.4b-r1.ebuild,v 1.2 2006/07/22 21:34:41 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -28,7 +28,7 @@ DEPEND="=virtual/jdk-1.4*
 
 S=${WORKDIR}
 
-ant_src_unpack() {
+src_unpack() {
 	unpack ${A}
 
 	unzip -q source.zip || die "failed to unpack"