From: Patrice Clement <monsieurp@gentoo.org>
Date: Mon, 10 Aug 2015 19:08:46 +0000 (+0000)
Subject: dev-java/ant-ivy: Update dev-java/bcprov dependency to match with new SLOT
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c44303a8bd07d4a8d76b38733e6bafc840f6a795;p=gentoo.git

dev-java/ant-ivy: Update dev-java/bcprov dependency to match with new SLOT
number. Fixes bug 557166.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---

diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..11c6fbd728a9
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://ant.apache.org/ivy"
+SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~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"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="
+	dev-java/jsch:0
+	dev-java/bcpg:0
+	dev-java/bcpkix:0
+	dev-java/bcprov:1.50
+	dev-java/ant-core:0
+	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
+	bcpg
+	bcpkix
+	ant-core
+	commons-vfs
+	bcprov-1.50
+	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/*
+}