diff options
Diffstat (limited to 'dev-java/ant-ivy/ant-ivy-2.2.0.ebuild')
| -rw-r--r-- | dev-java/ant-ivy/ant-ivy-2.2.0.ebuild | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/dev-java/ant-ivy/ant-ivy-2.2.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.2.0.ebuild index 0766f86..279ff42 100644 --- a/dev-java/ant-ivy/ant-ivy-2.2.0.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.2.0.ebuild @@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc examples source test" # rewrites examples otherwise... bad JAVA_PKG_BSFIX_ALL="no" -inherit java-pkg-2 java-ant-2 eutils +inherit base java-pkg-2 java-ant-2 eutils MY_PN="apache-ivy" MY_P="${MY_PN}-${PV}" @@ -24,13 +24,12 @@ IUSE="" COMMON_DEP=" dev-java/ant-core:0 - dev-java/jakarta-oro:2.0 - dev-java/jsch:0 - dev-java/commons-httpclient:3 - dev-java/commons-vfs:0 dev-java/bcpg:0 dev-java/bcprov:0 - dev-java/commons-logging:0" + 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 @@ -46,17 +45,25 @@ RDEPEND=">=virtual/jre-1.4 S="${WORKDIR}/${MY_P}" JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="ant-core,commons-vfs,commons-logging,jakarta-oro-2.0,jsch +EANT_GENTOO_CLASSPATH="ant-core,commons-vfs,jakarta-oro-2.0,jsch commons-httpclient-3,bcpg,bcprov" EANT_BUILD_TARGET="/offline jar" EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}" + +#ecj causes error: +#The type org.apache.commons.logging.Log cannot be resolved. It is indirectly referenced from required .class files +JAVA_PKG_FORCE_COMPILER="javac" + java_prepare() { - find "${S}" -name '*.jar' -delete + epatch "${FILESDIR}"/${P}-build.xml.patch + #do not delete jars as they are for test purposes only + #find "${S}" -name '*.jar' -delete mkdir "${S}"/lib || die } EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-testutil,commons-lang-2.1" +EANT_TEST_EXTRA_ARGS="-Divy.home=${T}" EANT_TEST_TARGET="/offline test" src_test() { |