From 9545bbf5aafebb5155e0ce47ebe7629906ce484e Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Mon, 4 May 2009 22:20:43 +0000
Subject: [PATCH] dev-java/isrt: corrections based on suggestiosn from
 Vlastimil Babka <caster@g.o>

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1195 6952d904-891a-0410-993b-d76249ca496b
---
 dev-java/isrt/ChangeLog                |  4 ++++
 dev-java/isrt/Manifest                 |  8 ++++----
 dev-java/isrt/files/build.properties   |  2 +-
 dev-java/isrt/files/build.xml          |  6 +++---
 dev-java/isrt/isrt-4.5.20081218.ebuild | 27 +++++++-------------------
 5 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/dev-java/isrt/ChangeLog b/dev-java/isrt/ChangeLog
index 08e6a598..265de176 100644
--- a/dev-java/isrt/ChangeLog
+++ b/dev-java/isrt/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 May 2009; Mario Fetka <mario.fetka@gmail.com> isrt-4.5.20081218.ebuild,
+  files/build.properties, files/build.xml:
+  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
+
   20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> Manifest:
   initial checkin
 
diff --git a/dev-java/isrt/Manifest b/dev-java/isrt/Manifest
index defb2adb..c0180cb0 100644
--- a/dev-java/isrt/Manifest
+++ b/dev-java/isrt/Manifest
@@ -1,6 +1,6 @@
-AUX build.properties 145 RMD160 b00640e0320963377113f2bd540274d69f5ab3d5 SHA1 bca99ca1390f5b47b3bcc822587f805a085d86c0 SHA256 e5e8e3b2f116ef781353ab9482fb90193d9ed6ca0ef2da4080857fef7d08955f
-AUX build.xml 3085 RMD160 87ee77f5adc81996ab54da297fbf1d1f4ca9f334 SHA1 2642f9877f270c33f5ab37ec4a2a4cb6d0c12a02 SHA256 613539806714f2dc5a1a4986335239240d4a9295f6519858556025828f3ac4f6
+AUX build.properties 143 RMD160 a841d94c97ba05310954dad1fd45a8e9f06f5231 SHA1 bb3598a9e0db6669605b14bc41fd3e1de09ec390 SHA256 70d4acc51b2208c7422177e0ea960f9a13a38280d6798049e37ea2591dc15126
+AUX build.xml 3065 RMD160 5ab04cd110b990a2943a7dc4e1a6fe6201c8f346 SHA1 06da73393899d727602c460e6ae40a3e265ada22 SHA256 a0e4e76baa83d45e37244a9fa69502630c46d4de32068441e1e1abe6ea90d7e6
 DIST isrt.4.5.20081218.zip 2059136 RMD160 39125610de63eb83fff196e0de2852aa0797883f SHA1 327845edd1d1c7454eedabee2680cbed267bd66b SHA256 f3b6bfae76c6651c130473254e571013aa2d9fdeaa700d04f8cde4828dcb5745
-EBUILD isrt-4.5.20081218.ebuild 1136 RMD160 8e1b8adb32b237d4fcecaae2f977c3988e11ff07 SHA1 a4646fa9853d1eb87fe39fb49fdb1941c03c603e SHA256 893f9423ead89b4361b390ceeb84a1120e462741dcf9e971d515d0d0828acffb
-MISC ChangeLog 194 RMD160 33bc637a120085fa1d258fc96077c9659f168273 SHA1 62154a70931c7ab899067b65e49567a1a70e677b SHA256 59cda95a17c129478831c74028dd112f1a4a1050e06c5d10f327de4689f14a25
+EBUILD isrt-4.5.20081218.ebuild 742 RMD160 f2f54c00e0f44ab469e8a542e2286a2be8b65254 SHA1 7ff6e504dd6f0a17ca68e749eb641fbf33664da0 SHA256 733f960e5a69594edff352439110495a1eb71010ef4fed5ad3a95cb782f9863e
+MISC ChangeLog 384 RMD160 b9ade6930c1bf33006d7edf74cb425e0d25ce2bc SHA1 bc443c0fa818d83d464ed1870a42d9649e147907 SHA256 4d7a2c0c30aa8b0b59271a17d167e00dfae7dfba13fcc3176c7e5f9851b540aa
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/isrt/files/build.properties b/dev-java/isrt/files/build.properties
index 902ca7d2..88ea9409 100644
--- a/dev-java/isrt/files/build.properties
+++ b/dev-java/isrt/files/build.properties
@@ -2,6 +2,6 @@
 build.dir=build
 
 #libraries
-libs.dir=lib
+libs.dir=.
 isrt.jar.name=isrt
 
diff --git a/dev-java/isrt/files/build.xml b/dev-java/isrt/files/build.xml
index 3f598eaf..df40ebdb 100644
--- a/dev-java/isrt/files/build.xml
+++ b/dev-java/isrt/files/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="isrt" default="build-jars" basedir="../">
+<project name="isrt" default="jar" basedir=".">
     <description>
         The basic runtime tools and interfaces for intarsys components
     </description>
@@ -9,7 +9,7 @@
   <property name="isrt.src.dir" location="src"/>
   
   <target name="init">
-  	<property file="ant/build.properties" />
+  	<property file="build.properties" />
 
 	<property name="isrt.build.root" location="${build.dir}/isrt"/>
   	<property name="isrt.build.dir" location="${isrt.build.root}/build"/>
@@ -48,7 +48,7 @@
     </javac>
   </target>
 	
-  <target name="build-jars" depends="compile" description="generate the distribution" >
+  <target name="jar" depends="compile" description="generate the distribution" >
 
     <jar jarfile="${isrt.dist.dir}/${isrt.jar.name}.jar" basedir="${isrt.build.dir}">
 	    <manifest>
diff --git a/dev-java/isrt/isrt-4.5.20081218.ebuild b/dev-java/isrt/isrt-4.5.20081218.ebuild
index e373c5bd..e3d09ea9 100644
--- a/dev-java/isrt/isrt-4.5.20081218.ebuild
+++ b/dev-java/isrt/isrt-4.5.20081218.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-JAVA_PKG_IUSE="source"
+EAPI="2"
+
+JAVA_PKG_IUSE="source doc"
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,8 +14,8 @@ SRC_URI="mirror://sourceforge/jpodrenderer/isrt.${PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="doc"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
@@ -21,23 +23,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
-}
-
-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() {