Version bump. Allows compilation under Java 1.5 (bug #97722).

(Portage version: 2.1_pre3-r1)

5 files changed, 140 insertions, 15 deletions

diff --git a/dev-java/iso-relax/ChangeLog b/dev-java/iso-relax/ChangeLog
index 05d94b662c89..c80fed2f5bf2 100644
--- a/dev-java/iso-relax/ChangeLog
+++ b/dev-java/iso-relax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/iso-relax
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/iso-relax/ChangeLog,v 1.5 2005/07/09 16:02:44 axxo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/iso-relax/ChangeLog,v 1.6 2006/01/18 07:15:40 nichoj Exp $
+
+*iso-relax-20050331 (18 Jan 2006)
+
+  18 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/iso-relax-20050331-build.patch, +iso-relax-20050331.ebuild:
+  Version bump. Allows compilation under Java 1.5 (bug #97722).
 
   09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> iso-relax-20041111.ebuild:
   fix deps, and source useflag support, small cleanups
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 15a8bb737673..67419abbfc9c 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6f91151b95a1b27b454f32a3f67ecf19 iso-relax-20041111.ebuild 1152
 MD5 3d3d337d97a9f056eba9e7b3fa4dd697 ChangeLog 910
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 4467af450e2c64d807928bbd784d8012 files/digest-iso-relax-20041111 66
 MD5 58122807af7666b9c9286aaf556d8f2a files/build.xml 1922
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz/U+/rLF9B432nYRArq9AKCDNuH+F8EEBHRqtxUX28p7KiJqrACeMtjd
-YFVVf6GDRZn5JMoOwImsCfU=
-=Spev
------END PGP SIGNATURE-----
+MD5 4467af450e2c64d807928bbd784d8012 files/digest-iso-relax-20041111 66
+MD5 23deb3dba238a908a476fa7161c11c26 files/digest-iso-relax-20050331 78
+MD5 ca3854f737f2b3cfb0f0e8d70a3c32db files/iso-relax-20050331-build.patch 2540
+MD5 6f91151b95a1b27b454f32a3f67ecf19 iso-relax-20041111.ebuild 1152
+MD5 67952d11e4d658fd748acb03ca931485 iso-relax-20050331.ebuild 959
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
diff --git a/dev-java/iso-relax/files/digest-iso-relax-20050331 b/dev-java/iso-relax/files/digest-iso-relax-20050331
new file mode 100644
index 000000000000..cfc9a63bf1e0
--- /dev/null
+++ b/dev-java/iso-relax/files/digest-iso-relax-20050331
@@ -0,0 +1 @@
+MD5 69e8a42cee3efb98e04171bc515aff64 iso-relax-20050331-gentoo.tar.bz2 696665
diff --git a/dev-java/iso-relax/files/iso-relax-20050331-build.patch b/dev-java/iso-relax/files/iso-relax-20050331-build.patch
new file mode 100644
index 000000000000..054bafeee2b9
--- /dev/null
+++ b/dev-java/iso-relax/files/iso-relax-20050331-build.patch
@@ -0,0 +1,87 @@
+Only in iso-relax-20050331: build
+diff -ru iso-relax-20050331-orig/build.xml iso-relax-20050331/build.xml
+--- iso-relax-20050331-orig/build.xml	2006-01-17 21:56:42.000000000 -0500
++++ iso-relax-20050331/build.xml	2006-01-17 22:06:20.000000000 -0500
+@@ -1,17 +1,47 @@
+ <?xml version="1.0"?>
+ <project name="ISORELAX" basedir="." default="release">
+ 
++	<property name="build" value="build"/>
++	<property name="src" value="src"/>
++	<property name="javadocs" value="docs/api"/>
++
++	<target name="init">
++		<mkdir dir="${build}"/>
++		<mkdir dir="${build}"/>
++	</target>
++
++	<target name="compile" depends="init">
++		<javac srcdir="${src}" debug="true" destdir="${build}"/>
++	</target>
++
++	<target name="javadoc" depends="init">
++		<javadoc sourcepath="${src}" destdir="${javadocs}" packagenames="*">
++		</javadoc>
++	</target>
++	
++	<target name="jar" depends="compile">
++		<jar jarfile="isorelax.jar" compress="false">
++			<fileset dir="${build}" />
++			<fileset dir="" includes="COPYING.txt"/>
++			<!-- resource files -->
++			<fileset dir="${src}">
++				<patternset>
++					<include name="**/*.properties" />
++					<include name="**/*.rxm"/>
++					<include name="**/*.dtd"/>
++					<include name="**/*.rng"/>
++					<include name="**/*.mod"/>
++				</patternset>
++			</fileset>
++		</jar>
++	</target>
++
+ 	<!-- create a distribution package -->
+-	<target name="release">
++	<target name="release" depends="jar">
+ 		<tstamp />
+ 		
+ 		<!-- compile files -->
+ 		<mkdir dir="temp" />
+-		<javac srcdir="src" debug="true" destdir="temp">
+-			<classpath>
+-				<fileset dir="lib" includes="*.jar" />
+-			</classpath>
+-		</javac>
+ 		
+ 		<!-- create a time stamp file -->
+ 		<echo file="temp/version.properties">version=${DSTAMP}</echo>
+@@ -30,24 +60,7 @@
+ 			</fileset>
+ 		</zip>
+ 		
+-		<!-- creates binary jar -->
+-		<delete file="isorelax.jar"/>
+-		<jar	jarfile="isorelax.jar"
+-				compress="false">
+-			<fileset dir="temp" />
+-			<fileset dir="" includes="COPYING.txt"/>
+-			<!-- resource files -->
+-			<fileset dir="src">
+-				<patternset>
+-					<include name="**/*.properties" />
+-					<include name="**/*.rxm"/>
+-					<include name="**/*.dtd"/>
+-					<include name="**/*.rng"/>
+-					<include name="**/*.mod"/>
+-				</patternset>
+-			</fileset>
+-		</jar>
+-		<delete dir="temp" />
++		<delete dir="${build}" />
+ 		
+ 		<zip zipfile="isorelax.${DSTAMP}.zip" compress="true">
+ 			<fileset dir="." includes="isorelax.jar src.zip COPYING.txt"/>
+Only in iso-relax-20050331: .build.xml.swp
+Only in iso-relax-20050331: docs
+Only in iso-relax-20050331: isorelax.jar
diff --git a/dev-java/iso-relax/iso-relax-20050331.ebuild b/dev-java/iso-relax/iso-relax-20050331.ebuild
new file mode 100644
index 000000000000..7ab4496bb72a
--- /dev/null
+++ b/dev-java/iso-relax/iso-relax-20050331.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/iso-relax/iso-relax-20050331.ebuild,v 1.1 2006/01/18 07:15:40 nichoj Exp $
+
+inherit java-pkg base
+
+DESCRIPTION="Interfaces usefull for applications which support RELAX Core"
+HOMEPAGE="http://iso-relax.sourceforge.net"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+#  cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/iso-relax login 
+# mkdir iso-releax-20050331
+# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/iso-relax -frelease-20050331 co build.xml lib
+# rm -r $(find -name CVS)
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+PATCHES="${FILESDIR}/${P}-build.patch"
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+
+	ant ${antflags} || die "ant failed"
+}
+
+src_install() {
+	java-pkg_dojar isorelax.jar
+
+	use doc && java-pkg_dohtml -r docs/api
+	use source && java-pkg_dosrc src
+}