summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/jamvm/ChangeLog5
-rw-r--r--dev-java/jamvm/jamvm-1.4.4.ebuild10
-rw-r--r--dev-java/jamvm/metadata.xml10
3 files changed, 9 insertions, 16 deletions
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index 7ae1ba9fe17c..2eb6c21ac1e0 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jamvm
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.22 2006/11/19 20:00:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.23 2006/11/19 22:10:50 betelgeuse Exp $
+
+ 19 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.4.4.ebuild:
+ Fixed gnu-classpath dependency atom to only match the 0.92 slot.
19 Nov 2006; Joshua Nichols <nichoj@gentoo.org> jamvm-1.4.4.ebuild:
Added PDEPEND to make sure javac (ecj) and javadoc (gjdoc) work properly.
diff --git a/dev-java/jamvm/jamvm-1.4.4.ebuild b/dev-java/jamvm/jamvm-1.4.4.ebuild
index c2791d5c16d3..2995ce7bc7dc 100644
--- a/dev-java/jamvm/jamvm-1.4.4.ebuild
+++ b/dev-java/jamvm/jamvm-1.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.4.4.ebuild,v 1.2 2006/11/19 20:00:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.4.4.ebuild,v 1.3 2006/11/19 22:10:50 betelgeuse Exp $
inherit eutils flag-o-matic multilib java-vm-2
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug"
-RDEPEND=">=dev-java/gnu-classpath-0.19
+RDEPEND="=dev-java/gnu-classpath-0.92*
dev-libs/libffi"
DEPEND="${DEPEND}"
PDEPEND="=dev-java/eclipse-ecj-3.2* dev-java/gjdoc"
@@ -21,14 +21,12 @@ PDEPEND="=dev-java/eclipse-ecj-3.2* dev-java/gjdoc"
src_compile() {
filter-flags "-fomit-frame-pointer"
- # make sure configure can find libffi
- export CPPFLAGS="-I/usr/lib/libffi"
- export LDFLAGS="-L/usr/$(get_libdir)/libffi"
# configure adds "/share/classpath" itself
# includedir puts jni.h in a package dependent folder
local myc="--with-classpath-install-dir=/opt/gnu-classpath-0.92
- --includedir=/usr/include/${PN}"
+ --includedir=/usr/include/${PN}"
use debug && myc="${myc} --enable-trace"
+
econf ${myc} || die "configure failed."
emake || die "make failed."
}
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
index b615199f2e6b..e80ed52a09bd 100644
--- a/dev-java/jamvm/metadata.xml
+++ b/dev-java/jamvm/metadata.xml
@@ -2,13 +2,5 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<maintainer>
- <email>karltk@gentoo.org</email>
- <description>Primary maintainer</description>
-</maintainer>
-
-<longdescription>
-
-</longdescription>
+ <herd>java</herd>
</pkgmetadata>