From 97619ec6d7dc9324a54871e090586c86407f4c46 Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 4 May 2009 22:22:17 +0000 Subject: [PATCH] dev-java/iscwt: corrections based on suggestiosn from Vlastimil Babka git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1198 6952d904-891a-0410-993b-d76249ca496b --- dev-java/iscwt/ChangeLog | 4 +++ dev-java/iscwt/Manifest | 8 ++--- dev-java/iscwt/files/build.properties | 2 +- dev-java/iscwt/files/build.xml | 6 ++-- dev-java/iscwt/iscwt-5.0.20081218.ebuild | 46 +++++++----------------- 5 files changed, 24 insertions(+), 42 deletions(-) diff --git a/dev-java/iscwt/ChangeLog b/dev-java/iscwt/ChangeLog index 26a6fea5..b735adae 100644 --- a/dev-java/iscwt/ChangeLog +++ b/dev-java/iscwt/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 May 2009; Mario Fetka + iscwt-5.0.20081218.ebuild, files/build.properties, files/build.xml: + corrections based on suggestiosn from Vlastimil Babka + 20 Apr 2009; Mario Fetka iscwt-5.0.20081218: correct keywords diff --git a/dev-java/iscwt/Manifest b/dev-java/iscwt/Manifest index ee4de26f..b3a8c8ca 100644 --- a/dev-java/iscwt/Manifest +++ b/dev-java/iscwt/Manifest @@ -1,6 +1,6 @@ -AUX build.properties 260 RMD160 eb438289e84f3cd3a69c606dd7a127b72f9675d1 SHA1 e63baf9d9721a1e35cafdb515e6802183140b6ee SHA256 af55a49cd86c5fc3a24518868b979315285d577964ab0304641e80fd1e5ff212 -AUX build.xml 3489 RMD160 8e70987afa4c7dfd8f5862fee68c48e297ee801c SHA1 a8d02c4c2a8f322199e7ebd631678d372bc4873a SHA256 e4b3d31223498fba854209566eca7ec707ef91ac0924a0d7c6a22f01755c3e44 +AUX build.properties 258 RMD160 210d3d1391f47a5c170ebe988f865c39d22c0132 SHA1 19e6a2977dd985258db95f3cccba592c2187d2fb SHA256 523c86c348a9d524fbc353f52d85ffc4974395b71d4de59f5b501c1ecf2641a8 +AUX build.xml 3469 RMD160 d981cbf82df870bdd64b0bf549c6aa4457d55318 SHA1 30f182836c1c125ec8c06e4b5b458ec877de3eea SHA256 54e3fc41aedc4be1cad6c8328219948b8047461bff358752e20f127f88048f71 DIST isCWT.5.0.20081218.zip 1929374 RMD160 31480f2aa2ec9452f205747d9c3eabce562c4a78 SHA1 6cae1e4f106aa3f7bdfb137bb06ffaa884fd6e1b SHA256 7dd403c75ebbc00058ea373bea6f300eebaa32cd1ef943a4abefbc9682d86fcf -EBUILD iscwt-5.0.20081218.ebuild 1707 RMD160 e8c857027de2f3b4a47eaf0fbbc741caf1dfa520 SHA1 34b7692b76635d29a98c71721c5a1a72a0d6618f SHA256 e73cb21e14ee737cfa488384073074dacc5b6f376d649176f2f052bb737e297a -MISC ChangeLog 287 RMD160 1310d843f1938e304365c74473d767e6107ebb18 SHA1 36fc1bdc2affd6ac9302b9277e1985c5467028ce SHA256 14d8155adb7ac96669a3472547ac61a507018897e7d29026f3f6c411df153447 +EBUILD iscwt-5.0.20081218.ebuild 979 RMD160 e784c623b4ad23518738ff71da8124f3f965c052 SHA1 9a3083e58b04ac7a759f55a5235094b216aefd47 SHA256 855ccd18e4fde83ac720330ee80f524d128d8ec09368b26084583e86201d1839 +MISC ChangeLog 478 RMD160 906584133921fc02e481bae802d38d85fab39d2c SHA1 2e66dc7770f31aa884208bb4947d8261f8674cff SHA256 fc1dc03b93f6fd9c6ff7d1d104f94ea8b9b93edac58b68b811843c100e19e7c1 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb diff --git a/dev-java/iscwt/files/build.properties b/dev-java/iscwt/files/build.properties index 00f9056a..c2f46653 100644 --- a/dev-java/iscwt/files/build.properties +++ b/dev-java/iscwt/files/build.properties @@ -2,7 +2,7 @@ build.dir=build #libraries -libs.dir=lib +libs.dir=. swt.jar.name=swt jna.jar.name=jna isrt.jar.name=isrt diff --git a/dev-java/iscwt/files/build.xml b/dev-java/iscwt/files/build.xml index 12a52644..8097bd22 100644 --- a/dev-java/iscwt/files/build.xml +++ b/dev-java/iscwt/files/build.xml @@ -1,5 +1,5 @@ - + This is a window toolkit and basic rendering abstraction layer @@ -10,7 +10,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/dev-java/iscwt/iscwt-5.0.20081218.ebuild b/dev-java/iscwt/iscwt-5.0.20081218.ebuild index 8103f5f5..d7da221a 100644 --- a/dev-java/iscwt/iscwt-5.0.20081218.ebuild +++ b/dev-java/iscwt/iscwt-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="swt-3.4,isfreetype,isnativec,isrt,jna" inherit java-pkg-2 java-ant-2 @@ -13,13 +17,13 @@ SRC_URI="mirror://sourceforge/jpodrenderer/isCWT.${PV}.zip" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="" -COMMON_DEP="dev-java/jna +COMMON_DEP="dev-java/jna:0 dev-java/swt:3.4 - dev-java/isrt - dev-java/isnativec - dev-java/isfreetype" + dev-java/isrt:0 + dev-java/isnativec:0 + dev-java/isfreetype:0" RDEPEND=">=virtual/jre-1.5 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.5 @@ -28,34 +32,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 "jna.jar.name=jna" >> ${S}/ant/build.properties - echo "swt.jar.name=swt" >> ${S}/ant/build.properties - echo "isrt.jar.name=isrt" >> ${S}/ant/build.properties - echo "isnativec.jar.name=isnativec" >> ${S}/ant/build.properties - echo "isfreetype.jar.name=isfreetype" >> ${S}/ant/build.properties - echo "iscwt.jar.name=iscwt" >> ${S}/ant/build.properties - - java-pkg_jarfrom isfreetype - java-pkg_jarfrom isnativec - java-pkg_jarfrom isrt - java-pkg_jarfrom swt-3.4 - 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}" } src_install() {