Revision bump to address #170058 and to use recently released jline-0.9.91 so we...

Package-Manager: portage-2.1.2-r12

diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
new file mode 100644 (file)
index 0000000..2914d75
--- /dev/null
+++ b/dev-java/browserlauncher2/Manifest
@@ -0,0 +1,16 @@
+DIST BrowserLauncher2-all-10.jar 165855 RMD160 c401ffffdf95adc712e063547123e42623bcaeb5 SHA1 cd76c5a1ed5a8a86c10f3536e6409c3366e24ecd SHA256 b02238af43e3d2b44d3c3208cc75bacc3f46846e2f0f060427cd32e95094ca6b
+EBUILD browserlauncher2-1.0.ebuild 1178 RMD160 f789d334b1c6d6d20b7b25f41fb068bebe66614c SHA1 dd06b3be1c45a5635bae8db26bd076625723299f SHA256 831cb793f34774f35fb54f61ba5a1fa720133f69f3ea8dadb9ed8dc393fde99f
+MD5 e03228ec103ae37c6ad6ff3c1c60258e browserlauncher2-1.0.ebuild 1178
+RMD160 f789d334b1c6d6d20b7b25f41fb068bebe66614c browserlauncher2-1.0.ebuild 1178
+SHA256 831cb793f34774f35fb54f61ba5a1fa720133f69f3ea8dadb9ed8dc393fde99f browserlauncher2-1.0.ebuild 1178
+MISC ChangeLog 383 RMD160 112f91fd21c57690d25e399842a434f9cfc42b69 SHA1 13d9f2f82d61cdd4dd36f61abf9e8ca4b54f2162 SHA256 627f7654d131502016997ca615d226b9a78b44bb3a729d40f1d8a82dd65b5680
+MD5 98bf3541cb998971839aff24a73ea1f8 ChangeLog 383
+RMD160 112f91fd21c57690d25e399842a434f9cfc42b69 ChangeLog 383
+SHA256 627f7654d131502016997ca615d226b9a78b44bb3a729d40f1d8a82dd65b5680 ChangeLog 383
+MISC metadata.xml 565 RMD160 7fd13a5c2aaf6e85e2328ccae7c13b603880d004 SHA1 735c11efb829d1d5a30ef0fa6d88974914e12e18 SHA256 34a697b2b62ca221cfedd078b82ee85519be81acb8719c011eda098ced232c67
+MD5 b68c1a9727dc7182002fe9941df53a43 metadata.xml 565
+RMD160 7fd13a5c2aaf6e85e2328ccae7c13b603880d004 metadata.xml 565
+SHA256 34a697b2b62ca221cfedd078b82ee85519be81acb8719c011eda098ced232c67 metadata.xml 565
+MD5 7f1104976e0b212800f4e1f988ef04bc files/digest-browserlauncher2-1.0 262
+RMD160 04e47da994489a2a475c7722a3f9f4665c32b03d files/digest-browserlauncher2-1.0 262
+SHA256 f89a5a80f2f91a0255acd5691f71dd7c97557c138490685541ed3e67427822be files/digest-browserlauncher2-1.0 262

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 0bed33d8cad36d7227e55f4ffe9f39b0d49be5b4..be11540b32481f3a0b74f2274179e31699d32a2b 100644 (file)
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2007/03/09 13:46:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.18 2007/03/11 20:15:10 nichoj Exp $
+
+*jruby-0.9.8-r1 (11 Mar 2007)
+
+  11 Mar 2007; Joshua Nichols <nichoj@gentoo.org>
+  +files/jruby-0.9.8-sandbox.patch, +jruby-0.9.8-r1.ebuild:
+  Revision bump to address #170058 and to use recently released jline-0.9.91
+  so we have one less patch to apply.
 
   09 Mar 2007; Joshua Nichols <nichoj@gentoo.org> jruby-0.9.8.ebuild:
   Removed bundled jars while building.

diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index e27e1ddd69873ef418eb87bba7eaf676b9bf7294..b553e5021658bb9e691dd5c65ba45576312581a9 100644 (file)
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -14,6 +14,10 @@ AUX jruby-0.9.8-old_jline.patch 1004 RMD160 d8d3022e5561e7d4694b9461aa37afcca5b2
 MD5 80595981802ba7bed2f57694ae2d00c8 files/jruby-0.9.8-old_jline.patch 1004
 RMD160 d8d3022e5561e7d4694b9461aa37afcca5b20fa4 files/jruby-0.9.8-old_jline.patch 1004
 SHA256 8c1c66fdf77ed43a059fe58fb3bdc21baeb5ba33156d1e9ed043869bc4c43b99 files/jruby-0.9.8-old_jline.patch 1004
+AUX jruby-0.9.8-sandbox.patch 522 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db SHA1 9d983c1bd7cb35239d85af445f5aa7c5d1c143a3 SHA256 1c2701881674a978c9ddc32e2e126cf25690e86011c6301e7f825407fb5810a2
+MD5 898463cbef30f1c337df6dca781ba83d files/jruby-0.9.8-sandbox.patch 522
+RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db files/jruby-0.9.8-sandbox.patch 522
+SHA256 1c2701881674a978c9ddc32e2e126cf25690e86011c6301e7f825407fb5810a2 files/jruby-0.9.8-sandbox.patch 522
 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
@@ -25,14 +29,18 @@ 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-r1.ebuild 2532 RMD160 241ecbc3f9791797eb567eb27829a29e9f9f6b54 SHA1 cc6a28f91cb4c53413b531b74840a325087bee2d SHA256 c513bc539a9a253a12cf007b47ee5a68cac358e58c5850268795e4f7dd726320
+MD5 9606ddd06f02694020ff732712926dfc jruby-0.9.8-r1.ebuild 2532
+RMD160 241ecbc3f9791797eb567eb27829a29e9f9f6b54 jruby-0.9.8-r1.ebuild 2532
+SHA256 c513bc539a9a253a12cf007b47ee5a68cac358e58c5850268795e4f7dd726320 jruby-0.9.8-r1.ebuild 2532
 EBUILD jruby-0.9.8.ebuild 2542 RMD160 d46dedf57c162047e8f447e2f3801aff82be5e87 SHA1 3f13e50972cdc9a5a6dcfb75422678e401337416 SHA256 345f6246a2aec7eaa4d70c25f9831573fb45134c0490d737b6e8c47e04d1e832
 MD5 3098b534943b3299c5395dcf111e3f1c jruby-0.9.8.ebuild 2542
 RMD160 d46dedf57c162047e8f447e2f3801aff82be5e87 jruby-0.9.8.ebuild 2542
 SHA256 345f6246a2aec7eaa4d70c25f9831573fb45134c0490d737b6e8c47e04d1e832 jruby-0.9.8.ebuild 2542
-MISC ChangeLog 2591 RMD160 11772cd809708bb2741c018816f35e8b8148eb33 SHA1 31a768dc01303919df743cb3fa68b1b48d0d553c SHA256 ef80515d9abc92f904c3edcde34dd12dbdabe480d4e36eb802a182fbe62d7853
-MD5 97c0eaff918988535da9c688186d8735 ChangeLog 2591
-RMD160 11772cd809708bb2741c018816f35e8b8148eb33 ChangeLog 2591
-SHA256 ef80515d9abc92f904c3edcde34dd12dbdabe480d4e36eb802a182fbe62d7853 ChangeLog 2591
+MISC ChangeLog 2848 RMD160 06fea4813f59fb5913630d62d9e341a4b51e05cb SHA1 6300f2f0741a7dbc5b4275e0c3a57ff9fd8ec227 SHA256 b36b774c3e6391075371dc03c7e7af82ce9da7f54b24eeb111708988e212bb02
+MD5 9ec15d3e9793360dce5ac6bf6d33fb9e ChangeLog 2848
+RMD160 06fea4813f59fb5913630d62d9e341a4b51e05cb ChangeLog 2848
+SHA256 b36b774c3e6391075371dc03c7e7af82ce9da7f54b24eeb111708988e212bb02 ChangeLog 2848
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -46,3 +54,6 @@ SHA256 eb7f9b1cd6013132d6ec6901b30b014f546a792932bc31369894f7d59e7d8135 files/di
 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
+MD5 ce78080953acfd4a8a6a2271190f6e3a files/digest-jruby-0.9.8-r1 250
+RMD160 fad0401ed61b97342d300d0dcdb0edc1f4f13f6b files/digest-jruby-0.9.8-r1 250
+SHA256 bb18e573a2279e0efea98b153bb74269c95cd2c9c4cc7b48fdec90ba9e9fef56 files/digest-jruby-0.9.8-r1 250

diff --git a/dev-java/jruby/files/digest-jruby-0.9.8-r1 b/dev-java/jruby/files/digest-jruby-0.9.8-r1
new file mode 100644 (file)
index 0000000..71a56f0
--- /dev/null
+++ b/dev-java/jruby/files/digest-jruby-0.9.8-r1
@@ -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-sandbox.patch b/dev-java/jruby/files/jruby-0.9.8-sandbox.patch
new file mode 100644 (file)
index 0000000..d7a436f
--- /dev/null
+++ b/dev-java/jruby/files/jruby-0.9.8-sandbox.patch
@@ -0,0 +1,11 @@
+diff -ru jruby-0.9.8/build.xml jruby-0.9.8-patched/build.xml
+--- jruby-0.9.8/build.xml      2007-03-05 18:44:49.000000000 -0500
++++ jruby-0.9.8-patched/build.xml      2007-03-11 15:54:01.000000000 -0400
+@@ -137,6 +137,7 @@
+       <classpath refid="build.classpath"/>
+       <classpath path="${jruby.classes.dir}"/>
+       <sysproperty key="jruby.dump_invocations" value="${jruby.classes.dir}"/>
++      <jvmarg value="-Djruby.home=${basedir}"/>
+       <arg value="-rjava"/>
+       <arg value="${build.dir}/__empty.rb"/>
+     </java>

diff --git a/dev-java/jruby/jruby-0.9.8-r1.ebuild b/dev-java/jruby/jruby-0.9.8-r1.ebuild
new file mode 100644 (file)
index 0000000..38af0d4
--- /dev/null
+++ b/dev-java/jruby/jruby-0.9.8-r1.ebuild
@@ -0,0 +1,92 @@
+# 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-r1.ebuild,v 1.1 2007/03/11 20:15:10 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-0.9.91
+       =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"
+
+# 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}
+       # prevents /root/.jruby being created at build time with
+       # FEATURES="-userpriv"
+       # see http://bugs.gentoo.org/show_bug.cgi?id=170058
+       epatch ${FILESDIR}/${P}-sandbox.patch
+
+       cd ${S}/lib
+       rm *.jar
+
+       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_compile() {
+#      addpredict /root/.jruby # http://bugs.gentoo.org/show_bug.cgi?id=170058
+       eant jar $(use_doc create-apidocs) -Djruby.home=${T}/.jruby
+}
+
+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
+}