From 33f15e15d83994710eebb78b75dd7335ad3a4792 Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Thu, 8 Mar 2007 00:08:26 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.1.2-r12 --- dev-java/jruby/ChangeLog | 8 +- dev-java/jruby/Manifest | 30 ++++--- dev-java/jruby/files/digest-jruby-0.9.8 | 3 + .../jruby/files/jruby-0.9.8-old_jline.patch | 17 ++++ dev-java/jruby/jruby-0.9.8.ebuild | 87 +++++++++++++++++++ 5 files changed, 130 insertions(+), 15 deletions(-) create mode 100644 dev-java/jruby/files/digest-jruby-0.9.8 create mode 100644 dev-java/jruby/files/jruby-0.9.8-old_jline.patch create mode 100644 dev-java/jruby/jruby-0.9.8.ebuild diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index fe8e50cc5baf..1e6a294ce8a3 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,12 @@ # 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.13 2007/02/18 17:50:32 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.14 2007/03/08 00:08:26 nichoj Exp $ + +*jruby-0.9.8 (08 Mar 2007) + + 08 Mar 2007; Joshua Nichols + +files/jruby-0.9.8-old_jline.patch, +jruby-0.9.8.ebuild: + Version bump. 18 Feb 2007; Petteri Räty -jruby-0.9.0.ebuild, -jruby-0.9.1.ebuild: diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 153cf5d95a74..7a78427bbbf0 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX jruby-0.9.1-build.xml.patch 1077 RMD160 f900cc14b62f612851e3f8bc318be78af76a275e SHA1 70a6d9b46ad404068b1b74b9a51b8d0185704d62 SHA256 84be93ae37090a2d7f9fcf969804a9748103420a62695eca79939e224fb7ed5d MD5 8e75e6f804e6ea96e4bf8ddbc07b514a files/jruby-0.9.1-build.xml.patch 1077 RMD160 f900cc14b62f612851e3f8bc318be78af76a275e files/jruby-0.9.1-build.xml.patch 1077 @@ -13,8 +10,13 @@ AUX jruby-0.9.2-old_jline.patch 876 RMD160 63d9605afd243752b92f17e4637c1419fbf9d MD5 5ec40b3dc92d2a9244ec0fbd0abf51c2 files/jruby-0.9.2-old_jline.patch 876 RMD160 63d9605afd243752b92f17e4637c1419fbf9d3bf files/jruby-0.9.2-old_jline.patch 876 SHA256 fd5c26f049e0c2a22947592638c8d19e9e92a750026d25102ea93343c5253ebb files/jruby-0.9.2-old_jline.patch 876 +AUX jruby-0.9.8-old_jline.patch 1020 RMD160 8bdf0893d1e36a4aeb7fa909123f3f3007b6b548 SHA1 b5932e73a78c3798d2002c926eff255b98a173bf SHA256 b4fcc4065eec04fc119b81404e27d627e3bcd1f46e8314cd782d67f2605d928a +MD5 e7c7e9eee8434ad42fd04b29a5d4418e files/jruby-0.9.8-old_jline.patch 1020 +RMD160 8bdf0893d1e36a4aeb7fa909123f3f3007b6b548 files/jruby-0.9.8-old_jline.patch 1020 +SHA256 b4fcc4065eec04fc119b81404e27d627e3bcd1f46e8314cd782d67f2605d928a files/jruby-0.9.8-old_jline.patch 1020 DIST jruby-src-0.7.0.tar.gz 1872867 RMD160 6fcff75d74c3a93e18c3a424761afc00674070cb SHA1 a874cd90e1937ea757d6bd7d5ec85feee8f0db2a SHA256 4e200a32b0582021e9fbc93faaa16f25198cf496c44d4df635e9282dde647dce DIST jruby-src-0.9.2.tar.gz 4696196 RMD160 cadcd4b1b3fab3695f60c854257a5e45d0fa892f SHA1 d561dcbe6b1611dc7cf0b431b03f5a26c30eba0c SHA256 306276034c7d9dd37618ff31aa3a600bd38371edb8d2e0fb58dfa54af879e132 +DIST jruby-src-0.9.8.tar.gz 4671287 RMD160 b0e7a17462d4b0ac47edb7adc1595336f1bc5a35 SHA1 f76130ea2927eb4daf0cd7d7920a09fb501b45fe SHA256 a85fbd888b4c4ca740e18937acb92885045b3366bcd0eea7958c432cbe279871 EBUILD jruby-0.7.0-r1.ebuild 1402 RMD160 9459f6dff3ed01cfd38628b84acd3c9f840b37c9 SHA1 a7bf4edd08dafe2b13ca73bd7eef5acd56637dd6 SHA256 d476b5c3bf6f6af593647a31e8b10e6e78553086a9a0105f59e75bebef4cf5db MD5 14bd7f98d0a9fe324445918a8924f55e jruby-0.7.0-r1.ebuild 1402 RMD160 9459f6dff3ed01cfd38628b84acd3c9f840b37c9 jruby-0.7.0-r1.ebuild 1402 @@ -23,10 +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 -MISC ChangeLog 2049 RMD160 6c6700cfdd68bfcb2d7647e4ca234a2ce36457a3 SHA1 34a300292b519cea06c1ebada1943a7dfbd5244c SHA256 9c6b1c58bf63cdce0fb85d61ab5ab82af63e7abb01d86f535d06bc8b57d1ffe2 -MD5 da07e6c63ac72f729c38493b15cc39d8 ChangeLog 2049 -RMD160 6c6700cfdd68bfcb2d7647e4ca234a2ce36457a3 ChangeLog 2049 -SHA256 9c6b1c58bf63cdce0fb85d61ab5ab82af63e7abb01d86f535d06bc8b57d1ffe2 ChangeLog 2049 +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 2199 RMD160 b71d032f8baf5eb90638f8d32179c352d5007e2b SHA1 e30490cf51521a03373b3ce3c0301b9798462292 SHA256 c827f218d460400ce1332d783b02f6c9b6f6b09e5cd65e8e387f75c81e09020b +MD5 cbed2d3ff7e70f4abf9d1d22bd19268e ChangeLog 2199 +RMD160 b71d032f8baf5eb90638f8d32179c352d5007e2b ChangeLog 2199 +SHA256 c827f218d460400ce1332d783b02f6c9b6f6b09e5cd65e8e387f75c81e09020b ChangeLog 2199 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252 @@ -37,10 +43,6 @@ SHA256 9409bf31ef149eab6910f5a13e40b4710bd06c3812c21ffb7c60850c2ccbce63 files/di MD5 d821886802878290cc65cb99e421e7e2 files/digest-jruby-0.9.2 250 RMD160 32ef28324d9b66833e8d6fabbe9f3d600e8b8221 files/digest-jruby-0.9.2 250 SHA256 eb7f9b1cd6013132d6ec6901b30b014f546a792932bc31369894f7d59e7d8135 files/digest-jruby-0.9.2 250 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF2JE+cxLzpIGCsLQRAoctAJ4iIbekx1uMPUI3QrayhJhvhy1NtQCfSiBm -FvESmFo8G2ok9YLY4E10tFM= -=2hw/ ------END PGP SIGNATURE----- +MD5 ce78080953acfd4a8a6a2271190f6e3a files/digest-jruby-0.9.8 250 +RMD160 fad0401ed61b97342d300d0dcdb0edc1f4f13f6b files/digest-jruby-0.9.8 250 +SHA256 bb18e573a2279e0efea98b153bb74269c95cd2c9c4cc7b48fdec90ba9e9fef56 files/digest-jruby-0.9.8 250 diff --git a/dev-java/jruby/files/digest-jruby-0.9.8 b/dev-java/jruby/files/digest-jruby-0.9.8 new file mode 100644 index 000000000000..71a56f05491c --- /dev/null +++ b/dev-java/jruby/files/digest-jruby-0.9.8 @@ -0,0 +1,3 @@ +MD5 cd7c531aecae4766f2e24f373faabba0 jruby-src-0.9.8.tar.gz 4671287 +RMD160 b0e7a17462d4b0ac47edb7adc1595336f1bc5a35 jruby-src-0.9.8.tar.gz 4671287 +SHA256 a85fbd888b4c4ca740e18937acb92885045b3366bcd0eea7958c432cbe279871 jruby-src-0.9.8.tar.gz 4671287 diff --git a/dev-java/jruby/files/jruby-0.9.8-old_jline.patch b/dev-java/jruby/files/jruby-0.9.8-old_jline.patch new file mode 100644 index 000000000000..49a82dfa9a4d --- /dev/null +++ b/dev-java/jruby/files/jruby-0.9.8-old_jline.patch @@ -0,0 +1,17 @@ +diff -ru jruby-0.9.8/src/org/jruby/ext/Readline.java jruby-0.9.8-patched/src/org/jruby/ext/Readline.java +--- jruby-0.9.8/src/org/jruby/ext/Readline.java 2007-03-05 18:42:13.000000000 -0500 ++++ jruby-0.9.8-patched/src/org/jruby/ext/Readline.java 2007-03-07 08:48:25.000000000 -0500 +@@ -85,11 +85,11 @@ + protected static void initReadline() throws IOException { + readline = new ConsoleReader(); + readline.setUseHistory(false); +- readline.setUsePagination(true); ++ //readline.setUsePagination(true); + readline.setBellEnabled(false); +- ((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false); ++ //((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false); + if (currentCompletor == null) + currentCompletor = new RubyFileNameCompletor(); + readline.addCompletor(currentCompletor); + history = readline.getHistory(); + readline.setHistory(history); diff --git a/dev-java/jruby/jruby-0.9.8.ebuild b/dev-java/jruby/jruby-0.9.8.ebuild new file mode 100644 index 000000000000..ed2cf5d44f64 --- /dev/null +++ b/dev-java/jruby/jruby-0.9.8.ebuild @@ -0,0 +1,87 @@ +# 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 $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Java based ruby interpreter implementation" +HOMEPAGE="http://jruby.codehaus.org/" +SRC_URI="http://dist.codehaus.org/${PN}/${PN}-src-${PV}.tar.gz" + +LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc source test" + +COMMON_DEPEND=">=dev-java/jvyaml-0.2 + dev-java/jline + =dev-java/asm-2.2* + =dev-java/bsf-2.3*" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEPEND}" +DEPEND=">=virtual/jdk-1.4 + !test? ( dev-java/ant-core ) + test? ( + dev-java/junit + dev-java/ant + ) + source? ( app-arch/zip ) + ${COMMON_DEPEND}" + +EANT_DOC_TARGET="create-apidocs" + +src_unpack() { + unpack ${A} + cd ${S} + + # 0.9.2 was using a version of jline which hasn't been released, which has + # a few new methods. disabling calls to those methods, but shouldn't affect + # usablility. see + # http://jira.codehaus.org/browse/JRUBY-383 + epatch ${FILESDIR}/${P}-old_jline.patch + # fix javadoc, make tests halt on failure + #epatch ${FILESDIR}/${PN}-0.9.2-haltonfailure.patch + + cd lib + + java-pkg_jar-from --build-only ant-core ant.jar + java-pkg_jar-from asm-2.2 asm.jar + java-pkg_jar-from asm-2.2 asm-commons.jar + java-pkg_jar-from bsf-2.3 + java-pkg_jar-from jvyaml + java-pkg_jar-from jline + use test && java-pkg_jar-from --build-only junit +} + +src_install() { + java-pkg_dojar "lib/${PN}.jar" + + dodoc README COPYING COPYING.CPL COPYING.GPL COPYING.LGPL + + if use doc; then + java-pkg_dojavadoc docs/api + docinto docs + dodoc docs/* + fi + use source && java-pkg_dosrc src/org + java-pkg_dolauncher ${PN} \ + --main 'org.jruby.Main' \ + --java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh' + newbin ${S}/bin/gem jgem + newbin ${S}/bin/gem_server jgem_server + newbin ${S}/bin/gemlock jgem_lock + newbin ${S}/bin/gemri jgemri + newbin ${S}/bin/gemwhich jgemwhich + newbin ${S}/bin/update_rubygems jupdate_rubygems +# newbin ${S}/bin/generate_yaml_index.rb jgenerate_yaml_index.rb + newbin ${S}/bin/index_gem_repository.rb jindex_gem_repository.rb + dobin ${S}/bin/jirb + + dodir "/usr/share/${PN}/lib" + insinto "/usr/share/${PN}/lib" + doins -r "${S}/lib/ruby" +} + +src_test() { + eant test +} -- 2.26.2