Migrate to gen-2 java eclasses, bug #161426.

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 18 insertions, 10 deletions

diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index d5ee38896866..6b39014817af 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/helium
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.22 2008/03/12 12:57:36 phreak Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.23 2009/04/17 20:07:20 caster Exp $
+
+  17 Apr 2009; Vlastimil Babka <caster@gentoo.org> helium-1.1,
+  helium-1.2-r1:
+  Migrate to gen-2 java eclasses, bug #161426.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Andres Loeh (kosmikus, #200333) from metadata.xml.
diff --git a/dev-lang/helium/helium-1.1.ebuild b/dev-lang/helium/helium-1.1.ebuild
index e7360de8fe43..595416dcfaaf 100644
--- a/dev-lang/helium/helium-1.1.ebuild
+++ b/dev-lang/helium/helium-1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.20 2007/10/31 13:22:01 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.21 2009/04/17 20:07:20 caster Exp $
 
-inherit java-pkg
+inherit java-pkg-2
 
 DESCRIPTION="Helium (for learning Haskell)"
 HOMEPAGE="http://www.cs.uu.nl/helium"
@@ -17,7 +17,7 @@ IUSE="readline"
 DEPEND="<dev-lang/ghc-6.4
 	!>=dev-lang/ghc-6.4
 	readline? ( sys-libs/readline )"
-RDEPEND="virtual/jdk
+RDEPEND=">=virtual/jre-1.4
 	dev-libs/gmp
 	readline? ( sys-libs/readline )"
 
@@ -33,6 +33,8 @@ src_unpack() {
 	cd ${S}/parsec
 	mv ParsecPerm.hs ParsecPerm.hs.orig
 	sed -e 's/(\$/(\$ /' ParsecPerm.hs.orig > ParsecPerm.hs
+
+	cp "${DISTDIR}/Hint.jar" "${WORKDIR}"
 }
 
 src_compile() {
@@ -56,7 +58,7 @@ src_install() {
 		demodir=${D}/usr/lib/helium/demo \
 		install || die
 	# install hint
-	java-pkg_dojar ${DISTDIR}/Hint.jar
+	java-pkg_dojar "${WORKDIR}/Hint.jar"
 	# create wrappers
 	dobin ${FILESDIR}/helium-wrapper
 	dosym /usr/bin/helium-wrapper /usr/bin/helium
diff --git a/dev-lang/helium/helium-1.2-r1.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild
index f004fd46c6d2..a441f82c5c34 100644
--- a/dev-lang/helium/helium-1.2-r1.ebuild
+++ b/dev-lang/helium/helium-1.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.9 2007/10/31 13:22:01 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.10 2009/04/17 20:07:20 caster Exp $
 
-inherit eutils java-pkg
+inherit eutils java-pkg-2
 
 DESCRIPTION="Helium (for learning Haskell)"
 HOMEPAGE="http://www.cs.uu.nl/helium"
@@ -17,7 +17,7 @@ IUSE="readline"
 DEPEND="<dev-lang/ghc-6.4
 	!>=dev-lang/ghc-6.4
 	readline? ( sys-libs/readline )"
-RDEPEND="virtual/jdk
+RDEPEND=">=virtual/jre-1.4
 	dev-libs/gmp
 	readline? ( sys-libs/readline )"
 
@@ -30,6 +30,8 @@ src_unpack() {
 	if use readline; then
 		epatch ${FILESDIR}/${P}-readline.patch
 	fi
+
+	cp "${DISTDIR}/Hint.jar" "${WORKDIR}"
 }
 
 src_compile() {
@@ -57,7 +59,7 @@ src_install() {
 		demodir=${D}/usr/lib/helium/demo \
 		install || die "make failed"
 	# install hint
-	java-pkg_dojar ${DISTDIR}/Hint.jar
+	java-pkg_dojar "${WORKDIR}/Hint.jar"
 	# create wrappers
 	dobin ${FILESDIR}/helium-wrapper
 	dosym /usr/bin/helium-wrapper /usr/bin/helium