gentoo resync : 14.07.2018

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..7ed34e11fa2c
--- /dev/null
+++ b/dev-java/ant-contrib/Manifest
@@ -0,0 +1,6 @@
+AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
+DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
+DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
+EBUILD ant-contrib-1.0_beta2-r2.ebuild 1455 BLAKE2B e26b5bb6352d9958e95aa914ba564a7b5e671d4c46ee3042476f268000c244ea4132e2f5805ae6b5d6239838fbf89cda662b3097e51c67b54119e8c12181e12f SHA512 60de0610acc54616f3f4763b0d243c3b07c63827ca70e94c5f95bea2e797eb61e7a5b4f937f87a7176ffbb478804c19743d27ebca91378f7c45fd5c96e81518a
+EBUILD ant-contrib-1.0_beta3-r2.ebuild 1831 BLAKE2B 84992885fae9dfa5ce27b0992e6d9b98e29741f68797c59ced485afdff4e4b80f04d5cb6676a49ebec1669ccdbafa738b4f8443bf2bfd2d696b5f59e70e4d704 SHA512 373a13f4d4d027a6ecd58615a98b0b4a53f14db7a38a17a2c2aec88c28ebfe52150009a5ebbbb1fc9c50d98aa65cf794ed98f113e93cb02c4b1840524ca25b60
+MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
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..8b10e01db511
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+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"
+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..7d467945ad73
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 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 ~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>