From 99a71985759bb0a7533f4e3b54f6212ce663e1da Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Thu, 8 Mar 2007 04:52:36 +0000 Subject: [PATCH] Now will only use javac for compilation. See http://jira.codehaus.org/browse/JRUBY-675 for details. Package-Manager: portage-2.1.2-r12 --- dev-java/jruby/ChangeLog | 6 +++++- dev-java/jruby/Manifest | 16 ++++++++-------- dev-java/jruby/jruby-0.9.8.ebuild | 5 ++++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 8ec3d899065a..f5316524009a 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.15 2007/03/08 03:00:41 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.16 2007/03/08 04:52:36 nichoj Exp $ + + 08 Mar 2007; Joshua Nichols jruby-0.9.8.ebuild: + Now will only use javac for compilation. See + http://jira.codehaus.org/browse/JRUBY-675 for details. 08 Mar 2007; Joshua Nichols files/jruby-0.9.8-old_jline.patch: diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 1219d97fc23b..5d3b46b31b95 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -25,14 +25,14 @@ EBUILD jruby-0.9.2.ebuild 2529 RMD160 c3f3999b71c949d825f6a1e7a70fb6eb2fac4bad S MD5 9b585732ec81eade836e05d58687dd34 jruby-0.9.2.ebuild 2529 RMD160 c3f3999b71c949d825f6a1e7a70fb6eb2fac4bad jruby-0.9.2.ebuild 2529 SHA256 662fc2179cc4eef126046941957f82dad33b92f43f7f2283c89a00344b0c1cf6 jruby-0.9.2.ebuild 2529 -EBUILD jruby-0.9.8.ebuild 2420 RMD160 882dc8b564e05487d401aee97d841f573e94a948 SHA1 8aa9a2e531f012e5a93be050db68ff22a3b9039a SHA256 508c2578c336f62da9906ac6167766417ba3b6ec1b691b2f9d1f2b3103ae9bae -MD5 25c99e98702af123ae5e7f174b39e2f5 jruby-0.9.8.ebuild 2420 -RMD160 882dc8b564e05487d401aee97d841f573e94a948 jruby-0.9.8.ebuild 2420 -SHA256 508c2578c336f62da9906ac6167766417ba3b6ec1b691b2f9d1f2b3103ae9bae jruby-0.9.8.ebuild 2420 -MISC ChangeLog 2306 RMD160 50800856ce62ae30527557ba9d2247a660626916 SHA1 14ddb57cc6ec22b674d65b0815b2b474ca00be7f SHA256 f6b85ebcaf59f0ec91a85c17b0345dc29b5319918b54b81835cffaa125095a7a -MD5 290b51f3d9a7b55740222fd0f3fae74b ChangeLog 2306 -RMD160 50800856ce62ae30527557ba9d2247a660626916 ChangeLog 2306 -SHA256 f6b85ebcaf59f0ec91a85c17b0345dc29b5319918b54b81835cffaa125095a7a ChangeLog 2306 +EBUILD jruby-0.9.8.ebuild 2532 RMD160 4a16a23f6b584109adf1dee6bd71af4929664f58 SHA1 4a099b77227ecc4f43035d901a9a2975e5d2b31f SHA256 1b756d3d4bb21563010a4b5e1e35aec4ed2f7ea5aa92b9140223e2c746a59a4c +MD5 8b68837369094aeb14d9898949ce772a jruby-0.9.8.ebuild 2532 +RMD160 4a16a23f6b584109adf1dee6bd71af4929664f58 jruby-0.9.8.ebuild 2532 +SHA256 1b756d3d4bb21563010a4b5e1e35aec4ed2f7ea5aa92b9140223e2c746a59a4c jruby-0.9.8.ebuild 2532 +MISC ChangeLog 2481 RMD160 346726a5ea0b4d0612f14a339572fd188e796c2e SHA1 8dbd96e81124cbf64c7d172f8575debe5a19fe7d SHA256 39d6b1ff13789a7d18a375fe7ca2c5d941587c56b33fc9462f44dab605a03536 +MD5 a13b8c30e1b49591e1cf7b4b8fcfbc45 ChangeLog 2481 +RMD160 346726a5ea0b4d0612f14a339572fd188e796c2e ChangeLog 2481 +SHA256 39d6b1ff13789a7d18a375fe7ca2c5d941587c56b33fc9462f44dab605a03536 ChangeLog 2481 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252 diff --git a/dev-java/jruby/jruby-0.9.8.ebuild b/dev-java/jruby/jruby-0.9.8.ebuild index ed2cf5d44f64..cb1d32220459 100644 --- a/dev-java/jruby/jruby-0.9.8.ebuild +++ b/dev-java/jruby/jruby-0.9.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.9.8.ebuild,v 1.1 2007/03/08 00:08:26 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.9.8.ebuild,v 1.2 2007/03/08 04:52:36 nichoj Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -30,6 +30,9 @@ DEPEND=">=virtual/jdk-1.4 EANT_DOC_TARGET="create-apidocs" +# only use javac, see http://jira.codehaus.org/browse/JRUBY-675 +java-pkg_filter-compiler ecj-3.2 ecj-3.1 jikes + src_unpack() { unpack ${A} cd ${S} -- 2.26.2