Version bump. Fixes bug #229031.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

3 files changed, 86 insertions, 6 deletions

diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index 0abbdc62a507..36241de769c4 100644
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-contrib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.29 2008/03/09 15:15:39 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.30 2008/07/07 21:52:02 betelgeuse Exp $
+
+*ant-contrib-1.0_beta3 (07 Jul 2008)
+
+  07 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +ant-contrib-1.0_beta3.ebuild:
+  Version bump. Fixes bug #229031.
 
   09 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
   +files/tests-visibility.patch, ant-contrib-1.0_beta2-r2.ebuild:
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 3a5d5206699f..6be1f7b3fa26 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX tests-visibility.patch 755 RMD160 c31d22baf8876ca945b983e9d538b176d462f070 SHA1 cd6a2e4a9059a96f776b78f487056a441582e2a8 SHA256 c08c7bfc90e90b594b1e58164b3f9f37a3a37171e88ffe9d2e974d7687fb1bb4
 DIST ant-contrib-1.0b2-src.tar.bz2 118216 RMD160 75a47ea59e6af1df723e48899b8e5cc124597573 SHA1 b93f62923922d9ec718239e4ecb3c1677c14a125 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269
+DIST ant-contrib-1.0b3-src.tar.bz2 3298187 RMD160 fdaa171ca4b7ca7b2ac9c6d35b17a2613f507989 SHA1 23694f563392959d8b152ef86e67747674491761 SHA256 5c180feaca2704d914054a1e6b453673cc9b65cfb3da307aff17439a9aa09d6b
 EBUILD ant-contrib-1.0_beta2-r2.ebuild 1667 RMD160 dbd11b256015e2af40c0c7ca96f7399f0b29b9a6 SHA1 2b2874561bd89adc9e81e2262ba5a70fe6c3d1a1 SHA256 e05b6fb5e3ceab5d3b49618d6f167b9908fde5a951808243f541aad224df9717
-MISC ChangeLog 4064 RMD160 afcaad47981f403cc6283317e3e909d2c0ba1b9c SHA1 5929662171b63e4fb5754cbb04acae0a8194203d SHA256 ea927a35293483ca12197ffb2c3636d4257d8b9ba439e6246b2524ea4e117cbf
+EBUILD ant-contrib-1.0_beta3.ebuild 1981 RMD160 1b8be157993a9a31ef889638bc909f085a90816d SHA1 753fe561cdc6c5a698fdfc1e060dd74d25a6c973 SHA256 f6e85dedbd88761d376d1fa91095ae85a54abd41f2081661bf77591921f6aecc
+MISC ChangeLog 4224 RMD160 126009941a140cbdaacbb1b6662a0fa6fc22eab0 SHA1 1514f3545739539a61e471ecbfddba79bbd84948 SHA256 2a2c234cf148da5b769cd10679107bf9033f283218e0645331955bc7916d465e
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH0/8mcxLzpIGCsLQRAmiyAJ9C6EjYuDndM0ugFGhtQlh2EzIjhQCaA1eu
-vBI1VgJyFy85AYCesoelwzs=
-=Ad7r
+iEYEARECAAYFAkhykBEACgkQcxLzpIGCsLTpGgCgmcJQ1/EgBvCvnwwU+8TiGhg/
+rRQAn1dpZv0PoXJExMgLyYJo7L4fOrY9
+=YJsP
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild
new file mode 100644
index 000000000000..66fa1ef1ed70
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild,v 1.1 2008/07/07 21:52:02 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-ivy"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant."
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
+	dev-java/ant-ivy:0
+	>=dev-java/ant-core-1.7.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+rewrite_build_xml() {
+	python <<EOF
+import xml.etree.cElementTree as et
+tree = et.ElementTree(file='build.xml')
+root = tree.getroot()
+root.append(et.Element('path',id='test.classpath'))
+root.append(et.Element('path',id='compile.classpath'))
+skip=['resolve','classpath']
+for target in tree.getiterator("target"):
+	if target.attrib['name'] in skip:
+		target.attrib['if'] = 'true'
+
+tree.write('build.xml')
+EOF
+	[[ $? != 0 ]] && die "Removing taskdefs failed"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/tests-visibility.patch"
+	find -name "*.jar" -print -delete || die
+	rewrite_build_xml
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="ant-core,bcel,commons-httpclient-3,xerces-2,ant-ivy"
+EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
+
+# Can't load bcel for some reason
+RESTRICT="test"
+# for tests
+EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	java-pkg_register-ant-task
+	use doc && java-pkg_dojavadoc target/docs/api
+	use source && java-pkg_dosrc src/java/net
+	java-pkg_dohtml -r docs/manual
+}