version bump, Ebuild submitted by Edwin Shin <eddie@cs.cornell.edu> and Jan Brinkmann <lucky@the-luckyduck.de>. fixes 75112

6 files changed, 175 insertions, 12 deletions

diff --git a/dev-java/mckoi/ChangeLog b/dev-java/mckoi/ChangeLog
index 809095dd25f4..6aac37619b2e 100644
--- a/dev-java/mckoi/ChangeLog
+++ b/dev-java/mckoi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/mckoi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.6 2004/12/21 11:42:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.7 2004/12/21 11:51:11 axxo Exp $
+
+*mckoi-1.0.3 (21 Dec 2004)
+
+  21 Dec 2004; Thomas Matthijs <axxo@gentoo.org> +files/build.xml,
+  +files/mckoi-1.0.3-jikes.patch, +mckoi-1.0.3.ebuild:
+  version bump, Ebuild submitted by Edwin Shin <eddie@cs.cornell.edu> and Jan
+  Brinkmann <lucky@the-luckyduck.de>. fixes 75112
 
   21 Dec 2004; Thomas Matthijs <axxo@gentoo.org> mckoi-1.0.2.ebuild:
   fixes 75110
diff --git a/dev-java/mckoi/Manifest b/dev-java/mckoi/Manifest
index 51b6551f35cb..88bbc4f99034 100644
--- a/dev-java/mckoi/Manifest
+++ b/dev-java/mckoi/Manifest
@@ -1,14 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d2c5cdf5d98749fb45b846c0d7d393c0 mckoi-1.0.2.ebuild 1576
-MD5 a68cafcb8fc8d3ef5ebd4d2283c4bb9e ChangeLog 789
+MD5 251f207d91ec519e669b29d085dfb829 mckoi-1.0.3.ebuild 1149
+MD5 28d56e03d9394d70bc1df3a25687aa48 ChangeLog 1068
 MD5 88a45e55f45705b8699507175d106c8e metadata.xml 842
 MD5 1e8a7ec3bae7dc7328124e22a150efef files/digest-mckoi-1.0.2 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFByAxL/rLF9B432nYRAsigAJ4sWfalXMr/MSnLaDK8c4ATpD86dQCdHMgN
-P3H/yGKYoSpX3gXAbwCrD/M=
-=cLJQ
------END PGP SIGNATURE-----
+MD5 082cf5d0acc9ed44d2c2770bb73f14f1 files/digest-mckoi-1.0.3 60
+MD5 8035781e30ce3ccaf159a59d17be2e4c files/build.xml 1453
+MD5 7ed5c070543963c72c14ea6acc8819f6 files/mckoi-1.0.3-jikes.patch 1728
diff --git a/dev-java/mckoi/files/build.xml b/dev-java/mckoi/files/build.xml
new file mode 100644
index 000000000000..48950ac58146
--- /dev/null
+++ b/dev-java/mckoi/files/build.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<project name="mckoi" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs/api" />
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/mckoidb.jar" />
+	<property name="target.jdk" value="1.4" />
+	<property file="build.properties" />
+
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${docs.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac srcdir="${src.dir}" 
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}">
+			<classpath>
+				<pathelement path="${gnu-regexp.jar}" />
+			</classpath>
+		</javac>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}" />
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="docs" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="com.*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+           		use="true"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+</project>
diff --git a/dev-java/mckoi/files/digest-mckoi-1.0.3 b/dev-java/mckoi/files/digest-mckoi-1.0.3
new file mode 100644
index 000000000000..023836da7c11
--- /dev/null
+++ b/dev-java/mckoi/files/digest-mckoi-1.0.3
@@ -0,0 +1 @@
+MD5 89914c04b8b24ca876d9e15577ae3bf6 mckoi1.0.3.zip 2192577
diff --git a/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch b/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch
new file mode 100644
index 000000000000..173340771041
--- /dev/null
+++ b/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch
@@ -0,0 +1,48 @@
+diff -ur mckoi1.0.3.orig/src/com/mckoi/store/JournalledSystem.java mckoi1.0.3/src/com/mckoi/store/JournalledSystem.java
+--- mckoi1.0.3.orig/src/com/mckoi/store/JournalledSystem.java	2004-08-15 22:14:58.000000000 +0200
++++ mckoi1.0.3/src/com/mckoi/store/JournalledSystem.java	2004-12-20 13:19:07.808868672 +0100
+@@ -1047,7 +1047,7 @@
+     /**

+      * The journal file.

+      */

+-    private final JournalFile journal;

++    private final com.mckoi.store.JournalledSystem.JournalFile journal;

+ 

+     /**

+      * The position in the journal file.

+@@ -1069,7 +1069,7 @@
+     /**

+      * Constructs the entry.

+      */

+-    public JournalEntry(String resource_name, JournalFile journal,

++    public JournalEntry(String resource_name, com.mckoi.store.JournalledSystem.JournalFile journal,

+                         long position, long page_number) {

+       this.resource_name = resource_name;

+       this.journal = journal;

+@@ -1080,7 +1080,7 @@
+     /**

+      * Returns the journal file for this entry.

+      */

+-    public JournalFile getJournalFile() {

++    public com.mckoi.store.JournalledSystem.JournalFile getJournalFile() {

+       return journal;

+     }

+ 

+@@ -1716,7 +1716,7 @@
+     /**

+      * The JournalFile object that is a summary of.

+      */

+-    JournalFile journal_file;

++    com.mckoi.store.JournalledSystem.JournalFile journal_file;

+ 

+     /**

+      * True if the journal is recoverable (has one or more complete check

+@@ -1737,7 +1737,7 @@
+     /**

+      * Constructor.

+      */

+-    public JournalSummary(JournalFile journal_file) {

++    public JournalSummary(com.mckoi.store.JournalledSystem.JournalFile journal_file) {

+       this.journal_file = journal_file;

+     }

+     

diff --git a/dev-java/mckoi/mckoi-1.0.3.ebuild b/dev-java/mckoi/mckoi-1.0.3.ebuild
new file mode 100644
index 000000000000..e043c36d3010
--- /dev/null
+++ b/dev-java/mckoi/mckoi-1.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.3.ebuild,v 1.1 2004/12/21 11:51:11 axxo Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="Mckoi Java SQL Database System"
+HOMEPAGE="http://mckoi.com/database/"
+SRC_URI="http://www.mckoi.com/database/ver/${P/-/}.zip"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="x86"
+IUSE="doc jikes"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.6.2
+	app-arch/unzip
+	jikes? ( >=dev-java/jikes-1.21 )"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/gnu-regexp-1.1*"
+
+S=${WORKDIR}/${P/-/}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	unzip -q src.zip || die "unpack failed"
+	epatch ${FILESDIR}/mckoi-1.0.3-jikes.patch
+
+	rm gnu-regexp-*
+	rm *.jar
+
+	cp ${FILESDIR}/build.xml .
+	echo "gnu-regexp.jar=`java-config -p gnu-regexp-1`" > build.properties
+
+	cd src/
+	rm -rf net
+}
+
+src_compile() {
+	local antflags="jar"
+	if use doc; then
+		antflags="${antflags} docs"
+	fi
+	if use jikes; then
+		antflags="${antflags} -Dbuild.compiler=jikes"
+	fi
+	ant ${antflags} || die "compiling failed"
+}
+
+src_install() {
+	dodoc LICENSE.txt README.txt db.conf
+	java-pkg_dojar dist/mckoidb.jar
+
+	if use doc; then
+		java-pkg_dohtml -r docs/*
+	fi
+}