New upstream version, some generall cleanup. Fixes #96333. Marked 1.3.0 stable on x86.

(Portage version: 2.0.51.22-r1)

11 files changed, 28 insertions, 105 deletions

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index 8675892f6c15..6dd69d2470b2 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jamvm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.7 2005/06/04 15:32:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.8 2005/06/17 17:30:42 luckyduck Exp $
+
+*jamvm-1.3.1 (17 Jun 2005)
+
+  17 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/1.2.2-classpath-fix.diff, -jamvm-1.2.3.ebuild, -jamvm-1.2.4.ebuild,
+  -jamvm-1.2.5.ebuild, jamvm-1.3.0.ebuild, +jamvm-1.3.1.ebuild:
+  New upstream version, some generall cleanup. Fixes #96333. Marked 1.3.0
+  stable on x86.
 
   04 Jun 2005; Joseph Jezak <josejx@gentoo.org> jamvm-1.3.0.ebuild:
   Marked ~ppc for bug #95007.
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index f36270c1e70a..fe8ef6f0688a 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,11 +1,13 @@
+MD5 2945a6076a08046fc902dba3463c6f41 jamvm-1.3.0.ebuild 1010
+MD5 6adaf91f84ee96d3c91fa09ff95494b6 jamvm-1.2.4.ebuild 1025
+MD5 f45e9211ca388c61328acdd200c8ad99 jamvm-1.2.3.ebuild 970
+MD5 2945a6076a08046fc902dba3463c6f41 jamvm-1.3.1.ebuild 1010
 MD5 676ce38d9aaeac3b9be0cb1d0792f59a ChangeLog 1428
 MD5 0637a933ecb6e8cedfc4ddfcf3491728 metadata.xml 310
-MD5 f45e9211ca388c61328acdd200c8ad99 jamvm-1.2.3.ebuild 970
-MD5 6adaf91f84ee96d3c91fa09ff95494b6 jamvm-1.2.4.ebuild 1025
 MD5 1fb020b13aab9e7e57512d3c988668c6 jamvm-1.2.5.ebuild 1025
-MD5 2945a6076a08046fc902dba3463c6f41 jamvm-1.3.0.ebuild 1010
 MD5 993705327b355e08b0839151f016a3d6 files/1.2.2-classpath-fix.diff 521
-MD5 66c258ef4f621b8380d4a9c2d1e85d77 files/digest-jamvm-1.2.5 63
 MD5 930c3e600d634c8af438e364074b01a6 files/digest-jamvm-1.2.3 63
 MD5 30ef1b6a730ddccf8bdae58c108c2f60 files/digest-jamvm-1.2.4 63
+MD5 66c258ef4f621b8380d4a9c2d1e85d77 files/digest-jamvm-1.2.5 63
 MD5 d8fa2dd92bb4b41f8b46fc264520b13d files/digest-jamvm-1.3.0 63
+MD5 20671d3856aee61c12d02b0d26bab13a files/digest-jamvm-1.3.1 63
diff --git a/dev-java/jamvm/files/1.2.2-classpath-fix.diff b/dev-java/jamvm/files/1.2.2-classpath-fix.diff
deleted file mode 100644
index b6dd50962179..000000000000
--- a/dev-java/jamvm/files/1.2.2-classpath-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN jamvm-1.2.2-orig/src/dll.c jamvm-1.2.2/src/dll.c
---- jamvm-1.2.2-orig/src/dll.c	2004-12-14 06:10:53.000000000 +0100
-+++ jamvm-1.2.2/src/dll.c	2004-12-16 00:14:59.935865384 +0100
-@@ -149,7 +149,7 @@
-     int i;
- 
-     if(strncmp(CLASS_CB(mb->class)->name, "java/lang/", 10) != 0 &&
--       strncmp(CLASS_CB(mb->class)->name, "gnu/", 4) != 0 &&
-+       strncmp(CLASS_CB(mb->class)->name, "gnu/classpath/", 14) != 0 &&
-        strncmp(CLASS_CB(mb->class)->name, "java/security/", 14) != 0)
-         return NULL;
- 
diff --git a/dev-java/jamvm/files/digest-jamvm-1.2.3 b/dev-java/jamvm/files/digest-jamvm-1.2.3
deleted file mode 100644
index 5a7bc65128f6..000000000000
--- a/dev-java/jamvm/files/digest-jamvm-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b46e9d94d9d79156670740d3532fb727 jamvm-1.2.3.tar.gz 229530
diff --git a/dev-java/jamvm/files/digest-jamvm-1.2.4 b/dev-java/jamvm/files/digest-jamvm-1.2.4
deleted file mode 100644
index 11e75c43b4c2..000000000000
--- a/dev-java/jamvm/files/digest-jamvm-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdc75201ea84c2277e549f8bb5c55f77 jamvm-1.2.4.tar.gz 238912
diff --git a/dev-java/jamvm/files/digest-jamvm-1.2.5 b/dev-java/jamvm/files/digest-jamvm-1.2.5
deleted file mode 100644
index b6fda90aac5a..000000000000
--- a/dev-java/jamvm/files/digest-jamvm-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37cd3f623ee8f09f9b421733d9cce915 jamvm-1.2.5.tar.gz 243795
diff --git a/dev-java/jamvm/files/digest-jamvm-1.3.1 b/dev-java/jamvm/files/digest-jamvm-1.3.1
new file mode 100644
index 000000000000..5605399aae29
--- /dev/null
+++ b/dev-java/jamvm/files/digest-jamvm-1.3.1
@@ -0,0 +1 @@
+MD5 cceb887aec78fee99773949ede34759e jamvm-1.3.1.tar.gz 262770
diff --git a/dev-java/jamvm/jamvm-1.2.3.ebuild b/dev-java/jamvm/jamvm-1.2.3.ebuild
deleted file mode 100644
index 50e2a54b1282..000000000000
--- a/dev-java/jamvm/jamvm-1.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.2.3.ebuild,v 1.2 2005/01/24 15:55:32 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely small and specification-compliant Java virtual machine."
-HOMEPAGE="http://jamvm.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/jamvm/jamvm-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug"
-DEPEND=">=dev-java/gnu-classpath-0.12"
-RDEPEND=">=dev-java/gnu-classpath-0.12"
-
-src_compile() {
-	# compiles JamVM
-	cd ${S}
-
-	# configure adds "/share/classpath" itself
-	myc="--with-classpath-install-dir=/usr"
-	use debug && myc="${myc} --enable-tracelock"
-	econf ${myc} || die "configure failed."
-	emake || die "make failed."
-}
-
-src_install() {
-	make install-strip DESTDIR=${D} || die "installation failed."
-
-	# puts jni.h in a package dependent folder
-	cd ${D}usr/include
-	mkdir ${P}
-	mv jni.h ${P}
-}
diff --git a/dev-java/jamvm/jamvm-1.2.5.ebuild b/dev-java/jamvm/jamvm-1.2.5.ebuild
deleted file mode 100644
index ac5e40e8ea81..000000000000
--- a/dev-java/jamvm/jamvm-1.2.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.2.5.ebuild,v 1.2 2005/04/09 18:57:41 karltk Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely small and specification-compliant Java virtual machine."
-HOMEPAGE="http://jamvm.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/jamvm/jamvm-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug"
-DEPEND=">=dev-java/gnu-classpath-0.14"
-RDEPEND=">=dev-java/gnu-classpath-0.14"
-RESTRICT="nomirror"
-
-src_compile() {
-	# compiles JamVM
-	cd ${S}
-	filter-flags "-fomit-frame-pointer"
-
-	# configure adds "/share/classpath" itself
-	myc="--with-classpath-install-dir=/usr"
-	use debug && myc="${myc} --enable-tracelock"
-	econf ${myc} || die "configure failed."
-	emake || die "make failed."
-}
-
-src_install() {
-	make install-strip DESTDIR=${D} || die "installation failed."
-
-	# puts jni.h in a package dependent folder
-	cd ${D}usr/include
-	mkdir ${P}
-	mv jni.h ${P}
-}
diff --git a/dev-java/jamvm/jamvm-1.3.0.ebuild b/dev-java/jamvm/jamvm-1.3.0.ebuild
index 45ed3843d139..1891749fe629 100644
--- a/dev-java/jamvm/jamvm-1.3.0.ebuild
+++ b/dev-java/jamvm/jamvm-1.3.0.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.3.0.ebuild,v 1.3 2005/06/04 15:32:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.3.0.ebuild,v 1.4 2005/06/17 17:30:42 luckyduck Exp $
 
 inherit eutils
 
-DESCRIPTION="An extremely small and specification-compliant Java virtual machine."
+DESCRIPTION="An extremely small and specification-compliant virtual machine."
 HOMEPAGE="http://jamvm.sourceforge.net/"
-
 SRC_URI="mirror://sourceforge/jamvm/jamvm-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 IUSE="debug"
+
 DEPEND=">=dev-java/gnu-classpath-0.14"
 RDEPEND=">=dev-java/gnu-classpath-0.14"
 
diff --git a/dev-java/jamvm/jamvm-1.2.4.ebuild b/dev-java/jamvm/jamvm-1.3.1.ebuild
index 05ae0c43dd59..fc0b0b9deaae 100644
--- a/dev-java/jamvm/jamvm-1.2.4.ebuild
+++ b/dev-java/jamvm/jamvm-1.3.1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.2.4.ebuild,v 1.2 2005/04/09 18:57:41 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.3.1.ebuild,v 1.1 2005/06/17 17:30:42 luckyduck Exp $
 
 inherit eutils
 
-DESCRIPTION="An extremely small and specification-compliant Java virtual machine."
+DESCRIPTION="An extremely small and specification-compliant virtual machine."
 HOMEPAGE="http://jamvm.sourceforge.net/"
-
 SRC_URI="mirror://sourceforge/jamvm/jamvm-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="debug"
-DEPEND=">=dev-java/gnu-classpath-0.13"
-RDEPEND=">=dev-java/gnu-classpath-0.13"
-RESTRICT="nomirror"
+
+DEPEND=">=dev-java/gnu-classpath-0.15"
+RDEPEND=">=dev-java/gnu-classpath-0.15"
 
 src_compile() {
 	# compiles JamVM