From 02bd3b486d50139ffa7ce3ae117601aa5237b562 Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 4 May 2009 22:22:43 +0000 Subject: [PATCH] dev-java/jPodRenderer: corrections based on suggestiosn from Vlastimil Babka git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1200 6952d904-891a-0410-993b-d76249ca496b --- dev-java/jPodRenderer/ChangeLog | 4 ++ dev-java/jPodRenderer/Manifest | 8 +-- dev-java/jPodRenderer/files/build.properties | 2 +- dev-java/jPodRenderer/files/build.xml | 6 +- .../jPodRenderer-5.0.20081218.ebuild | 63 +++++-------------- 5 files changed, 27 insertions(+), 56 deletions(-) diff --git a/dev-java/jPodRenderer/ChangeLog b/dev-java/jPodRenderer/ChangeLog index 895c5e1d..82393b1c 100644 --- a/dev-java/jPodRenderer/ChangeLog +++ b/dev-java/jPodRenderer/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 May 2009; Mario Fetka + jPodRenderer-5.0.20081218.ebuild, files/build.properties, files/build.xml: + corrections based on suggestiosn from Vlastimil Babka + 20 Apr 2009; Mario Fetka ChangeLog: initial checkin diff --git a/dev-java/jPodRenderer/Manifest b/dev-java/jPodRenderer/Manifest index ad1ead07..0c479546 100644 --- a/dev-java/jPodRenderer/Manifest +++ b/dev-java/jPodRenderer/Manifest @@ -1,6 +1,6 @@ -AUX build.properties 424 RMD160 c50287d00e318335bfee75124a16536c26b53683 SHA1 4766fd98bb6a304b7d64e6c3f334a25cd51b2c72 SHA256 986128b4dcdd7aba065b27e3a60d9167c8ff652d195de0a8f7fc71f65b2239bf -AUX build.xml 4232 RMD160 74131b8b0f2c9747fbb78cdd95b5f130c86f7f78 SHA1 c4e4b04f4ccde79db5ee4fce3d20f1696286c04e SHA256 9c13c78fde850ec196c793c783338252def30d40adc94ab6afcd007f815f46ba +AUX build.properties 422 RMD160 0e1244657bbafe881c3f01b6d013f4f576abb019 SHA1 1a9c9ad0659091ba8e51d9f6457d7ba21f788869 SHA256 5a9f9e85a55861eb8f441d74122003e3cf326d74ef2cd60469d93133c7601d04 +AUX build.xml 4212 RMD160 d1a2abee6ff65a84280a436c739e40d8650eceed SHA1 50151f6830848a911e469cf3839eec6dd6ce8fbe SHA256 cf7616d8991850eb98b1d79a264f906ac72ef4dc9375e60af119ed754fd09d29 DIST jPodRenderer.5.0.20081218.zip 8216503 RMD160 ee160d1fd8fe0f61e2bb80de455c35b46a4e67e2 SHA1 8a6d7bb06b56fb174b9c1c2c529deded5ddd87de SHA256 b94a3167df467415bd9e79aee9560af678c3578991bca52f82e69f54a47974ff -EBUILD jPodRenderer-5.0.20081218.ebuild 2398 RMD160 ef6382b1bec992569efc3557b8cac0a671b2e511 SHA1 6c80ae77b294f6a326df5f79ba42c080b9ff5751 SHA256 6e2af7f05c30b25f50c3d2664eab7dd37dcc626bcb00f232c3f871a792fb92d5 -MISC ChangeLog 203 RMD160 3af4dc0444b452f45e4cf38fdfc153efba1b3725 SHA1 0a9b5c9d2eadf02cc979f0c52e28d155163243d3 SHA256 8b240c4f577737485ba0de67d1c27547c460be1cb67d405a7349103fab73a5b3 +EBUILD jPodRenderer-5.0.20081218.ebuild 1210 RMD160 ac7f8542749d1300b34d21537d7b9f6b03185838 SHA1 19fdf497b64d712c608d99c2e65c8db03ea1a082 SHA256 b7bdd498df273a227792bc63e59ffb82451c2229f722eb77d4d30f738022c806 +MISC ChangeLog 401 RMD160 6ee29e13ec31d189a31466fb17d577f67ddd57fc SHA1 284440665c05faf0da8c98959606ad88f46ac3c3 SHA256 24e69d33656fd27dd298b1272f7cc73648c61504b01f218921bcaf2a19e00569 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb diff --git a/dev-java/jPodRenderer/files/build.properties b/dev-java/jPodRenderer/files/build.properties index 47cb4b85..db67c93c 100644 --- a/dev-java/jPodRenderer/files/build.properties +++ b/dev-java/jPodRenderer/files/build.properties @@ -2,7 +2,7 @@ build.dir=build #libraries -libs.dir=lib +libs.dir=. jai_codec.jar.name=jai_codec jai_core.jar.name=jai_core jai_imageio.jar.name=jai_imageio diff --git a/dev-java/jPodRenderer/files/build.xml b/dev-java/jPodRenderer/files/build.xml index 6a4e364f..96b29450 100644 --- a/dev-java/jPodRenderer/files/build.xml +++ b/dev-java/jPodRenderer/files/build.xml @@ -1,5 +1,5 @@ - + This is a window toolkit and basic rendering abstraction layer @@ -10,7 +10,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild b/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild index c14ab184..0450d236 100644 --- a/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild +++ b/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild @@ -2,7 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="2" + JAVA_PKG_IUSE="source" +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="sun-jai-imageio,sun-jai-bin,jbig2,swt-3.4,jPod,iscwt,isfreetype,isnativec,isrt,jna" inherit java-pkg-2 java-ant-2 @@ -15,16 +19,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc" -COMMON_DEP="dev-java/sun-jai-imageio - dev-java/sun-jai-bin - dev-java/jbig2 - dev-java/jna +COMMON_DEP="dev-java/sun-jai-imageio:0 + dev-java/sun-jai-bin:0 + dev-java/jbig2:0 + dev-java/jna:0 dev-java/swt:3.4 - dev-java/isrt - dev-java/isnativec - dev-java/isfreetype - dev-java/iscwt - dev-java/jPod" + dev-java/isrt:0 + dev-java/isnativec:0 + dev-java/isfreetype:0 + dev-java/iscwt:0 + dev-java/jPod:0" RDEPEND=">=virtual/jre-1.5 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.5 @@ -33,45 +37,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 "jai_codec.jar.name=jai_codec" >> ${S}/ant/build.properties - echo "jai_core.jar.name=jai_core" >> ${S}/ant/build.properties - echo "jai_imageio.jar.name=jai_imageio" >> ${S}/ant/build.properties - echo "jbig2.jar.name=jbig2" >> ${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 - echo "jPod.jar.name=jPod" >> ${S}/ant/build.properties - echo "jPodRenderer.jar.name=jPodRenderer" >> ${S}/ant/build.properties - - java-pkg_jarfrom sun-jai-imageio - java-pkg_jarfrom sun-jai-bin - java-pkg_jarfrom jbig2 - java-pkg_jarfrom jna - java-pkg_jarfrom swt-3.4 - java-pkg_jarfrom isrt - java-pkg_jarfrom isnativec - java-pkg_jarfrom isfreetype - java-pkg_jarfrom iscwt - java-pkg_jarfrom jPod -} - -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() {