reinit the tree, so we can have metadata

5 files changed, 171 insertions, 0 deletions

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
new file mode 100644
index 000000000000..62cde46e6b8f
--- /dev/null
+++ b/dev-java/ant-contrib/Manifest
@@ -0,0 +1,8 @@
+AUX tests-visibility.patch 755 SHA256 c08c7bfc90e90b594b1e58164b3f9f37a3a37171e88ffe9d2e974d7687fb1bb4 SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d WHIRLPOOL 7113253213b7ece5e407e2028b9a3b4e7082d10ef8094c96d3310b060edb791b52f1f5cd78719bc8d26faf88c3ed11736fdb1146cbfd0a86e47811958486f2d9
+DIST ant-contrib-1.0b2-src.tar.bz2 118216 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8 WHIRLPOOL 3247772090ab6b1cab556c0b4442ad4ecc4a9f15b7ffb6117f8c8f95ac4267215a741f3ecb45ed335657f1e881a933b1f3cf607a34602834fe7bdb37b30ccf65
+DIST ant-contrib-1.0b3-src.tar.bz2 3298187 SHA256 5c180feaca2704d914054a1e6b453673cc9b65cfb3da307aff17439a9aa09d6b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8 WHIRLPOOL e87fe9d07a97a1a8ccf4f4d0984f02ab967c5b8f6a11d6171f235fa3b9fa243dc7243953d9b14e72cbfece91d41ac264babee0241429090b1868e948a855fd3e
+EBUILD ant-contrib-1.0_beta2-r2.ebuild 1457 SHA256 e53e7711d79471458eb18f0280e47eabef0680d54334184c6ea0c2d3e313052e SHA512 b01aa5faf840f0c9befffaa2dd5caf3c2bf73ebb9e2286fbf222352b9c72f15d2d7b1e6f8066fa36b2610e8a2e9ca541b22bcb2eb25abb77a0e5fed1b8ef8b84 WHIRLPOOL 576ab01e1ba67f003c3f589514550c71689631843aba21b43878a12a99d16f2d976eae7b98b70010e6a5893f35792f4282619470b5e221bd68f6ccd73fc74d3e
+EBUILD ant-contrib-1.0_beta3-r2.ebuild 1841 SHA256 359630e823675fc7dc917699e3c688fa5191a34c9238d2aab8efeaaaf34cfd50 SHA512 b1ba13d26296bf3751cbd14c800a3df64a12a54db3af2fa3eade7c0fd77a8ebffde18024ef80d2c252929187f2d15ac5d6b4309037157eea596def084971cde8 WHIRLPOOL 1c56f4d9f478702d15d6d0f2781a737569a0d40ba83f5ae9027af2eff7b48e12f57778f869a08437a6b97bb2522c4870b1d553882f21a54f42ded8da3c60069f
+MISC ChangeLog 2744 SHA256 b53846bc3999bfc20ccda129a3d6099f374185c4e0bd5f5a7a6a3f2957bf08ca SHA512 c25c45efac8305e5c56882acfcb3d9031c01f5cbc55ebd47c161f7b55f156d9b8755eb7a8db9e024a0944ee2533fea9f542050887870752cd412ad20297ef549 WHIRLPOOL 19dffc295ca55085c560f6efb0a0ecbbda1899df822d72e820a4297ff881cb6b1f989d7500149e8ebcdf494cf72d6fc0e2cb0f7110b4968b011c5247e5673095
+MISC ChangeLog-2015 5494 SHA256 186f3b7952df38e8c4b825bba5577d4f1b198568f3697f2b89b16e4f8fd46a2f SHA512 b9b581c7315522c1d4692d0365c8e634740819255fc0429bf12cbb58d9ba35b4cf690fc694a0b5cbbabe62a53e2447d06181fc6ac9531c6a01a8a1e202448579 WHIRLPOOL 4689adf03c1d662fab62c78fee9848f5febabdebf6de77d97f701342189fd22f6e9d6748fde3e599333201ba2a8e2d1cbb1fab0d81c0d7fb4fa0842d43ad9cf0
+MISC metadata.xml 317 SHA256 daf2316137c1bd32defadb3b7067607cf3ea34b0d0905a1c43221fe80f437498 SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8 WHIRLPOOL 94235522f301fa39825186b8671d2be481aa8de6b0e75b6f21e0dbb56bb26bc5da1ff8bea1e22335e4d9d3ec6a28ed0553897ae8c0918dc34626b32616b50461
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..347d5d2bab3f
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks 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="amd64 ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1
+	>=dev-java/xerces-2.7
+	>=dev-java/ant-core-1.7.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/tests-visibility.patch"
+	cd "${S}/lib"
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
+	java-pkg_jar-from xerces-2
+}
+
+EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
+EANT_DOC_TARGET="docs"
+
+# The tests fail to find bcel and fail
+RESTRICT="test"
+
+src_test() {
+	cd test/lib || die
+	java-pkg_jar-from junit junit.jar junit-3.8.1.jar
+	java-pkg_jar-from ant-testutil
+	cd "${S}"
+	local testutil=$(java-pkg_getjars ant-testutil)
+	EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/net
+	java-pkg_dohtml -r manual
+}
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
new file mode 100644
index 000000000000..973516ec43cb
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-ivy"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks 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="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+CP_DEPEND="
+	>=dev-java/ant-core-1.7.0:0
+	dev-java/ant-ivy:0
+	>=dev-java/bcel-5.1:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.4"
+
+# javatoolkit for cElementTree
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.4
+	>=dev-java/javatoolkit-0.3.0-r2"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/tests-visibility.patch )
+
+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'] = 'false'
+
+tree.write('build.xml')
+EOF
+	[[ $? != 0 ]] && die "Removing taskdefs failed"
+}
+
+src_prepare() {
+	default
+	rewrite_build_xml
+	java-pkg_clean
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+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
+}
diff --git a/dev-java/ant-contrib/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch
new file mode 100644
index 000000000000..182a17f054e0
--- /dev/null
+++ b/dev-java/ant-contrib/files/tests-visibility.patch
@@ -0,0 +1,12 @@
+diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
+--- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java   2008-03-05 23:56:16.000000000 +0200
++++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java       2008-03-05 23:56:55.000000000 +0200
+@@ -76,7 +76,7 @@
+     * @param filename            name of project file to run
+     * @exception BuildException  Description of the Exception
+     */
+-   protected void configureProject( String filename ) throws BuildException {
++   public void configureProject( String filename ) throws BuildException {
+       // find the build file
+       File f = new File( filename );
+       if ( !f.exists() ) {
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
new file mode 100644
index 000000000000..5c1224a74c63
--- /dev/null
+++ b/dev-java/ant-contrib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ant-contrib</remote-id>
+	</upstream>
+</pkgmetadata>