gentoo resync : 14.07.2018

5 files changed, 219 insertions, 0 deletions

diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
new file mode 100644
index 000000000000..d095587b2e80
--- /dev/null
+++ b/dev-java/ant-ivy/Manifest
@@ -0,0 +1,6 @@
+AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
+DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
+DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
+EBUILD ant-ivy-1.4.1-r1.ebuild 1759 BLAKE2B 30c437cccd0d86ca2a8b162569602ab2571ff570e6e373dd17f47d60df5c06c6ae8726caf67290d2a0d2b250de63f9638f17aa84cbf8ff9f479d66b161c503ca SHA512 21028c7fe5712daf3680fec1137261b9bde21fb46f0633abbbd98fab4e41d2cdd63d5364d6de4275f667f778a9c8b2ebfeed56b8ffc0d4b25cb8ae039f802a20
+EBUILD ant-ivy-2.3.0-r2.ebuild 2216 BLAKE2B dcc9f39656185a5a0e56c30bc75231e12a8fca7f50ca1b6687795855c774c8ce39177fd0128887f2c9b87d028e3321cd6577aba5036fb8576330ba370639fcbe SHA512 7c7f55b44592a7cf60e82202d4d882867758936304a93a11c3677c39c486b1c28a2df4891a87c7e8d408ebf4ad70926959e05a5d4a9ac6ac03ca7de6f40d3b87
+MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..11291a26fda5
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+# Registers as split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Rewrites examples otherwise... bad.
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="${PN##*-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/commons-cli:1
+	dev-java/commons-httpclient:3
+	dev-java/commons-vfs:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jsch:0"
+
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	epatch "${FILESDIR}/1.4.1-javadoc.patch"
+
+	# init-ivy expects existing ivy.jar, but we don't need actually it
+	sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
+		|| die
+
+	rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die
+	java-ant_rewrite-classpath
+	mkdir lib
+}
+
+EANT_GENTOO_CLASSPATH="
+	ant-core,commons-cli-1,commons-httpclient-3
+	commons-vfs,jakarta-oro-2.0,jsch"
+
+EANT_BUILD_TARGET="offline jar"
+
+src_test() {
+	# TODO: find out why a couple of these fail
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant offline test
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/${MY_PN}.jar
+
+	use doc && java-pkg_dojavadoc doc/ivy/api
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/*
+
+	java-pkg_register-ant-task
+}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..23bf9f5f7c28
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+# Register this as a split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Don't rewrite examples, that's bad.
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="apache-ivy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
+RESTRICT="test"
+
+# SLOT to use for all bc dependencies.
+BC_SLOT="1.50"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="dev-java/jsch:0
+	dev-java/bcpg:${BC_SLOT}
+	dev-java/ant-core:0
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/commons-vfs:0
+	dev-java/jakarta-oro:2.0
+	dev-java/commons-httpclient:3"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# This stuff needs removing.
+	local CLEANUP=(
+		doc/reports
+		test/triggers
+		doc/configuration
+		test/repositories
+		test/java/org/apache/ivy/core/settings/custom-resolver.jar
+		src/example/chained-resolvers/settings/repository/test-1.0.jar
+	)
+
+	rm -rf "${CLEANUP[@]}" || die
+
+	java-ant_rewrite-classpath
+	mkdir lib || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	jsch
+	bcpkix-${BC_SLOT}
+	ant-core
+	bcpg-${BC_SLOT}
+	commons-vfs
+	bcprov-${BC_SLOT}
+	jakarta-oro-2.0
+	commons-httpclient-3
+"
+
+EANT_BUILD_TARGET="/offline jar"
+
+EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant "/offline test"
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/jars/ivy.jar
+	java-pkg_register-ant-task
+
+	if use doc; then
+		java-pkg_dojavadoc build/doc/reports/api
+		java-pkg_dohtml -r doc
+	fi
+
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/ant-ivy/files/1.4.1-javadoc.patch b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
new file mode 100644
index 000000000000..4a0b47d8a714
--- /dev/null
+++ b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
@@ -0,0 +1,14 @@
+diff -ur ivy-1.4.1.old/build.xml ivy-1.4.1/build.xml
+--- ivy-1.4.1.old/build.xml	2007-09-04 02:44:23.000000000 +0300
++++ ivy-1.4.1/build.xml	2007-09-04 02:44:53.000000000 +0300
+@@ -245,9 +245,7 @@
+ 	</target>

+ 	

+ 	<target name="javadoc">

+-		<javadoc destdir="${javadoc.build.dir}">

+-			<fileset dir="${src.dir}"/>

+-		</javadoc>

++		<javadoc destdir="${javadoc.build.dir}" sourcepath="${src.dir}" />

+ 	</target>

+ 

+ 	<target name="get-dxml" description="download dxml doc file from web site">

diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
new file mode 100644
index 000000000000..231bfe529dc0
--- /dev/null
+++ b/dev-java/ant-ivy/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<longdescription>
+		Ivy is a powerful dependencies manager with transitive dependencies
+		support and much more features.
+
+		With Ivy you define the dependencies of your module in an xml file,
+		called an ivy file. Then you usually ask ivy to retrieve your dependencies
+		to a local lib dir, and it does it for you by locating the artifacts of
+		your dependencies in repositories, such as ibiblio.
+	</longdescription>
+</pkgmetadata>