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

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 21 insertions, 23 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/Manifest b/dev-lang/helium/Manifest
index f33088fbfc69..e06aafb20ed5 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX helium-1.1-readline.patch 1710 RMD160 4254f4a102623bfe0fd2883937706abb83b5e61a SHA1 890f05fd7f02cd939e668d0df6c767fc17157c0e SHA256 9295cf427e3f52e418ccb9d5491057fc90df13b1ce8621657ccaf70741e61763
 AUX helium-1.2-libraries.patch 1943 RMD160 d4e074d29d8919a0f2e8333c93313e44fcf15ade SHA1 c1109d2823b31e39627784b130aa380f5224ad7a SHA256 6206b35d537d93a91bcfc374bf11831850190897e60761f4a68b71e9014b7eb6
 AUX helium-1.2-readline.patch 1661 RMD160 7fa5e4f9c8cd5daa7ac81720c2d7514efc4f3085 SHA1 4a35deefd9c5285acb88a7746f79b36041c6b7b9 SHA256 fcd69f6ed0a32769d156164597632e0d2dbfc8cf99b70da61d15e7b488525dfc
@@ -11,15 +8,8 @@ DIST helium-1.1-src.tar.gz 901073 RMD160 ecfd1fda99daf8f97262c27bac6ace3cd33da7a
 DIST helium-1.2-src.tar.gz 1200565 RMD160 213f8c90243aa6db1ed1f188b131f7c7b8235f35 SHA1 de54d5b6275f2f3326f047180b507928e6ec182e SHA256 474aa26e2a92545d64158ea88440b5d5a7758318a0b34dbded4cc20814099bb0
 DIST helium-1.6-ghc.patch.bz2 34579 RMD160 7754353e882d233533011f7e7be0bc92c01b83d0 SHA1 3be01c237bba001c0ed5bfe97cfbaac25aff05c0 SHA256 da463fe2a27689ec702eaf7c687446272f983845228cbb45d0fa91e1542cd7ab
 DIST helium-1.6-src.tar.gz 960254 RMD160 9700dde4b77adb73825965c00cdc02d3e1f6fab6 SHA1 9e1d43d25c92f86c57fe5864e26365923dcfe98c SHA256 a93632d031a16c0ea516f4fa7ce63acd0950543c74265e22abd0993856a0a053
-EBUILD helium-1.1.ebuild 1845 RMD160 86778dd7ee8d9f57d95ef127b5d1f77b188b0e91 SHA1 5bb6a43b781dc0e0298f37af4af2fcd10fe7ffa6 SHA256 0b2755fd80f99db0f1d8aca14aadfb45ae45ddf635892d6e382a172c255cb835
-EBUILD helium-1.2-r1.ebuild 2253 RMD160 3fbc6ce598434fd8d268a73bba2c305e7a6ee3cf SHA1 89a66e8873d324bcb24716b01b83c69361e75ca7 SHA256 57dfc539ab0923ab1e6af2f004c6680fcfb1b809f3d60ee739782c95ff46ad69
+EBUILD helium-1.1.ebuild 1894 RMD160 1a0666daade3bb6f3be442e94ec5065da26ff401 SHA1 b769456ef3ef58e64ed7ccce3aa310dad5fcf0b6 SHA256 4186c2d6a69a479cf966e8ef224bab145f86c4fd6f03533d1456b3a0f996d103
+EBUILD helium-1.2-r1.ebuild 2303 RMD160 1145867666122311a3efee2fd1b5c798022d8b89 SHA1 f7d9e78550d7f9000ba81628d6602cd597b7fbae SHA256 efa8d8aca10d84d52971adb293e13a73b32b528e060a8732dcec6740c2e91245
 EBUILD helium-1.6.ebuild 1771 RMD160 1a25bb2aeb4d26c3901222dc60eab062a24989dc SHA1 7f9fdc814dfc903442b6e83e69954d37d49f1a04 SHA256 999d37f92372b85e154bc7ec0f2cdab13e27b29566894e125335480db69595a8
-MISC ChangeLog 3274 RMD160 c30f9b342b10dcb60ab4203a1711b604722bf75d SHA1 4b99808ae3aca97760c34cd1948faff736b32bc2 SHA256 58c51c25f5be755da2d77f5bb4cb5c242fee85e903af08ebb6ce3e076df3c1fc
+MISC ChangeLog 3402 RMD160 a3fc8e4311bf3c820b5c5184174f64dae46e9203 SHA1 b22fea6e2d6fe794dddfad64d69807d42f7d45d7 SHA256 0619606b85462a02ee57713f0c324afc3f9a3e62cbf7244d6fb68c5ff55488dc
 MISC metadata.xml 161 RMD160 f485b248c733c0ef48ebe461e56d10631182864d SHA1 e3539af233f1a90c2470823747cae37ab10d5b2e SHA256 f560c0c2c8a2f2ca3c0c03e1836e16da7085b32ea60e03d9add5e405dac9f004
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH19NFyuNVb5qfaOYRAnzsAJ40bdcFGkhWRyKeclFKXz6/fhVBuQCgsOjx
-q7UVkT5XLv60vTkY8uOkMR4=
-=VUEB
------END PGP SIGNATURE-----
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