Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

46 files changed, 736 insertions, 23 deletions

diff --git a/dev-java/ant-antlr/ChangeLog b/dev-java/ant-antlr/ChangeLog
index 55c182c52d53..186094e97595 100644
--- a/dev-java/ant-antlr/ChangeLog
+++ b/dev-java/ant-antlr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-antlr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.28 2010/02/20 23:42:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.29 2010/05/15 20:59:09 caster Exp $
+
+*ant-antlr-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-antlr-1.8.1.ebuild:
+  Version bump.
 
 *ant-antlr-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-antlr/ant-antlr-1.8.1.ebuild b/dev-java/ant-antlr/ant-antlr-1.8.1.ebuild
new file mode 100644
index 000000000000..8d1723fc3469
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.8.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.8.1.ebuild,v 1.1 2010/05/15 20:59:09 caster Exp $
+
+EAPI="2"
+
+# just a runtime dependency
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Antlr"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-dependency antlr
+}
diff --git a/dev-java/ant-apache-bcel/ChangeLog b/dev-java/ant-apache-bcel/ChangeLog
index 00a1c3a63427..0450674ddb2c 100644
--- a/dev-java/ant-apache-bcel/ChangeLog
+++ b/dev-java/ant-apache-bcel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-bcel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.17 2010/02/21 00:09:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.18 2010/05/15 20:59:29 caster Exp $
+
+*ant-apache-bcel-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-bcel-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-bcel-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild
new file mode 100644
index 000000000000..8c798a424857
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.1.ebuild,v 1.1 2010/05/15 20:59:29 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="bcel"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="~dev-java/ant-nodeps-${PV}
+	>=dev-java/bcel-5.1-r3:0"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from ant-nodeps
+}
diff --git a/dev-java/ant-apache-bsf/ChangeLog b/dev-java/ant-apache-bsf/ChangeLog
index d3ccdea55c15..3a3eb2ba30c8 100644
--- a/dev-java/ant-apache-bsf/ChangeLog
+++ b/dev-java/ant-apache-bsf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-bsf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.27 2010/02/21 00:21:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.28 2010/05/15 20:59:48 caster Exp $
+
+*ant-apache-bsf-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-bsf-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-bsf-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.1.ebuild
new file mode 100644
index 000000000000..6d26064b9329
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.1.ebuild,v 1.1 2010/05/15 20:59:48 caster Exp $
+
+EAPI=2
+
+ANT_TASK_DEPNAME="bsf-2.3"
+
+inherit eutils ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# ant-nodeps contains <script> task which is needed for this
+# although it's not a build dep through import
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+RDEPEND="${DEPEND}
+	~dev-java/ant-nodeps-${PV}"
+
+IUSE="python javascript tcl"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-dependency ant-nodeps
+}
+
+pkg_postinst() {
+	elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
+	elog "ruby and beanshell. See its postinst elog messages for instructions."
+}
diff --git a/dev-java/ant-apache-log4j/ChangeLog b/dev-java/ant-apache-log4j/ChangeLog
index bc8a0cddca48..4d35f046170d 100644
--- a/dev-java/ant-apache-log4j/ChangeLog
+++ b/dev-java/ant-apache-log4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-log4j
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.17 2010/02/21 00:21:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.18 2010/05/15 21:00:09 caster Exp $
+
+*ant-apache-log4j-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-log4j-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-log4j-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild
new file mode 100644
index 000000000000..9f28f45a795e
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.1.ebuild,v 1.1 2010/05/15 21:00:09 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="log4j"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/log4j-1.2.13-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ChangeLog b/dev-java/ant-apache-oro/ChangeLog
index 44f001e57b4c..596d11081d58 100644
--- a/dev-java/ant-apache-oro/ChangeLog
+++ b/dev-java/ant-apache-oro/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-oro
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.17 2010/02/21 00:21:41 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.18 2010/05/15 21:00:27 caster Exp $
+
+*ant-apache-oro-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-oro-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-oro-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.8.1.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.8.1.ebuild
new file mode 100644
index 000000000000..89d9284f12dd
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.8.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.8.1.ebuild,v 1.1 2010/05/15 21:00:27 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="jakarta-oro-2.0"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ChangeLog b/dev-java/ant-apache-regexp/ChangeLog
index 79835edc296d..edc2d58aada7 100644
--- a/dev-java/ant-apache-regexp/ChangeLog
+++ b/dev-java/ant-apache-regexp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-regexp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.17 2010/02/21 00:21:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.18 2010/05/15 21:00:48 caster Exp $
+
+*ant-apache-regexp-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-regexp-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-regexp-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.1.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.1.ebuild
new file mode 100644
index 000000000000..acbb1eb718b2
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.1.ebuild,v 1.1 2010/05/15 21:00:48 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="jakarta-regexp-1.4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ChangeLog b/dev-java/ant-apache-resolver/ChangeLog
index bcaab4eb7bd9..09c467b1c67a 100644
--- a/dev-java/ant-apache-resolver/ChangeLog
+++ b/dev-java/ant-apache-resolver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-resolver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.17 2010/02/21 00:22:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.18 2010/05/15 21:01:08 caster Exp $
+
+*ant-apache-resolver-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-resolver-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-resolver-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.1.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.1.ebuild
new file mode 100644
index 000000000000..b07c682688be
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.1.ebuild,v 1.1 2010/05/15 21:01:08 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="xml-commons-resolver"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/ChangeLog b/dev-java/ant-apache-xalan2/ChangeLog
index 3adb54f313b5..2e71d63e60c2 100644
--- a/dev-java/ant-apache-xalan2/ChangeLog
+++ b/dev-java/ant-apache-xalan2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-apache-xalan2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.1 2010/02/20 23:36:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.2 2010/05/15 21:01:27 caster Exp $
+
+*ant-apache-xalan2-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-xalan2-1.8.1.ebuild:
+  Version bump.
 
 *ant-apache-xalan2-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild
new file mode 100644
index 000000000000..41f5db803d7c
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.1.ebuild,v 1.1 2010/05/15 21:01:27 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="xalan"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-java/xalan
+	~dev-java/ant-trax-${PV}"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from ant-trax
+}
diff --git a/dev-java/ant-commons-logging/ChangeLog b/dev-java/ant-commons-logging/ChangeLog
index 3ec1e46fe23e..a82005c29c2c 100644
--- a/dev-java/ant-commons-logging/ChangeLog
+++ b/dev-java/ant-commons-logging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-commons-logging
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.17 2010/02/21 00:22:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.18 2010/05/15 21:01:46 caster Exp $
+
+*ant-commons-logging-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-commons-logging-1.8.1.ebuild:
+  Version bump.
 
 *ant-commons-logging-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild
new file mode 100644
index 000000000000..4a957e046768
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.8.1.ebuild,v 1.1 2010/05/15 21:01:46 caster Exp $
+
+EAPI=1
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ChangeLog b/dev-java/ant-commons-net/ChangeLog
index 87ac75891c18..efa3d4b9f515 100644
--- a/dev-java/ant-commons-net/ChangeLog
+++ b/dev-java/ant-commons-net/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-commons-net
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.17 2010/02/21 00:22:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.18 2010/05/15 21:02:05 caster Exp $
+
+*ant-commons-net-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-commons-net-1.8.1.ebuild:
+  Version bump.
 
 *ant-commons-net-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.8.1.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.8.1.ebuild
new file mode 100644
index 000000000000..85cb67e1acc2
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.8.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.8.1.ebuild,v 1.1 2010/05/15 21:02:05 caster Exp $
+
+EAPI=1
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 556b36cba7ed..a30404aae335 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.103 2010/03/19 09:16:22 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.104 2010/05/15 20:56:23 caster 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.
 
+*ant-core-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-core-1.8.1.ebuild:
+  Version bump.
+
 *ant-core-1.8.0-r2 (19 Mar 2010)
 
   19 Mar 2010; Vlastimil Babka <caster@gentoo.org> -ant-core-1.8.0.ebuild,
diff --git a/dev-java/ant-core/ant-core-1.8.1.ebuild b/dev-java/ant-core/ant-core-1.8.1.ebuild
new file mode 100644
index 000000000000..39286dd9128a
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.8.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 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.8.1.ebuild,v 1.1 2010/05/15 20:56:23 caster Exp $
+
+EAPI="3"
+
+# don't depend on itself
+JAVA_ANT_DISABLE_ANT_CORE_DEP=true
+# rewriting build.xml files for the testcases has no reason atm
+JAVA_PKG_BSFIX_ALL=no
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
+	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	!dev-java/ant-tasks
+	!dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
+	eprefixify "${WORKDIR}/ant"
+
+	# use our split-ant build.xml
+	mv -f "${WORKDIR}/build.xml" . || die
+
+	# bug #196080
+	java-ant_bsfix_one build.xml
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	export ANT_HOME=""
+
+	local bsyscp
+
+	# this ensures that when building ant with bootstrapped ant,
+	# only the source is used for resolving references, and not
+	# the classes in bootstrapped ant
+	# but jikes in kaffe has issues with this...
+	if ! java-pkg_current-vm-matches kaffe; then
+		bsyscp="-Dbuild.sysclasspath=ignore"
+	fi
+
+	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars-core internal_dist \
+		$(use_doc javadocs) || die "build failed"
+}
+
+src_install() {
+	dodir /usr/share/ant/lib
+	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+		java-pkg_dojar build/lib/${jar}
+		dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+	done
+
+	dobin "${WORKDIR}/ant" || die "failed to install wrapper"
+	dodir /usr/share/${PN}/bin
+	for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin "${S}/src/script/${each}"
+		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
+	done
+	dosym /usr/share/${PN}/bin /usr/share/ant/bin
+
+	insinto /usr/share/${PN}
+	doins -r dist/etc
+	dosym /usr/share/${PN}/etc /usr/share/ant/etc
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant" || die "failed to install env.d file"
+
+	dodoc NOTICE README WHATSNEW KEYS || die
+
+	if use doc; then
+		dohtml -r docs/*
+		java-pkg_dojavadoc --symlink manual/api build/javadocs
+	fi
+
+	use source && java-pkg_dosrc src/main/*
+}
+
+pkg_postinst() {
+	elog "The way of packaging ant in Gentoo has changed significantly since"
+	elog "the 1.7.0 version, For more information, please see:"
+	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
+	elog
+	elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+	elog "flags have been moved to dev-java/ant."
+}
diff --git a/dev-java/ant-jai/ChangeLog b/dev-java/ant-jai/ChangeLog
index a1f075c1f764..1086c6306a3b 100644
--- a/dev-java/ant-jai/ChangeLog
+++ b/dev-java/ant-jai/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-jai
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.16 2010/02/21 00:23:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.17 2010/05/15 21:02:24 caster Exp $
+
+*ant-jai-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-jai-1.8.1.ebuild:
+  Version bump.
 
 *ant-jai-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-jai/ant-jai-1.8.1.ebuild b/dev-java/ant-jai/ant-jai-1.8.1.ebuild
new file mode 100644
index 000000000000..753e2a7f530f
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.8.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.8.1.ebuild,v 1.1 2010/05/15 21:02:24 caster Exp $
+
+ANT_TASK_DEPNAME="sun-jai-bin"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+# unmigrated, has textrels and there's also some source one now too
+DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/ChangeLog b/dev-java/ant-javamail/ChangeLog
index 5180dd2eb671..3c1a5ccae343 100644
--- a/dev-java/ant-javamail/ChangeLog
+++ b/dev-java/ant-javamail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-javamail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.20 2010/02/21 00:23:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.21 2010/05/15 21:02:43 caster Exp $
+
+*ant-javamail-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-javamail-1.8.1.ebuild:
+  Version bump.
 
 *ant-javamail-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-javamail/ant-javamail-1.8.1.ebuild b/dev-java/ant-javamail/ant-javamail-1.8.1.ebuild
new file mode 100644
index 000000000000..4a01901739aa
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.8.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.8.1.ebuild,v 1.1 2010/05/15 21:02:43 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME="--virtual javamail"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="java-virtuals/javamail
+	dev-java/sun-jaf"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from sun-jaf
+}
diff --git a/dev-java/ant-jdepend/ChangeLog b/dev-java/ant-jdepend/ChangeLog
index f1b03f35ceda..f5ae16594192 100644
--- a/dev-java/ant-jdepend/ChangeLog
+++ b/dev-java/ant-jdepend/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-jdepend
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.17 2010/02/21 00:23:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.18 2010/05/15 21:03:03 caster Exp $
+
+*ant-jdepend-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-jdepend-1.8.1.ebuild:
+  Version bump.
 
 *ant-jdepend-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.8.1.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.8.1.ebuild
new file mode 100644
index 000000000000..50622da33963
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.8.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.8.1.ebuild,v 1.1 2010/05/15 21:03:03 caster Exp $
+
+EAPI=1
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/jdepend-2.9-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/ChangeLog b/dev-java/ant-jmf/ChangeLog
index 2a49f6eeceb6..083af687d90f 100644
--- a/dev-java/ant-jmf/ChangeLog
+++ b/dev-java/ant-jmf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-jmf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.19 2010/02/21 00:23:56 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.20 2010/05/15 21:03:22 caster Exp $
+
+*ant-jmf-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-jmf-1.8.1.ebuild:
+  Version bump.
 
 *ant-jmf-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-jmf/ant-jmf-1.8.1.ebuild b/dev-java/ant-jmf/ant-jmf-1.8.1.ebuild
new file mode 100644
index 000000000000..2eb071f2310e
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.8.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.8.1.ebuild,v 1.1 2010/05/15 21:03:22 caster Exp $
+
+EAPI="2"
+
+# seems no need to dep on jmf-bin, the classes ant imports are in J2SE API since 1.3
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)."
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-java/ant-jsch/ChangeLog b/dev-java/ant-jsch/ChangeLog
index 35028e7fba1b..202e257e66a5 100644
--- a/dev-java/ant-jsch/ChangeLog
+++ b/dev-java/ant-jsch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-jsch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.21 2010/02/21 00:24:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.22 2010/05/15 21:03:42 caster Exp $
+
+*ant-jsch-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-jsch-1.8.1.ebuild:
+  Version bump.
 
 *ant-jsch-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild
new file mode 100644
index 000000000000..cae3e4d31a72
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.8.1.ebuild,v 1.1 2010/05/15 21:03:42 caster Exp $
+
+EAPI=1
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-java/jsch-0.1.37:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/ChangeLog b/dev-java/ant-junit/ChangeLog
index f0ee8ebaa670..beb25da73fb6 100644
--- a/dev-java/ant-junit/ChangeLog
+++ b/dev-java/ant-junit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-junit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.17 2010/02/21 00:24:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.18 2010/05/15 21:04:01 caster Exp $
+
+*ant-junit-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-junit-1.8.1.ebuild:
+  Version bump.
 
 *ant-junit-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-junit/ant-junit-1.8.1.ebuild b/dev-java/ant-junit/ant-junit-1.8.1.ebuild
new file mode 100644
index 000000000000..5828ab9bc3a6
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.8.1.ebuild,v 1.1 2010/05/15 21:04:01 caster Exp $
+
+EAPI=1
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# xalan is a runtime dependency of the XalanExecutor task
+# which was for some reason moved to ant-junit by upstream
+DEPEND="dev-java/junit:0"
+RDEPEND="${DEPEND}
+	dev-java/xalan:0"
+
+src_compile() {
+	eant jar-junit
+}
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-dependency xalan
+}
diff --git a/dev-java/ant-junit4/ChangeLog b/dev-java/ant-junit4/ChangeLog
index d8b4e5d76b06..c5a6a5822a71 100644
--- a/dev-java/ant-junit4/ChangeLog
+++ b/dev-java/ant-junit4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-junit4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.10 2010/02/21 00:24:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.11 2010/05/15 21:04:20 caster Exp $
+
+*ant-junit4-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-junit4-1.8.1.ebuild:
+  Version bump.
 
 *ant-junit4-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-junit4/ant-junit4-1.8.1.ebuild b/dev-java/ant-junit4/ant-junit4-1.8.1.ebuild
new file mode 100644
index 000000000000..a6bc1c604e32
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.8.1.ebuild,v 1.1 2010/05/15 21:04:20 caster Exp $
+
+EAPI=1
+
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+ANT_TASK_DEPNAME="junit-4"
+
+inherit ant-tasks
+
+DESCRIPTION="A copy of ant-junit package which uses junit-4 to run <junit> tasks."
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# xalan is a runtime dependency of the XalanExecutor task
+# which was for some reason moved to ant-junit by upstream
+DEPEND="dev-java/junit:4"
+RDEPEND="${DEPEND}
+	dev-java/xalan:0"
+
+src_compile() {
+	eant jar-junit
+}
+
+src_install() {
+	# no registration as ant-task, would be loaded together with ant-junit
+	java-pkg_newjar build/lib/ant-junit.jar
+	java-pkg_register-dependency xalan
+}
diff --git a/dev-java/ant-nodeps/ChangeLog b/dev-java/ant-nodeps/ChangeLog
index efeb6dd4532b..cc90b0da3d78 100644
--- a/dev-java/ant-nodeps/ChangeLog
+++ b/dev-java/ant-nodeps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-nodeps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.19 2010/02/21 00:24:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.20 2010/05/15 21:04:40 caster Exp $
+
+*ant-nodeps-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-nodeps-1.8.1.ebuild:
+  Version bump.
 
 *ant-nodeps-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.1.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.1.ebuild
new file mode 100644
index 000000000000..0061037644ce
--- /dev/null
+++ b/dev-java/ant-nodeps/ant-nodeps-1.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.1.ebuild,v 1.1 2010/05/15 21:04:40 caster Exp $
+
+# contains the tasks depending on 1.5 java
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+
+# cannot hurt...
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks requiring no external deps"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+src_unpack() {
+	ant-tasks_src_unpack base
+	java-pkg_jar-from --build-only ant-core ant-launcher.jar
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant jar-nodeps
+}
diff --git a/dev-java/ant-swing/ChangeLog b/dev-java/ant-swing/ChangeLog
index 7db00728e3de..c644474fd3d2 100644
--- a/dev-java/ant-swing/ChangeLog
+++ b/dev-java/ant-swing/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-swing
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.19 2010/02/21 00:25:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.20 2010/05/15 21:05:00 caster Exp $
+
+*ant-swing-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-swing-1.8.1.ebuild:
+  Version bump.
 
 *ant-swing-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-swing/ant-swing-1.8.1.ebuild b/dev-java/ant-swing/ant-swing-1.8.1.ebuild
new file mode 100644
index 000000000000..d0b330713559
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.8.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.8.1.ebuild,v 1.1 2010/05/15 21:05:00 caster Exp $
+
+EAPI="2"
+# no extra deps
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Swing."
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-java/ant-testutil/ChangeLog b/dev-java/ant-testutil/ChangeLog
index 549cc7a66bcc..0eddc562ebac 100644
--- a/dev-java/ant-testutil/ChangeLog
+++ b/dev-java/ant-testutil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-testutil
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.1 2010/02/20 23:38:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.2 2010/05/15 21:05:23 caster Exp $
+
+*ant-testutil-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-testutil-1.8.1.ebuild:
+  Version bump.
 
 *ant-testutil-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild b/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild
new file mode 100644
index 000000000000..aa14e56bdcff
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.1.ebuild,v 1.1 2010/05/15 21:05:23 caster Exp $
+
+EAPI="1"
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional test utility classes"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/junit:0
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-swing-${PV}
+	~dev-java/ant-trax-${PV}
+	~dev-java/ant-junit-${PV}"
+RDEPEND=""
+
+IUSE=""
+
+# the build system builds much more than it actually packages, so there are many
+# build-only deps, but since those are quite common, it wasn't worth to patch it
+
+src_unpack() {
+	ant-tasks_src_unpack base
+	java-pkg_jar-from --build-only junit,ant-nodeps,ant-junit,ant-swing,ant-trax
+	java-pkg_jar-from --build-only ant-core ant-launcher.jar
+}
+
+src_compile() {
+	eant test-jar
+}
diff --git a/dev-java/ant-trax/ChangeLog b/dev-java/ant-trax/ChangeLog
index 44d94de87e2b..9a531578d0e3 100644
--- a/dev-java/ant-trax/ChangeLog
+++ b/dev-java/ant-trax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-trax
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.18 2010/05/15 20:23:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.19 2010/05/15 21:05:42 caster Exp $
+
+*ant-trax-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-trax-1.8.1.ebuild:
+  Version bump.
 
   15 May 2010; Vlastimil Babka <caster@gentoo.org> ant-trax-1.8.0.ebuild:
   Fix dependency on ant-apache-xalan2.
diff --git a/dev-java/ant-trax/ant-trax-1.8.1.ebuild b/dev-java/ant-trax/ant-trax-1.8.1.ebuild
new file mode 100644
index 000000000000..eeb2df635a54
--- /dev/null
+++ b/dev-java/ant-trax/ant-trax-1.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.8.1.ebuild,v 1.1 2010/05/15 21:05:42 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+# it seems that xslt task will try to use Xalan2TraceSupport from ant-apache-xalan2
+# when xalan happens to be on ant's classpath, so it's safer to have ant-apache-xalan2 there
+# we need PDEPEND and register-optional-dependency to break circular dependency
+PDEPEND="~dev-java/ant-apache-xalan2-${PV}"
+
+src_compile() {
+	# the classes were moved to ant-core in 1.8.1, this is just for compatibility
+	mkdir -p build/lib/empty && cd build/lib/empty || die
+	jar -cf ../${PN}.jar .
+}
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-optional-dependency ant-apache-xalan2
+}
+
+src_postinst() {
+	elog "Upstream has removed ant-trax.jar as of 1.8.1 and moved the classes to ant.jar"
+	elog "This package thus installs an empty jar for compatibility"
+	elog "and will be removed once reverse dependencies are transitioned."
+}
\ No newline at end of file
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 438c3a02824d..56c79b62b600 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.122 2010/02/21 00:25:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.123 2010/05/15 21:06:01 caster Exp $
+
+*ant-1.8.1 (15 May 2010)
+
+  15 May 2010; Vlastimil Babka <caster@gentoo.org> +ant-1.8.1.ebuild:
+  Version bump.
 
 *ant-1.8.0 (20 Feb 2010)
 
diff --git a/dev-java/ant/ant-1.8.1.ebuild b/dev-java/ant/ant-1.8.1.ebuild
new file mode 100644
index 000000000000..4ad82c79ec00
--- /dev/null
+++ b/dev-java/ant/ant-1.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.8.1.ebuild,v 1.1 2010/05/15 21:06:01 caster Exp $
+
+EAPI="1"
+
+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="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="~dev-java/ant-core-${PV}
+	~dev-java/ant-tasks-${PV}"
+RDEPEND="${DEPEND}"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +log4j +oro +regexp +resolver testutil"
+
+RDEPEND="~dev-java/ant-core-${PV}
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-trax-${PV}
+	~dev-java/ant-apache-xalan2-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )"
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+pkg_postinst() {
+	elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+	elog "flags have been moved to dev-java/ant."
+	elog
+	elog "You may now freely set the USE flags of this package without breaking"
+	elog "building of Java packages, which depend on the exact ant tasks they need."
+	elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
+}