gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/ant-ivy: Also update dev-java/bcpg dependency to match with new SLOT

Browse Source 
number. Fixes bug 557166.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Patrice Clement
2015-08-10 19:37:01 +00:00
parent 1e872fdf46
commit 059149a639
2 changed files with 6 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,18 +29,16 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
RESTRICT="test"
# There may be additional optional dependencies (commons-logging, commons-lang...)
CDEPEND="
dev-java/jsch:0
dev-java/bcpg:0
CDEPEND="dev-java/jsch:0
dev-java/bcpkix:0
dev-java/bcprov:1.50
dev-java/bcpg:1.50
dev-java/ant-core:0
dev-java/bcprov:1.50
dev-java/commons-vfs:0
dev-java/jakarta-oro:2.0
dev-java/commons-httpclient:3"
DEPEND="
>=virtual/jdk-1.6
DEPEND=">=virtual/jdk-1.6
test? (
dev-java/ant-junit:0
)
@@ -72,9 +70,9 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="
jsch
bcpg
bcpkix
ant-core
bcpg-1.50
commons-vfs
bcprov-1.50
jakarta-oro-2.0

87
dev-java/ant-ivy/ant-ivy-2.3.0.ebuild
View File

@@ -1,87 +0,0 @@
# 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...)
COMMON_DEP="
dev-java/ant-core:0
dev-java/bcpg:0
dev-java/bcpkix:0
dev-java/bcprov:0
dev-java/jakarta-oro:2.0
dev-java/jsch:0
dev-java/commons-httpclient:3
dev-java/commons-vfs:0"
DEPEND="
>=virtual/jdk-1.4
test? ( dev-java/ant-junit )
${COMMON_DEP}"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
S="${WORKDIR}/${MY_P}"
java_prepare() {
rm -rf test/repositories
rm -rf test/triggers
rm -rf src/example/chained-resolvers/settings/repository/test-1.0.jar
rm -rf test/java/org/apache/ivy/core/settings/custom-resolver.jar
# Removing obsolete documentation.
rm -rf doc/reports
rm -rf doc/configuration
java-ant_rewrite-classpath
mkdir lib
}
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="ant-core,bcpg,bcpkix,bcprov,commons-vfs,jakarta-oro-2.0,jsch,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"
use doc && java-pkg_dojavadoc "build/doc/reports/api"
use doc && dohtml -r "doc"
use examples && java-pkg_doexamples "src/example"
use source && java-pkg_dosrc src/java/*
java-pkg_register-ant-task
}