From f0682fc86aba1dc1a4eb81aa8a4e8686b38725a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Wed, 14 Feb 2007 19:27:55 +0000 Subject: [PATCH] Use jikes-bin directly instead of the wrapper so that it's possible to emerge kaffe without a jdk already installed (bug #163801). Package-Manager: portage-2.1.2-r9 --- dev-java/kaffe/ChangeLog | 8 ++++++-- dev-java/kaffe/Manifest | 24 ++++++++++++------------ dev-java/kaffe/kaffe-1.1.7-r4.ebuild | 8 ++++---- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog index 3504b0b92183..30a2233a0f56 100644 --- a/dev-java/kaffe/ChangeLog +++ b/dev-java/kaffe/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/kaffe -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.65 2006/12/01 18:44:57 betelgeuse Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.66 2007/02/14 19:27:55 betelgeuse Exp $ + + 14 Feb 2007; Petteri Räty kaffe-1.1.7-r4.ebuild: + Use jikes-bin directly instead of the wrapper so that it's possible to + emerge kaffe without a jdk already installed (bug #163801). *kaffe-1.1.7-r4 (01 Dec 2006) diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest index df1315aeb919..2dfdc0181664 100644 --- a/dev-java/kaffe/Manifest +++ b/dev-java/kaffe/Manifest @@ -10,14 +10,14 @@ MD5 fd3b5d2c60b80250bd2c8ddb168fd369 files/kaffe.env 633 RMD160 cbd43938225ef62844bb8351e0fa22aefd34def8 files/kaffe.env 633 SHA256 ef69564ce3802f21355a09f2d9b4af8fb5e1af838abd36ee45d9f9304c8f5b2d files/kaffe.env 633 DIST kaffe-1.1.7.tar.bz2 10976055 RMD160 8f58ee1b9389f5a562f152dabeeeeb6072eb1d57 SHA1 b922d70419cc6bc0489912f9b826a40a9c8d5a91 SHA256 827f861c2d404a0fefed286f3691da61928b0d84e7d13eda8620d4fe47fa244c -EBUILD kaffe-1.1.7-r4.ebuild 3688 RMD160 e04278e917c71731a77b659cacb1f21fdb8f5bad SHA1 a69e01e45b921790ed80f9335d46b4496d7a4aa1 SHA256 7d7f0b8ff024cfb66cb8087f4eb7032549fe8caa584b7cfadd0eef7f999d8d72 -MD5 4ca01961fca2080ad7ed2ed1839d9790 kaffe-1.1.7-r4.ebuild 3688 -RMD160 e04278e917c71731a77b659cacb1f21fdb8f5bad kaffe-1.1.7-r4.ebuild 3688 -SHA256 7d7f0b8ff024cfb66cb8087f4eb7032549fe8caa584b7cfadd0eef7f999d8d72 kaffe-1.1.7-r4.ebuild 3688 -MISC ChangeLog 10509 RMD160 628c5368d5cdefcfaaa8f101de322f91e0b84a7a SHA1 af1f21f7275d849d50aecbeae55ee1e725c313f1 SHA256 5a33db596903e438f7e06adce754d5ae0c73bd59a448905aadf2a8dfb3024628 -MD5 950b5d62368f0c8af9051efe05b61f17 ChangeLog 10509 -RMD160 628c5368d5cdefcfaaa8f101de322f91e0b84a7a ChangeLog 10509 -SHA256 5a33db596903e438f7e06adce754d5ae0c73bd59a448905aadf2a8dfb3024628 ChangeLog 10509 +EBUILD kaffe-1.1.7-r4.ebuild 3718 RMD160 251cdd1df7eca5301fd0768ab430a1cfce078226 SHA1 05f53cf61a1654c50612f312b777879efe9e075e SHA256 be071cd14960c7b76b1b90142b339335ab701bfafefd180f554f344e8123cf4d +MD5 71e9d5e473114f6b768aae08443f47c4 kaffe-1.1.7-r4.ebuild 3718 +RMD160 251cdd1df7eca5301fd0768ab430a1cfce078226 kaffe-1.1.7-r4.ebuild 3718 +SHA256 be071cd14960c7b76b1b90142b339335ab701bfafefd180f554f344e8123cf4d kaffe-1.1.7-r4.ebuild 3718 +MISC ChangeLog 10721 RMD160 848f0c0872226d6810a55de677762db080ce1c26 SHA1 d1d2018c0809091ba2b14de612ea0be25b37e67a SHA256 870cdac54a6139b90c8deb2c224471406f8fa70d33c98cc1872c7aef6c100e5a +MD5 5ba52539208efd67c01a4f498d9ee7e0 ChangeLog 10721 +RMD160 848f0c0872226d6810a55de677762db080ce1c26 ChangeLog 10721 +SHA256 870cdac54a6139b90c8deb2c224471406f8fa70d33c98cc1872c7aef6c100e5a ChangeLog 10721 MISC metadata.xml 539 RMD160 ebed312bca45b48f276fef682112676a7db60291 SHA1 7ea3b80e47be90dbc1ee37581186a5b59483a3d8 SHA256 df08b5714a84814335206b660a04b3bba211d3d8fd3b7e9d9afba1be375754b6 MD5 6e04f926f281bd16bb09b7ae372fbaff metadata.xml 539 RMD160 ebed312bca45b48f276fef682112676a7db60291 metadata.xml 539 @@ -26,9 +26,9 @@ MD5 e336d26d231eefe5244cf5ed40f0a316 files/digest-kaffe-1.1.7-r4 244 RMD160 d22fe2ab8898f1e7f76b92e40825db8d3903c771 files/digest-kaffe-1.1.7-r4 244 SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/digest-kaffe-1.1.7-r4 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFcHgocxLzpIGCsLQRAn9mAJ9oVeoiGubwq788M4IxpQLm0W9biwCdHDWG -H9+yVbnDAW+Aq6nCGx3svlI= -=yGua +iD8DBQFF02LEcxLzpIGCsLQRAqCVAJ4iesfmI7JgrXqPbjB1b22NkGVqZQCbB/Eq +omOn4i3Ls7sfOSPRFZ8BFI0= +=4ox8 -----END PGP SIGNATURE----- diff --git a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild index f21e5adb8313..0f750eff589a 100644 --- a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild +++ b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.1 2006/12/01 18:44:57 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.2 2007/02/14 19:27:55 betelgeuse Exp $ JAVA_SUPPORTS_GENERATION_1="true" inherit base eutils java-vm-2 flag-o-matic @@ -19,7 +19,7 @@ DEPEND=" >=media-libs/jpeg-6b >=media-libs/libpng-1.2.1 app-arch/zip - dev-java/jikes + >=dev-java/jikes-1.22-r13 dev-libs/libxml2 sys-libs/zlib gtk? ( @@ -99,7 +99,7 @@ src_compile() { $(use_enable nls) \ $(use_enable gtk gtk-peer) \ ${confargs} \ - --with-jikes \ + --with-jikes=/usr/bin/jikes-bin \ --disable-gjdoc || die "Failed to configure." # --with-bcel -- 2.26.2