jamvm: Cleanup and new version.

 - moved all versions prior to 1.4.5 to obsolete/ (including patches)
 - added recipe for 1.5.0
 - made 1.4.5 and 1.5.0 use a common include file

11 files changed, 9 insertions, 129 deletions

diff --git a/packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch b/packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
index a41beee982..a41beee982 100644
--- a/packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch
+++ b/packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
diff --git a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty b/packages/jamvm/jamvm-1.3.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty
+++ /dev/null
diff --git a/packages/jamvm/jamvm-1.3.0/heap-size.patch b/packages/jamvm/jamvm-1.3.0/heap-size.patch
deleted file mode 100644
index 36d681889d..0000000000
--- a/packages/jamvm/jamvm-1.3.0/heap-size.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- jamvm-1.3.0/src/jam.h.orig	2005-04-02 14:38:49.000000000 +0200
-+++ jamvm-1.3.0/src/jam.h	2005-04-02 14:41:18.000000000 +0200
-@@ -531,13 +531,19 @@
- #define MIN_STACK 2*KB
- 
- /* default minimum size of object heap */
-+#ifndef DEFAULT_MIN_HEAP
- #define DEFAULT_MIN_HEAP 2*MB
-+#endif
- 
- /* default maximum size of object heap */
-+#ifndef DEFAULT_MAX_HEAP
- #define DEFAULT_MAX_HEAP 128*MB
-+#endif
- 
- /* default size of the Java stack */
-+#ifndef DEFAULT_STACK
- #define DEFAULT_STACK 64*KB
-+#endif
- 
- /* size of emergency area - big enough to create
-    a StackOverflow exception */
diff --git a/packages/jamvm/jamvm_1.3.2.bb b/packages/jamvm/jamvm.inc
index 9727fd6cda..36378370c5 100644
--- a/packages/jamvm/jamvm_1.3.2.bb
+++ b/packages/jamvm/jamvm.inc
@@ -1,14 +1,13 @@
 DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
 HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
 
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
+DEPENDS = "zlib classpath virtual/javac-native"
+RDEPENDS = "classpath"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz"
+
+RPROVIDES_jamvm = "java2-runtime"
 
 # This uses 32 bit arm, so force the instruction set to arm, not thumb
 ARM_INSTRUCTION_SET = "arm"
@@ -18,7 +17,6 @@ inherit autotools update-alternatives
 EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
 CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
 
-PROVIDES = "virtual/java"
 ALTERNATIVE_NAME = "java"
 ALTERNATIVE_PATH = "${bindir}/jamvm"
 ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/jamvm/jamvm/.mtn2git_empty b/packages/jamvm/jamvm/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/jamvm/jamvm/.mtn2git_empty
+++ /dev/null
diff --git a/packages/jamvm/jamvm/sh3sh4-support.patch b/packages/jamvm/jamvm/sh3sh4-support.patch
deleted file mode 100644
index 8fa0d8c161..0000000000
--- a/packages/jamvm/jamvm/sh3sh4-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac_orig	2006-05-10 21:48:31.000000000 +0000
-+++ configure.ac	2006-05-10 21:49:56.000000000 +0000
-@@ -66,6 +66,8 @@
- arm*-*-linux*) host_cpu=arm host_os=linux ;;
- arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
- arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
-+sh3-*-linux*) host_cpu=sh3 host_os=linux libdl_needed=no ;;
-+sh4-*-linux*) host_cpu=sh4 host_os=linux libdl_needed=no ;;
- powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
- powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
- powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
diff --git a/packages/jamvm/jamvm_1.3.0.bb b/packages/jamvm/jamvm_1.3.0.bb
deleted file mode 100644
index ffdf74938f..0000000000
--- a/packages/jamvm/jamvm_1.3.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://heap-size.patch;patch=1"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/jamvm/jamvm_1.3.1.bb b/packages/jamvm/jamvm_1.3.1.bb
deleted file mode 100644
index 20b1535707..0000000000
--- a/packages/jamvm/jamvm_1.3.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/jamvm/jamvm_1.4.1.bb b/packages/jamvm/jamvm_1.4.1.bb
deleted file mode 100644
index 9727fd6cda..0000000000
--- a/packages/jamvm/jamvm_1.4.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
-
-# This uses 32 bit arm, so force the instruction set to arm, not thumb
-ARM_INSTRUCTION_SET = "arm"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb
index 489b4fb94b..ab1fb0484e 100644
--- a/packages/jamvm/jamvm_1.4.5.bb
+++ b/packages/jamvm/jamvm_1.4.5.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
+SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
 
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.18) classpath-common (>= 0.18)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
-
-# This uses 32 bit arm, so force the instruction set to arm, not thumb
-ARM_INSTRUCTION_SET = "arm"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb
new file mode 100644
index 0000000000..ffd0997572
--- /dev/null
+++ b/packages/jamvm/jamvm_1.5.0.bb
@@ -0,0 +1,3 @@
+PR = "r0"
+
+