From 8a90005c43af76077176f8203655c669ca5bc649 Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 4 May 2009 22:21:42 +0000 Subject: [PATCH] dev-java/isnativec: corrections based on suggestiosn from Vlastimil Babka git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1196 6952d904-891a-0410-993b-d76249ca496b --- dev-java/isnativec/ChangeLog | 4 +++ dev-java/isnativec/Manifest | 8 ++--- dev-java/isnativec/files/build.properties | 2 +- dev-java/isnativec/files/build.xml | 6 ++-- .../isnativec/isnativec-5.0.20081218.ebuild | 36 ++++++------------- 5 files changed, 22 insertions(+), 34 deletions(-) diff --git a/dev-java/isnativec/ChangeLog b/dev-java/isnativec/ChangeLog index d075d52a..715e2124 100644 --- a/dev-java/isnativec/ChangeLog +++ b/dev-java/isnativec/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 May 2009; Mario Fetka + isnativec-5.0.20081218.ebuild, files/build.properties, files/build.xml: + corrections based on suggestiosn from Vlastimil Babka + 20 Apr 2009; Mario Fetka isnativec-5.0.20081218: initial checkin diff --git a/dev-java/isnativec/Manifest b/dev-java/isnativec/Manifest index ff005255..9479ffe0 100644 --- a/dev-java/isnativec/Manifest +++ b/dev-java/isnativec/Manifest @@ -1,6 +1,6 @@ -AUX build.properties 191 RMD160 69c4404209287a66eb23f40dec492e46740ca35e SHA1 32c9e3000c726aedf838f08b3b08ecf103587274 SHA256 43b296f90ad8a00b62269d3e60de7c76d26cf6d848fdad7b356ccb7d1d7952a0 -AUX build.xml 3372 RMD160 5263c78320284687660bfb778ada731bcba7d50f SHA1 a9a7eb58ea7283c66408d7f34528196e4970fcf8 SHA256 2d8ae68b666faa1998f779234ecb2f4e92add73270f43757772e3514f9057510 +AUX build.properties 189 RMD160 0c3a22b5b18585044690aa20e23620d2bd60b4bb SHA1 e9ad313a5e9083b239efd25e59b5d32446ad7002 SHA256 73e318e76d12078ea009e6d6f9095b42a0a9cbcc5a07633aa7ebefa092a14c54 +AUX build.xml 3352 RMD160 5024dc0434055bf6000e3f96cd78777c4076bdfa SHA1 534670c858d181c5feedf82338294fc64d1d8393 SHA256 28979c88225da2871edf20e5b0a8d8d26900aff5489f6523f420c95585e8a0f8 DIST isNative.5.0.20081218.zip 919745 RMD160 263408ab23b78802b945c5eccc708d2af92e6926 SHA1 5518a601244e3c4f36269975180b5c74e41ab5ac SHA256 a0f592ba2c82c8a97d6f00b247f1783d868533aabb322b16430a051a16f4220d -EBUILD isnativec-5.0.20081218.ebuild 1362 RMD160 7819e759d8fb538f23dfa7ba1bf1272ab3b1867f SHA1 2cae1db94558d83a8f3ed89e6c34831ef4b23789 SHA256 f9ba87c61e13e475e0bd1b1a204f286a64b04ccf7cef852fccdf7f81bc581880 -MISC ChangeLog 213 RMD160 bf4c243c5fb93ae88c7aecb4f498232851934b02 SHA1 595e81a5a841f01e2b7646b98eddf1c23a8d2d73 SHA256 f214cfb9dbd1a45f93d3081af13b94c313930c419f80f1ba24cc756c3b9a205b +EBUILD isnativec-5.0.20081218.ebuild 871 RMD160 ea482a0600d2e53ac0c8192973278d99e8b4a033 SHA1 d14d11f1e8387c0b2e9701d3d80ad72dc6a20ca5 SHA256 d8e4340dd279db7548b0d30f0b236e57cac075167ac73b56fc094461c5ed2048 +MISC ChangeLog 408 RMD160 7f39b829b6ca7e5e72e0492e82cb21519b904dea SHA1 0e8afe7c29842d37a2f3dc207f8ebb38ac9bffa4 SHA256 6e0d0616846f097705671af57d944ce9434f5a1c5988ace5dde8bf427a3772ea MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb diff --git a/dev-java/isnativec/files/build.properties b/dev-java/isnativec/files/build.properties index 29efc57b..c803188a 100644 --- a/dev-java/isnativec/files/build.properties +++ b/dev-java/isnativec/files/build.properties @@ -2,7 +2,7 @@ build.dir=build #libraries -libs.dir=lib +libs.dir=. isrt.jar.name=isrt jna.jar.name=jna isnativec.jar.name=isnativec diff --git a/dev-java/isnativec/files/build.xml b/dev-java/isnativec/files/build.xml index 04b641f8..f3d295fb 100644 --- a/dev-java/isnativec/files/build.xml +++ b/dev-java/isnativec/files/build.xml @@ -1,5 +1,5 @@ - + This is a generic native code wrapper @@ -10,7 +10,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/dev-java/isnativec/isnativec-5.0.20081218.ebuild b/dev-java/isnativec/isnativec-5.0.20081218.ebuild index 3d62d9d8..b9ec23b1 100644 --- a/dev-java/isnativec/isnativec-5.0.20081218.ebuild +++ b/dev-java/isnativec/isnativec-5.0.20081218.ebuild @@ -2,7 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -JAVA_PKG_IUSE="source" +EAPI="2" + +JAVA_PKG_IUSE="source doc" +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="isrt,jna" inherit java-pkg-2 java-ant-2 @@ -13,10 +17,10 @@ SRC_URI="mirror://sourceforge/jpodrenderer/isNative.${PV}.zip" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="" -COMMON_DEP="dev-java/jna - dev-java/isrt" +COMMON_DEP="dev-java/jna:0 + dev-java/isrt:0" RDEPEND=">=virtual/jre-1.5 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.5 @@ -25,28 +29,8 @@ DEPEND=">=virtual/jdk-1.5 S="${WORKDIR}"/distribution -src_unpack() { - unpack ${A} - - cd "${S}" - mkdir ant - cp "${FILESDIR}/build.xml" "${S}"/ant - - echo > ${S}/ant/build.properties - echo "build.dir=${S}/build" >> ${S}/ant/build.properties - echo "libs.dir=${S}" >> ${S}/ant/build.properties - echo "isrt.jar.name=isrt" >> ${S}/ant/build.properties - echo "jna.jar.name=jna" >> ${S}/ant/build.properties - echo "isnativec.jar.name=isnativec" >> ${S}/ant/build.properties - - java-pkg_jarfrom isrt - java-pkg_jarfrom jna -} - -src_compile() { - eant ${antflags} -buildfile ant/build.xml || die "build failed" - - use doc && eant ${antflags} -buildfile ant/build.xml javadoc || die "doc build failed" +src_prepare() { + cp "${FILESDIR}"/build.* "${S}" || die } src_install() {