From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rpx0b-0006o7-At for garchives@archives.gentoo.org; Wed, 25 Jan 2012 07:11:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35F9DE06F4; Wed, 25 Jan 2012 07:10:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E9060E06F4 for ; Wed, 25 Jan 2012 07:10:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DF361B401F for ; Wed, 25 Jan 2012 07:10:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 944BF80044 for ; Wed, 25 Jan 2012 07:10:51 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: Subject: [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/files/, dev-java/jruby/ X-VCS-Repository: proj/ruby-overlay X-VCS-Files: dev-java/jruby/ChangeLog dev-java/jruby/files/jruby-bash-launcher.patch dev-java/jruby/jruby-1.6.5.1.ebuild X-VCS-Directories: dev-java/jruby/files/ dev-java/jruby/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: d86721adb317670577dcc1d82e06cd94bfdff595 Date: Wed, 25 Jan 2012 07:10:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ab2a8797-3a37-4012-bdb0-f50821771106 X-Archives-Hash: b9bd3dd0363f6ecc43bbe6f44c756eca commit: d86721adb317670577dcc1d82e06cd94bfdff595 Author: Hans de Graaff degraaff org> AuthorDate: Mon Jan 23 20:55:02 2012 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Mon Jan 23 20:55:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/ruby-overlay.= git;a=3Dcommit;h=3Dd86721ad The properties file is no longer used. Add the bindir option to the wrapp= er instead. (Portage version: 2.1.10.41/git/Linux x86_64, RepoMan options: --force, s= igned Manifest commit with key 0x8883FA56A308A8D7!) --- dev-java/jruby/ChangeLog | 5 +++++ dev-java/jruby/files/jruby-bash-launcher.patch | 6 ++++-- dev-java/jruby/jruby-1.6.5.1.ebuild | 5 ----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 425f143..ea8346a 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 23 Jan 2012; Hans de Graaff jruby-1.6.5.1.ebuild, + files/jruby-bash-launcher.patch: + The properties file is no longer used. Add the bindir option to the wr= apper + instead. + 22 Jan 2012; Hans de Graaff jruby-1.6.5.1.ebuild: yecht.jar is no longer a separate jar so it must be included: https://github.com/jruby/jruby/commit/6c1d41aedfde705c969abf10cf5384e2= be69 diff --git a/dev-java/jruby/files/jruby-bash-launcher.patch b/dev-java/jr= uby/files/jruby-bash-launcher.patch index e962872..d23f6cf 100644 --- a/dev-java/jruby/files/jruby-bash-launcher.patch +++ b/dev-java/jruby/files/jruby-bash-launcher.patch @@ -149,13 +149,14 @@ index 731f85e..8299557 100755 if $cygwin; then JRUBY_HOME=3D`cygpath --mixed "$JRUBY_HOME"` JRUBY_SHELL=3D`cygpath --mixed "$JRUBY_SHELL"` -@@ -354,7 +264,7 @@ if [ "$VERIFY_JRUBY" !=3D "" ]; then +@@ -354,7 +264,8 @@ if [ "$VERIFY_JRUBY" !=3D "" ]; then echo "Running with instrumented profiler" fi =20 - "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -c= lasspath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ + "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JR= UBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ "-Djruby.home=3D$JRUBY_HOME" \ ++ "-Djruby.bindir=3D/usr/bin" \ "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ "-Djruby.shell=3D$JRUBY_SHELL" \ @@ -377,7 +287,7 @@ if [ "$VERIFY_JRUBY" !=3D "" ]; then @@ -167,12 +168,13 @@ index 731f85e..8299557 100755 "-Djruby.home=3D$JRUBY_HOME" \ "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ "-Djruby.shell=3D$JRUBY_SHELL" \ -@@ -390,7 +300,7 @@ else +@@ -390,7 +300,8 @@ else =20 exit $JRUBY_STATUS else - exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootcla= sspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ + exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JR= UBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ "-Djruby.home=3D$JRUBY_HOME" \ ++ "-Djruby.bindir=3D/usr/bin" \ "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ "-Djruby.shell=3D$JRUBY_SHELL" \ diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1= .6.5.1.ebuild index e5ecfe1..13df9c3 100644 --- a/dev-java/jruby/jruby-1.6.5.1.ebuild +++ b/dev-java/jruby/jruby-1.6.5.1.ebuild @@ -121,11 +121,6 @@ java_prepare() { # Delete the bundled JARs but keep invokedynamic.jar. # No source is available and it's only a dummy anyway. find build_lib -name "*.jar" ! -name "jsr292-mock.jar" ! -name "yecht.j= ar" -delete || die - - # change some defaults for Gentoo to work properly - cat - >> src/org/jruby/jruby.properties <