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

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

diff --git a/dev-java/jbig2/ChangeLog b/dev-java/jbig2/ChangeLog
index 56ae9a8c..e29f45c2 100644
--- a/dev-java/jbig2/ChangeLog
+++ b/dev-java/jbig2/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> jbig2-20090114.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> ChangeLog:
   initial checkin
 
diff --git a/dev-java/jbig2/Manifest b/dev-java/jbig2/Manifest
index 7cfa00de..bc6cef83 100644
--- a/dev-java/jbig2/Manifest
+++ b/dev-java/jbig2/Manifest
@@ -1,6 +1,6 @@
-AUX build.properties 147 RMD160 2f793574aac8d7dae6f595d17d891c4b83bd5603 SHA1 be815d4bcd263956a230a8c0e9aa389f3e3ab7b6 SHA256 552afa0335c554f39a813da045653cf2dbdeab7f04cccd3e4e92dc21b0a953b7
-AUX build.xml 3148 RMD160 6b6ef267f6d37af13eb51530c040683d05d5fc47 SHA1 1674e10e41570563d52db19e73a23f00c20733e8 SHA256 cb3b688a833e944a45623162019e551dadf2538979f3cb13b89e10d21cf7380e
+AUX build.properties 145 RMD160 ed812e1b421e41da1b29a9c9bc48c45ca6e3775f SHA1 45d56db1438c3ae147402693af5e20cf12f05d7c SHA256 12e0e7dc74c08c404cfc0344742f2ddb78d91a4f7c9ba44aef0599d5c5aed289
+AUX build.xml 3128 RMD160 b04154c69fa93a672de103817846466a7fe71fcb SHA1 552c1e9e3dc5c202f9a485b8dbbc03c5e225234e SHA256 5dda2a60c1190bf5dc283e55eeb851fd7dc85743b91a45c685bff92564a938a7
 DIST jbig2_src-20090114.zip 113597 RMD160 f9eb922a34ef665e5da2eb777455db2d3b3a174b SHA1 2e0d0a57d4b7e2abbf50efb17f3fc358450f6c8c SHA256 94ace4545cfac6e5bed801fca641ad577cd821d0ef7d8e3bcf523ef586146cdd
-EBUILD jbig2-20090114.ebuild 1136 RMD160 b8f45cc7ebe6cd38752cf34de99d72523288cfd3 SHA1 4d5e9d329fd756c998a8d78f5552173c60f793aa SHA256 892a9502ca9ca8afa8368439fc6f32a7cce0e5d339a5bd0ea60648cc8b94a4ec
-MISC ChangeLog 196 RMD160 92cbf739da918746b5513efaba63ba631a7c5101 SHA1 8f831d008edb879322bb9f8277309f48f2e8c41a SHA256 87b2c93a5724d32e7b720c10c944d48a35445843eeb2837a17cfed9f69e29ed0
+EBUILD jbig2-20090114.ebuild 728 RMD160 7d5659c8fa97180f631586a5a66427f9923af12e SHA1 8fc3f17af431dcfa2d091a5a951fab6418828993 SHA256 e10f5acf142c9e077740538c0436fc840090e42d6bd101ba08b3ee4f6463b906
+MISC ChangeLog 383 RMD160 a9efa20b42d0b06509f6b4a91f6d876d779bd604 SHA1 d2c61f861e288519c5f4b98267b902ad68c55999 SHA256 be9edcfc74a530b49cd1de37b8a3b41972905a1ff86b3b03bed2bb222291ac20
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/jbig2/files/build.properties b/dev-java/jbig2/files/build.properties
index ae92ba18..d8c90f09 100644
--- a/dev-java/jbig2/files/build.properties
+++ b/dev-java/jbig2/files/build.properties
@@ -2,6 +2,6 @@
 build.dir=build
 
 #libraries
-libs.dir=lib
+libs.dir=.
 jbig2.jar.name=jbig2
 
diff --git a/dev-java/jbig2/files/build.xml b/dev-java/jbig2/files/build.xml
index de17d859..8c5f827f 100644
--- a/dev-java/jbig2/files/build.xml
+++ b/dev-java/jbig2/files/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="jbig2" default="build-jars" basedir="../">
+<project name="jbig2" default="jar" basedir=".">
     <description>
         The JPedal JBIG2 Image Decoder is a 100% pure Java image decoder for the JBIG2 file format.
     </description>
@@ -9,7 +9,7 @@
   <property name="jbig2.src.dir" location="src"/>
   
   <target name="init">
-  	<property file="ant/build.properties" />
+  	<property file="build.properties" />
 
 	<property name="jbig2.build.root" location="${build.dir}/jbig2"/>
   	<property name="jbig2.build.dir" location="${jbig2.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="${jbig2.dist.dir}/${jbig2.jar.name}.jar" basedir="${jbig2.build.dir}">
 	    <manifest>
diff --git a/dev-java/jbig2/jbig2-20090114.ebuild b/dev-java/jbig2/jbig2-20090114.ebuild
index 767ca6b9..e1ca875f 100644
--- a/dev-java/jbig2/jbig2-20090114.ebuild
+++ b/dev-java/jbig2/jbig2-20090114.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-JAVA_PKG_IUSE="source"
+JAVA_PKG_IUSE="source doc"
 
 inherit java-pkg-2 java-ant-2
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.jpedal.org/download/jbig2_src.zip -> jbig2_src-${PV}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
@@ -23,23 +23,8 @@ DEPEND=">=virtual/jdk-1.5
 
 S="${WORKDIR}"
 
-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 "jbig2.jar.name=jbig2" >> ${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() {