Version bump, bug #305929.

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

54 files changed, 531 insertions, 37 deletions

diff --git a/dev-java/ant-apache-bsf/ChangeLog b/dev-java/ant-apache-bsf/ChangeLog
index 51dec7e8f9e1..d3ccdea55c15 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.26 2010/01/03 20:17:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.27 2010/02/21 00:21:08 caster Exp $
+
+*ant-apache-bsf-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-bsf-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-apache-bsf-1.7.1-r1.ebuild:
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.1-r1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.1-r1.ebuild
index 90905a300733..e8df467f3f7f 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.1-r1.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1-r1.ebuild,v 1.6 2010/01/03 20:17:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.1-r1.ebuild,v 1.7 2010/02/21 00:21:08 caster Exp $
 
 EAPI=2
 
@@ -9,6 +9,7 @@ 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
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.0.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.0.ebuild
new file mode 100644
index 000000000000..df9c97ca5de3
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:21:08 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 4d116c7ea432..bc8a0cddca48 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.16 2010/01/03 20:19:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.17 2010/02/21 00:21:25 caster Exp $
+
+*ant-apache-log4j-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-log4j-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-apache-log4j-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild
index d9fdafcfd3cc..781e86505272 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.6 2010/01/03 20:19:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.1.ebuild,v 1.7 2010/02/21 00:21:25 caster Exp $
 
 EAPI=1
 
@@ -9,6 +9,7 @@ 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-log4j/ant-apache-log4j-1.8.0.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.0.ebuild
new file mode 100644
index 000000000000..c37ff960802f
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:21:25 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 6c5f785ad4a2..44f001e57b4c 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.16 2010/01/03 20:20:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.17 2010/02/21 00:21:41 caster Exp $
+
+*ant-apache-oro-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-oro-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-apache-oro-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.7.1.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.7.1.ebuild
index d8031f1e20c0..dfa549492511 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.7.1.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.6 2010/01/03 20:20:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.7.1.ebuild,v 1.7 2010/02/21 00:21:41 caster Exp $
 
 EAPI=1
 
@@ -9,6 +9,7 @@ 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-oro/ant-apache-oro-1.8.0.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.8.0.ebuild
new file mode 100644
index 000000000000..63a2677680ce
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:21:41 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 7f5d766df161..79835edc296d 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.16 2010/01/03 20:22:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.17 2010/02/21 00:21:57 caster Exp $
+
+*ant-apache-regexp-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-regexp-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-apache-regexp-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild
index 79e7fbdf5d4a..36c85207e557 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.6 2010/01/03 20:22:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.1.ebuild,v 1.7 2010/02/21 00:21:57 caster Exp $
 
 EAPI=1
 
@@ -9,6 +9,7 @@ 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-regexp/ant-apache-regexp-1.8.0.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.0.ebuild
new file mode 100644
index 000000000000..37c8014c2134
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:21:57 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 26e09b684bc0..bcaab4eb7bd9 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.16 2010/01/03 20:23:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.17 2010/02/21 00:22:14 caster Exp $
+
+*ant-apache-resolver-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-apache-resolver-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-apache-resolver-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.1.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.1.ebuild
index 67e442b24c54..9434f0e55311 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.1.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.6 2010/01/03 20:23:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.1.ebuild,v 1.7 2010/02/21 00:22:14 caster Exp $
 
 EAPI=1
 
@@ -9,6 +9,7 @@ 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-resolver/ant-apache-resolver-1.8.0.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.0.ebuild
new file mode 100644
index 000000000000..57f94b5d53f2
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:22:14 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-commons-logging/ChangeLog b/dev-java/ant-commons-logging/ChangeLog
index eae6b1d1d9d8..3ec1e46fe23e 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.16 2010/01/03 20:25:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.17 2010/02/21 00:22:36 caster Exp $
+
+*ant-commons-logging-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-commons-logging-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-commons-logging-1.7.1.ebuild:
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild
index 4a3290567b8b..a955819d9b8f 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild
@@ -1,12 +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.7.1.ebuild,v 1.6 2010/01/03 20:25:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.7.1.ebuild,v 1.7 2010/02/21 00:22:36 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-logging/ant-commons-logging-1.8.0.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.0.ebuild
new file mode 100644
index 000000000000..3e1ebc65ca7b
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:22:36 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 c2bcadd6b317..87ac75891c18 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.16 2010/01/03 20:29:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.17 2010/02/21 00:22:52 caster Exp $
+
+*ant-commons-net-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-commons-net-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-commons-net-1.7.1.ebuild:
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.7.1.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.7.1.ebuild
index c14c39a3e20c..d79a2e1018de 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.7.1.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.7.1.ebuild
@@ -1,12 +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.7.1.ebuild,v 1.6 2010/01/03 20:29:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.7.1.ebuild,v 1.7 2010/02/21 00:22:52 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-commons-net/ant-commons-net-1.8.0.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.8.0.ebuild
new file mode 100644
index 000000000000..0ffbbd6858bb
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:22:52 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-jai/ChangeLog b/dev-java/ant-jai/ChangeLog
index 59bb9c232814..a1f075c1f764 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.15 2009/05/15 22:23:03 caster Exp $
+# 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 $
+
+*ant-jai-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-jai-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-jai-1.7.0.ebuild:
   Removing ant 1.7.0, bug #261563.
diff --git a/dev-java/ant-jai/ant-jai-1.7.1.ebuild b/dev-java/ant-jai/ant-jai-1.7.1.ebuild
index fccc7827d519..88d178cd7464 100644
--- a/dev-java/ant-jai/ant-jai-1.7.1.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.7.1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2009 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.7.1.ebuild,v 1.5 2009/01/07 19:28:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.7.1.ebuild,v 1.6 2010/02/21 00:23:08 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"
diff --git a/dev-java/ant-jai/ant-jai-1.8.0.ebuild b/dev-java/ant-jai/ant-jai-1.8.0.ebuild
new file mode 100644
index 000000000000..20e91c33b11e
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:23:08 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 bab2ae297f4f..5180dd2eb671 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.19 2010/01/03 20:31:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.20 2010/02/21 00:23:23 caster Exp $
+
+*ant-javamail-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-javamail-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-javamail-1.7.1.ebuild:
diff --git a/dev-java/ant-javamail/ant-javamail-1.7.1.ebuild b/dev-java/ant-javamail/ant-javamail-1.7.1.ebuild
index 1718ddea5ad0..e6f9ee62f1cc 100644
--- a/dev-java/ant-javamail/ant-javamail-1.7.1.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.7 2010/01/03 20:31:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.7.1.ebuild,v 1.8 2010/02/21 00:23:23 caster Exp $
 
 EAPI=1
 
@@ -9,6 +9,7 @@ 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"
diff --git a/dev-java/ant-javamail/ant-javamail-1.8.0.ebuild b/dev-java/ant-javamail/ant-javamail-1.8.0.ebuild
new file mode 100644
index 000000000000..f746e0127cde
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:23:23 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 8feae71b5a28..f1b03f35ceda 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.16 2010/01/03 20:33:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.17 2010/02/21 00:23:40 caster Exp $
+
+*ant-jdepend-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +ant-jdepend-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-jdepend-1.7.1.ebuild:
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.7.1.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.7.1.ebuild
index 79606156b57f..fad3c3f38388 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.7.1.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.7.1.ebuild
@@ -1,12 +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.7.1.ebuild,v 1.6 2010/01/03 20:33:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.7.1.ebuild,v 1.7 2010/02/21 00:23:40 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-jdepend/ant-jdepend-1.8.0.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.8.0.ebuild
new file mode 100644
index 000000000000..840727aaae77
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:23:40 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 3281d60968e3..2a49f6eeceb6 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.18 2010/01/03 19:51:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.19 2010/02/21 00:23:56 caster Exp $
+
+*ant-jmf-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-jmf-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> ant-jmf-1.7.1.ebuild:
   Transfer Prefix keywords
diff --git a/dev-java/ant-jmf/ant-jmf-1.7.1.ebuild b/dev-java/ant-jmf/ant-jmf-1.7.1.ebuild
index 8ed0593a6d85..431e75209eb5 100644
--- a/dev-java/ant-jmf/ant-jmf-1.7.1.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.9 2010/01/03 19:51:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.7.1.ebuild,v 1.10 2010/02/21 00:23:56 caster Exp $
 
 EAPI="2"
 
@@ -12,3 +12,4 @@ 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-jmf/ant-jmf-1.8.0.ebuild b/dev-java/ant-jmf/ant-jmf-1.8.0.ebuild
new file mode 100644
index 000000000000..c4b9a81009b1
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:23:56 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 e09691289ba8..35028e7fba1b 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.20 2010/01/03 20:34:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.21 2010/02/21 00:24:12 caster Exp $
+
+*ant-jsch-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-jsch-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-jsch-1.7.1.ebuild:
diff --git a/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild b/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild
index cfcc657ca392..d76c9a1e0cab 100644
--- a/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild
@@ -1,12 +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.7.1.ebuild,v 1.6 2010/01/03 20:34:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.7.1.ebuild,v 1.7 2010/02/21 00:24:12 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-jsch/ant-jsch-1.8.0.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.0.ebuild
new file mode 100644
index 000000000000..0671808e12d2
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:24:12 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 3433947c2218..f0ee8ebaa670 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.16 2010/01/03 20:36:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.17 2010/02/21 00:24:28 caster Exp $
+
+*ant-junit-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-junit-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-junit-1.7.1.ebuild:
diff --git a/dev-java/ant-junit/ant-junit-1.7.1.ebuild b/dev-java/ant-junit/ant-junit-1.7.1.ebuild
index 8ba4f139b494..c41ffe8c0292 100644
--- a/dev-java/ant-junit/ant-junit-1.7.1.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.7.1.ebuild
@@ -1,12 +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-junit/ant-junit-1.7.1.ebuild,v 1.6 2010/01/03 20:36:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.7.1.ebuild,v 1.7 2010/02/21 00:24:28 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
diff --git a/dev-java/ant-junit/ant-junit-1.8.0.ebuild b/dev-java/ant-junit/ant-junit-1.8.0.ebuild
new file mode 100644
index 000000000000..cec5226840ef
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:24:28 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 c884ac895193..d8b4e5d76b06 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.9 2009/05/15 22:25:03 caster Exp $
+# 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 $
+
+*ant-junit4-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-junit4-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-junit4-1.7.0.ebuild:
   Removing ant 1.7.0, bug #261563.
diff --git a/dev-java/ant-junit4/ant-junit4-1.7.1.ebuild b/dev-java/ant-junit4/ant-junit4-1.7.1.ebuild
index f6283389268b..ee50352f759a 100644
--- a/dev-java/ant-junit4/ant-junit4-1.7.1.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.7.1.ebuild,v 1.5 2009/01/07 15:06:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.7.1.ebuild,v 1.6 2010/02/21 00:24:43 caster Exp $
 
 EAPI=1
 
@@ -13,6 +13,7 @@ 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
diff --git a/dev-java/ant-junit4/ant-junit4-1.8.0.ebuild b/dev-java/ant-junit4/ant-junit4-1.8.0.ebuild
new file mode 100644
index 000000000000..5a27d6e495eb
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:24:43 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 29e54851d6c3..efeb6dd4532b 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.18 2010/01/03 20:37:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.19 2010/02/21 00:24:59 caster Exp $
+
+*ant-nodeps-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-nodeps-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-nodeps-1.7.1.ebuild:
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.7.1.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.7.1.ebuild
index 3c9831748c61..494798ff49d8 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.7.1.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.7.1.ebuild
@@ -1,11 +1,12 @@
 # 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.7.1.ebuild,v 1.6 2010/01/03 20:37:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.7.1.ebuild,v 1.7 2010/02/21 00:24:59 caster Exp $
 
 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
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.0.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.0.ebuild
new file mode 100644
index 000000000000..e338914da490
--- /dev/null
+++ b/dev-java/ant-nodeps/ant-nodeps-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:24:59 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 04d2077158f0..7db00728e3de 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.18 2010/01/03 19:54:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.19 2010/02/21 00:25:15 caster Exp $
+
+*ant-swing-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-swing-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-swing-1.7.1.ebuild:
diff --git a/dev-java/ant-swing/ant-swing-1.7.1.ebuild b/dev-java/ant-swing/ant-swing-1.7.1.ebuild
index 8451e9ee2f7e..0cd99ef71088 100644
--- a/dev-java/ant-swing/ant-swing-1.7.1.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.8 2010/01/03 19:54:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.7.1.ebuild,v 1.9 2010/02/21 00:25:15 caster Exp $
 
 EAPI="2"
 # no extra deps
@@ -11,3 +11,4 @@ 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-swing/ant-swing-1.8.0.ebuild b/dev-java/ant-swing/ant-swing-1.8.0.ebuild
new file mode 100644
index 000000000000..7bb83dea374c
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:25:15 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-trax/ChangeLog b/dev-java/ant-trax/ChangeLog
index 84f4973eddfe..3d613c4ce5e8 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.16 2010/01/03 20:39:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.17 2010/02/21 00:25:37 caster Exp $
+
+*ant-trax-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-trax-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ant-trax-1.7.1.ebuild:
diff --git a/dev-java/ant-trax/ant-trax-1.7.1.ebuild b/dev-java/ant-trax/ant-trax-1.7.1.ebuild
index 96c5c32cdfe6..b623d887553a 100644
--- a/dev-java/ant-trax/ant-trax-1.7.1.ebuild
+++ b/dev-java/ant-trax/ant-trax-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.6 2010/01/03 20:39:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.7.1.ebuild,v 1.7 2010/02/21 00:25:37 caster Exp $
 
 EAPI=1
 
@@ -13,6 +13,7 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (xalan)"
 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="dev-java/xalan:0"
diff --git a/dev-java/ant-trax/ant-trax-1.8.0.ebuild b/dev-java/ant-trax/ant-trax-1.8.0.ebuild
new file mode 100644
index 000000000000..095a707ff28a
--- /dev/null
+++ b/dev-java/ant-trax/ant-trax-1.8.0.ebuild
@@ -0,0 +1,26 @@
+# 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.0.ebuild,v 1.1 2010/02/21 00:25:37 caster Exp $
+
+EAPI=1
+
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (xalan)"
+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-trax-${PV}"
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-optional-dependency ant-apache-xalan2
+}
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 7444b41dfa54..438c3a02824d 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.121 2010/01/15 20:15:18 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.122 2010/02/21 00:25:54 caster Exp $
+
+*ant-1.8.0 (20 Feb 2010)
+
+  20 Feb 2010; Vlastimil Babka <caster@gentoo.org> +ant-1.8.0.ebuild:
+  Version bump, bug #305929.
 
   15 Jan 2010; Jonathan Callen <abcd@gentoo.org> ant-1.7.1.ebuild:
   Add prefix keywords
diff --git a/dev-java/ant/ant-1.8.0.ebuild b/dev-java/ant/ant-1.8.0.ebuild
new file mode 100644
index 000000000000..3b986a4f8f68
--- /dev/null
+++ b/dev-java/ant/ant-1.8.0.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.0.ebuild,v 1.1 2010/02/21 00:25:54 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."
+}
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index b8c153a55416..6cfffe619d55 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -16,5 +16,6 @@
     <flag name="oro">Enable Apache Oro Ant tasks</flag>
     <flag name="regexp">Enable Apache Regexp Ant tasks</flag>
     <flag name="resolver">Enable Apache Resolver Ant tasks</flag>
+    <flag name="testutil">Enable optional test util classes</flag>
   </use>
 </pkgmetadata>