diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-01-16 21:14:08 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-01-16 21:14:08 +0000 |
| commit | eff8c4eb7ede73bd899bfd4787343ff7142d17a8 (patch) | |
| tree | 4b3d04ee9b252acc87c5815c8558bee590213965 /dev-java/jruby | |
| parent | Version bump (diff) | |
| download | gentoo-2-eff8c4eb7ede73bd899bfd4787343ff7142d17a8.tar.gz gentoo-2-eff8c4eb7ede73bd899bfd4787343ff7142d17a8.tar.bz2 gentoo-2-eff8c4eb7ede73bd899bfd4787343ff7142d17a8.zip | |
Fix usage of system nailgun.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jruby')
| -rw-r--r-- | dev-java/jruby/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch | 18 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.4.0-r2.ebuild (renamed from dev-java/jruby/jruby-1.4.0-r1.ebuild) | 3 |
3 files changed, 28 insertions, 2 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 32a894753314..6c7070b9c4fb 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.48 2010/01/16 21:02:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.49 2010/01/16 21:14:07 flameeyes Exp $ + +*jruby-1.4.0-r2 (16 Jan 2010) + + 16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> + -jruby-1.4.0-r1.ebuild, +jruby-1.4.0-r2.ebuild, + +files/jruby-1.4.0-system-nailgun.patch: + Fix usage of system nailgun. 16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> jruby-1.4.0-r1.ebuild: diff --git a/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch new file mode 100644 index 000000000000..f8fef66fd823 --- /dev/null +++ b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch @@ -0,0 +1,18 @@ +Index: jruby-1.4.0/bin/jruby +=================================================================== +--- jruby-1.4.0.orig/bin/jruby ++++ jruby-1.4.0/bin/jruby +@@ -308,12 +308,7 @@ if $cygwin; then + fi + + if [ "$nailgun_client" != "" ]; then +- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then +- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" +- else +- echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/tool/nailgun" +- exit 1 +- fi ++ exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" + else + if [ "$VERIFY_JRUBY" != "" ]; then + if [ "$PROFILE_ARGS" != "" ]; then diff --git a/dev-java/jruby/jruby-1.4.0-r1.ebuild b/dev-java/jruby/jruby-1.4.0-r2.ebuild index 789e0fcbac5e..e86f875ed017 100644 --- a/dev-java/jruby/jruby-1.4.0-r1.ebuild +++ b/dev-java/jruby/jruby-1.4.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r1.ebuild,v 1.3 2010/01/16 21:02:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r2.ebuild,v 1.1 2010/01/16 21:14:07 flameeyes Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -97,6 +97,7 @@ pkg_setup() { java_prepare() { epatch "${FILESDIR}/ftype-test-fixes.patch" epatch "${FILESDIR}/user-test-fixes.patch" + epatch "${FILESDIR}"/${P}-system-nailgun.patch # We don't need to use Retroweaver. There is a jarjar and a regular jar # target but even with jarjarclean, both are a pain. The latter target |