diff options
| author |   Ivan Baidakou <the.dmol@gmail.com> | 2012-09-22 17:41:45 +0300 |
|---|---|---|
| committer | Ivan Baidakou <the.dmol@gmail.com> | 2012-09-22 17:41:45 +0300 |
| commit | 1f3d3f90d2a7b3f569f6a7ccdeb2a68a37cdfda6 (patch) | |
| tree | 4a6d5064f4cbad1600ba51adac84ca10ec952880 | |
| parent | add ebuild xml-security-1.5.2 (diff) | |
| download | dmol-1f3d3f90d2a7b3f569f6a7ccdeb2a68a37cdfda6.tar.gz dmol-1f3d3f90d2a7b3f569f6a7ccdeb2a68a37cdfda6.tar.bz2 dmol-1f3d3f90d2a7b3f569f6a7ccdeb2a68a37cdfda6.zip | |
drop unnecessary dependency; do all tests pass
| -rw-r--r-- | dev-java/ant-ivy/Manifest | 7 | ||||
| -rw-r--r-- | dev-java/ant-ivy/ant-ivy-2.2.0.ebuild | 23 |
2 files changed, 19 insertions, 11 deletions
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest index a89bd2c..a9e04d5 100644 --- a/dev-java/ant-ivy/Manifest +++ b/dev-java/ant-ivy/Manifest @@ -1,3 +1,4 @@ -DIST apache-ivy-2.2.0-src.tar.gz 2513320 RMD160 5ac59ceea455fdb45ab4514eae7ba378b5068a23 SHA1 5bed97ead53483a3db2d5a1b80b3f82516e148b7 SHA256 338312a9df91825bfddb5705a41d122d0495c984f8689bcef0b2f3cbce6b0294 -EBUILD ant-ivy-2.2.0.ebuild 1778 RMD160 852570d27c9974071b274bce1a56c265edac6325 SHA1 3bfb783a0ceb2cd12425cc300b8a2c2340a8c661 SHA256 5d2a6d97426f93d6b7d9c00775cfaf4f4a026656ce0c12f01443579ba611ab04 -MISC metadata.xml 205 RMD160 4923bb2153d0eb925ffc86f91fdd806110e016c0 SHA1 da9437a648cf7dd5fcfca1c45c60c4053fed15c4 SHA256 2ff0740a5424b0e10c7888541a248d1bd363a60911b0921b4cfe5c36590498ce +AUX ant-ivy-2.2.0-build.xml.patch 550 SHA256 d230099b8a51a3c3b44f907b7d8669e7a5a464e56f6c66c232d0976ea2b3a1c8 SHA512 83adf83bf249e2cc49e900be0f21233f7f20950f78a57882864a209067891d1216a75712a4995ec81c52a966000f4c23fb7653e5fd1d9ea92b8b125ba19d8bf9 WHIRLPOOL 0cb104456cbf6f758e6d0f53d9c905694685ea8a5d91be2df6cb930bda5399bc8d3883080245394b02eb13fc60c84259a6eb648d34dfaa8bec862b0e245607fe +DIST apache-ivy-2.2.0-src.tar.gz 2513320 SHA256 338312a9df91825bfddb5705a41d122d0495c984f8689bcef0b2f3cbce6b0294 SHA512 76c3d2cde5706b6f462908dd4c5d000ecbd1cb7a6c4fb87d42478d48de591c41f24f68e7ea16a85d5a4af0301633eaed6462dae85999d7bfc4c36649035b2bd2 WHIRLPOOL 1847129a5e0a36f682814ba33c34c2d5b8d85ea18fcd40e2d16192f1b79916cee800cb9094a0bc783cc6002f4171b458d520512875f6bd78929c1d531b0cd76a +EBUILD ant-ivy-2.2.0.ebuild 2047 SHA256 f18e9747c64440e5bacf9d45cce1cc3f502939e12018255477d490c293a4d569 SHA512 498b5651f06197c1a0933c1f2af76d38699480af37870bf684d9eb67268409f76d7866963ba41edd3de09ae3de73a4d1b719922c39a47473db0d27b299a71f44 WHIRLPOOL b353dfbc10d0b9dbeb476461ad940cc3575ae1d06399162516c5654c2c703ca96cf85f60c229b3a721d20191e67ee1d8401c02201eb19c4aebafaed33e19686a +MISC metadata.xml 205 SHA256 2ff0740a5424b0e10c7888541a248d1bd363a60911b0921b4cfe5c36590498ce SHA512 e7c77c724739d0af43cc338ded09dcbeee2a710eb0e49f1e656dc4c891bee85bfd6935bf70a191a1c5823f473643e676d64970416e5f1820ea466681016757c5 WHIRLPOOL 5b7f0c2a5243244fa06b072c8f0d9f53e7b6f45c7e1b74a0d945bdcc28b7137fddfd58e85b0d3e721e80963916ceae0d4cca59f48114ba26c47b24a91d6abb27 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() { |