* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
@ 2011-09-27 18:07 Hans de Graaff
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Graaff @ 2011-09-27 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 9eae0f13ab457ddad80ece3f19411e2c48f8927e
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Sep 27 18:07:15 2011 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 18:07:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=9eae0f13
yecht will stay bundled for now.
(Portage version: 2.1.10.11/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)
---
dev-java/jruby/ChangeLog | 7 +++++++
dev-java/jruby/jruby-1.6.4.ebuild | 1 -
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
new file mode 100644
index 0000000..2b59e1f
--- /dev/null
+++ b/dev-java/jruby/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for dev-java/jruby
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
+ yecht will stay bundled for now.
+
diff --git a/dev-java/jruby/jruby-1.6.4.ebuild b/dev-java/jruby/jruby-1.6.4.ebuild
index e894653..6aec39e 100644
--- a/dev-java/jruby/jruby-1.6.4.ebuild
+++ b/dev-java/jruby/jruby-1.6.4.ebuild
@@ -34,7 +34,6 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
dev-java/ant-core:0
dev-java/bsf:2.3
dev-java/osgi-core-api
- dev-java/yecht
dev-java/snakeyaml"
RDEPEND="${CDEPEND}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
@ 2011-12-26 9:20 Hans de Graaff
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Graaff @ 2011-12-26 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 8ca54a7b76bf35207a9e2d3ffa71131b208a5abd
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Sep 27 18:32:57 2011 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 18:32:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=8ca54a7b
Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versions.
(Portage version: 2.1.10.11/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)
---
dev-java/jruby/ChangeLog | 3 +++
dev-java/jruby/jruby-1.6.4.ebuild | 12 ------------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 2b59e1f..303533e 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -3,5 +3,8 @@
# $Header: $
27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
+ Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versions.
+
+ 27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
yecht will stay bundled for now.
diff --git a/dev-java/jruby/jruby-1.6.4.ebuild b/dev-java/jruby/jruby-1.6.4.ebuild
index 6aec39e..996891f 100644
--- a/dev-java/jruby/jruby-1.6.4.ebuild
+++ b/dev-java/jruby/jruby-1.6.4.ebuild
@@ -191,15 +191,3 @@ src_install() {
'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
-delete || die
}
-
-pkg_postinst() {
- ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
- ewarn "to gentoo.rb load failure."
- ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
- ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
- ewarn "or explicitly unset the variable before running jruby."
- ewarn ""
- ewarn "Currently this package introduces issues/bugs that are not present within upstream"
- ewarn "releases. Therefore if you are wanting a stable build of jruby please do not"
- ewarn "use this package."
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
@ 2012-01-08 10:38 Hans de Graaff
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Graaff @ 2012-01-08 10:38 UTC (permalink / raw
To: gentoo-commits
commit: daf2ad9190fa3684456b0faa3ee1a98b5cd6eb20
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sun Jan 8 10:38:40 2012 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 10:38:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=daf2ad91
Add jruby 1.6.5.1 work-in-progress ebuild for testing.
(Portage version: 2.1.10.41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)
---
dev-java/jruby/ChangeLog | 11 ++++++++++-
dev-java/jruby/jruby-1.6.4.ebuild | 4 ++--
.../{jruby-1.6.4.ebuild => jruby-1.6.5.1.ebuild} | 8 ++++----
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 303533e..c76cbbc 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for dev-java/jruby
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jruby-1.6.5.1 (08 Jan 2012)
+
+ 08 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild,
+ +jruby-1.6.5.1.ebuild:
+ Add jruby 1.6.5.1 work-in-progress ebuild for testing.
+
+ 26 Dec 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
+ This is an experimental version, mark it testing.
+
27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versions.
diff --git a/dev-java/jruby/jruby-1.6.4.ebuild b/dev-java/jruby/jruby-1.6.4.ebuild
index 996891f..8d18cad 100644
--- a/dev-java/jruby/jruby-1.6.4.ebuild
+++ b/dev-java/jruby/jruby-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke Exp $
@@ -13,7 +13,7 @@ HOMEPAGE="http://jruby.codehaus.org/"
SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="bsf ssl"
CDEPEND=">=dev-java/bytelist-1.0.8:0
diff --git a/dev-java/jruby/jruby-1.6.4.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
similarity index 97%
copy from dev-java/jruby/jruby-1.6.4.ebuild
copy to dev-java/jruby/jruby-1.6.5.1.ebuild
index 996891f..5bff705 100644
--- a/dev-java/jruby/jruby-1.6.4.ebuild
+++ b/dev-java/jruby/jruby-1.6.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke Exp $
@@ -13,14 +13,14 @@ HOMEPAGE="http://jruby.codehaus.org/"
SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="bsf ssl"
CDEPEND=">=dev-java/bytelist-1.0.8:0
>=dev-java/constantine-0.6:0
>=dev-java/jline-0.9.94:0
>=dev-java/joni-1.1.3:0
- >=dev-java/jnr-posix-1.1.3:0
+ >=dev-java/jnr-posix-1.1.8:0
>=dev-java/jnr-netdb-1.0:0
>=dev-java/jvyamlb-0.2.5:0
>=dev-java/asm-3.2:3
@@ -34,7 +34,7 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
dev-java/ant-core:0
dev-java/bsf:2.3
dev-java/osgi-core-api
- dev-java/snakeyaml"
+ >=dev-java/snakeyaml-1.9"
RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
@ 2012-01-17 6:54 Hans de Graaff
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Graaff @ 2012-01-17 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 44be7426fd53c1e3ccaaa7d75b13dd61ccfb1ccc
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Jan 17 06:54:43 2012 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 06:54:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=44be7426
Update dependencies and classpath to match in-tree versions.
---
dev-java/jruby/jruby-1.6.5.1.ebuild | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
index 5bff705..71499a5 100644
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ b/dev-java/jruby/jruby-1.6.5.1.ebuild
@@ -16,16 +16,17 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bsf ssl"
+# jffi still needed? Or do we call that jnr-ffi?
CDEPEND=">=dev-java/bytelist-1.0.8:0
>=dev-java/constantine-0.6:0
>=dev-java/jline-0.9.94:0
>=dev-java/joni-1.1.3:0
- >=dev-java/jnr-posix-1.1.8:0
+ >=dev-java/jnr-posix-1.1.8:1.1
>=dev-java/jnr-netdb-1.0:0
>=dev-java/jvyamlb-0.2.5:0
>=dev-java/asm-3.2:3
>=dev-java/jcodings-1.0.5:0
- >=dev-java/jffi-0.7_pre:0.4
+ >=dev-java/jffi-1.0.10:1.0
dev-java/joda-time:0
dev-util/jay:0[java]
dev-java/nailgun:0
@@ -67,8 +68,8 @@ GEMS=${RUBY_HOME}/gems
JAVA_ANT_REWRITE_CLASSPATH="true"
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist constantine jay \
-jcodings jffi-0.4 jline constantine \
-joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht osgi-core-api \
+jcodings jffi-1.0 jline constantine \
+joda-time joni jnr-posix-1.1 jnr-netdb jvyamlb nailgun jaffl jgrapht osgi-core-api \
snakeyaml"
EANT_NEEDS_TOOLS="true"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
@ 2012-01-22 9:19 Hans de Graaff
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Graaff @ 2012-01-22 9:19 UTC (permalink / raw
To: gentoo-commits
commit: cd3c6e9555f2b1dd0e541e347a59ae318ce57b11
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sun Jan 22 08:45:14 2012 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 08:45:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=cd3c6e95
yecht.jar is no longer a separate jar so it must be included: https://github.com/jruby/jruby/commit/6c1d41aedfde705c969abf10cf5384e2be69
(Portage version: 2.1.10.41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)
---
dev-java/jruby/ChangeLog | 4 ++++
dev-java/jruby/jruby-1.6.5.1.ebuild | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index c76cbbc..425f143 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Jan 2012; Hans de Graaff <graaff@gentoo.org> 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/6c1d41aedfde705c969abf10cf5384e2be69
+
*jruby-1.6.5.1 (08 Jan 2012)
08 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild,
diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
index 71499a5..40e9929 100644
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ b/dev-java/jruby/jruby-1.6.5.1.ebuild
@@ -40,6 +40,7 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
+# Is jna-posix still needed? Or has that been renamed to jnr-posix?
DEPEND="${CDEPEND}
>=virtual/jdk-1.6
test? (
@@ -109,7 +110,7 @@ java_prepare() {
sed -r -i \
-e 's/maxmemory="128m"/maxmemory="192m"/' \
-e "/RetroWeaverTask/d" \
- -e "/<zipfileset .+\/>/d" \
+ -e "/yecht/! { /<zipfileset .+\/>/d }" \
build.xml || die
sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
@@ -125,7 +126,9 @@ EOF
}
src_compile() {
- local flags=""
+ # Avoid generating the ri cache since that currently fails.
+ local flags="-Dgenerate-ri-cache.hasrun=true"
+ #local flags=""
use bsf && flags="-Dbsf.present=true"
export RUBYOPT=""
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
@ 2012-02-28 0:35 Alex Legler
0 siblings, 0 replies; 6+ messages in thread
From: Alex Legler @ 2012-02-28 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 1656e19a67b8f74c8dfce4de74c9eabc28a21156
Author: Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Tue Feb 28 00:08:50 2012 +0000
Commit: Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 00:08:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=1656e19a
Bump jruby version to 1.6.7.
(Portage version: 2.2.0_alpha89/git/Linux x86_64, signed Manifest commit with key 2200D978)
---
dev-java/jruby/ChangeLog | 5 +
dev-java/jruby/jruby-1.6.7.ebuild | 199 +++++++++++++++++++++++++++++++++++++
2 files changed, 204 insertions(+), 0 deletions(-)
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index ea8346a..de24a3e 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: $
+*jruby-1.6.7 (28 Feb 2012)
+
+ 28 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +jruby-1.6.7.ebuild:
+ Bump jruby version to 1.6.7.
+
23 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.5.1.ebuild,
files/jruby-bash-launcher.patch:
The properties file is no longer used. Add the bindir option to the wrapper
diff --git a/dev-java/jruby/jruby-1.6.7.ebuild b/dev-java/jruby/jruby-1.6.7.ebuild
new file mode 100644
index 0000000..3f85fad
--- /dev/null
+++ b/dev-java/jruby/jruby-1.6.7.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke Exp $
+
+EAPI="4"
+JAVA_PKG_IUSE="doc source test"
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_rc1/RC1}"
+
+DESCRIPTION="Java-based Ruby interpreter implementation"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bsf ssl"
+
+# jffi still needed? Or do we call that jnr-ffi?
+# jnr-ffi depends on jffi which depends on libffi
+CDEPEND=">=dev-java/bytelist-1.0.8:0
+ >=dev-java/jline-0.9.94:0
+ >=dev-java/joni-1.1.3:0
+ >=dev-java/jnr-netdb-1.0:0
+ >=dev-java/jvyamlb-0.2.5:0
+ >=dev-java/asm-3.2:3
+ >=dev-java/jcodings-1.0.5:0
+ dev-java/jffi:1.0
+ dev-java/jnr-constants:0
+ dev-java/jnr-ffi:0.5
+ dev-java/jnr-posix:1.1
+ dev-java/joda-time:0
+ dev-util/jay:0[java]
+ dev-java/nailgun:0
+ dev-java/jgrapht:0
+ dev-java/ant-core:0
+ dev-java/bsf:2.3
+ dev-java/osgi-core-api:0
+ >=dev-java/snakeyaml-1.9:0
+ dev-java/jzlib:1"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+# Is jna-posix still needed? Or has that been renamed to jnr-posix?
+# jna-posix is the original project name which was abononed years ago.
+# jnr-posix < 1.1.8 are from the original fork
+# later jnr-posix are from the jnr umbrella project.
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/ant-trax:0
+ dev-java/junit:4
+ java-virtuals/jdk-with-com-sun
+ dev-java/commons-logging:0
+ dev-java/xalan:0
+ )
+ !!<dev-ruby/jruby-1.3.1-r1"
+
+PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
+
+# Tests fail.
+# Need to stop injecting jar's into classpath.
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+RUBY_HOME=/usr/share/${PN}/lib/ruby
+SITE_RUBY=${RUBY_HOME}/site_ruby
+GEMS=${RUBY_HOME}/gems
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
+jcodings jffi-1.0 jline \
+joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
+snakeyaml jzlib-1"
+EANT_NEEDS_TOOLS="true"
+
+pkg_setup() {
+ unset RUBYOPT
+ java-pkg-2_pkg_setup
+
+ local fail
+
+ for directory in "${GEMS}" "${SITE_RUBY}"; do
+ if [[ -L ${directory} ]]; then
+ eerror "${directory} is a symlink. Please do the following to resolve the situation:"
+ echo 'emerge -an app-portage/gentoolkit'
+ echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
+ echo 'emerge -1C $(< ~/jruby.fix)'
+ echo "rm ${directory}"
+ echo 'emerge -1 $(< ~/jruby.fix)'
+ echo 'rm ~/jruby.fix'
+
+ eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
+ fail="true"
+ fi
+ done
+
+ if [[ -n ${fail} ]]; then
+ die "Please address the above errors, then run emerge --resume"
+ fi
+}
+
+java_prepare() {
+ epatch "${FILESDIR}"/${PN}-bash-launcher.patch
+ epatch "${FILESDIR}/1.5.1/build.xml.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
+ # is slightly easier so go with this one.
+ sed -r -i \
+ -e 's/maxmemory="128m"/maxmemory="192m"/' \
+ -e "/RetroWeaverTask/d" \
+ -e "/yecht/! { /<zipfileset .+\/>/d }" \
+ build.xml || die
+
+ sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
+
+ # 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.jar" ! -name 'coro-mock-1.0-SNAPSHOT.jar' -delete || die
+}
+
+src_compile() {
+ # Avoid generating the ri cache since that currently fails.
+ local flags="-Dgenerate-ri-cache.hasrun=true"
+ #local flags=""
+ use bsf && flags="-Dbsf.present=true"
+
+ export RUBYOPT=""
+ einfo $RUBYOPT
+ #eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
+ eant -Djdk1.5+=true ${flags}
+}
+
+src_test() {
+ if [ ${UID} == 0 ] ; then
+ ewarn 'The tests will fail if run as root so skipping them.'
+ ewarn 'Enable FEATURES="userpriv" if you want to run them.'
+ return
+ fi
+ # Our jruby.jar is unbundled so we need to add the classpath to this test.
+ sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
+ sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
+ rakelib/commands.rake || die
+ #sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
+ # rakelib/commands.rake || die
+
+ #bsf optionally depends on jruby, which means that the previously
+ #installed jruby will be added to classpath, nasty things will happen.
+ local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
+ cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
+ cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
+ EANT_GENTOO_CLASSPATH=""
+
+ local flags=""
+ use bsf && flags="-Dbsf.present=true"
+
+ #Clear RUBYOPT
+ export RUBYOPT=""
+ export JRUBY_CP="${cpath}"
+ ANT_TASKS="ant-junit4 ant-trax" \
+ JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
+ -Dgentoo.classpath="${cpath}" ${flags}
+}
+
+src_install() {
+ java-pkg_dojar lib/${PN}.jar
+ dodoc README docs/{*.txt,README.*} || die
+
+ use doc && java-pkg_dojavadoc docs/api
+ use source && java-pkg_dosrc src/org
+
+# Use the bash based launcher to preserve whitespace in arguments.
+# Ie allow >jruby -e "puts 'hello'"< to work otherwise
+# >jruby -e "\"puts 'hello'\""< is needed.
+#
+# # We run the sed here in install so that we don't get the wrong
+# # data during the test phase!
+# sed \
+# -e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
+# -e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
+# bin/jruby.sh > "${T}"/jruby
+
+ newbin bin/jruby.bash jruby
+ dobin bin/j{irb{,_swing},rubyc}
+
+ insinto "${RUBY_HOME}"
+ doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby}
+
+ # Remove all the references to RubyGems as we're just going to
+ # install it through dev-ruby/rubygems.
+ find "${D}${RUBY_HOME}" -type f \
+ '(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
+ -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-28 0:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-08 10:38 [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/ Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2012-02-28 0:35 Alex Legler
2012-01-22 9:19 Hans de Graaff
2012-01-17 6:54 Hans de Graaff
2011-12-26 9:20 Hans de Graaff
2011-09-27 18:07 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox