1 |
flameeyes 10/01/31 17:19:10 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: jruby-1.4.0-r5.ebuild |
5 |
Log: |
6 |
Require a new version of jffi so that the jruby wrapper has one less java-config call. Also drop RubyGems and leave it to dev-ruby/rubygems to install it. |
7 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.54 dev-java/jruby/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.54&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.54&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.53&r2=1.54 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v |
19 |
retrieving revision 1.53 |
20 |
retrieving revision 1.54 |
21 |
diff -u -r1.53 -r1.54 |
22 |
--- ChangeLog 24 Jan 2010 00:54:52 -0000 1.53 |
23 |
+++ ChangeLog 31 Jan 2010 17:19:09 -0000 1.54 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for dev-java/jruby |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.53 2010/01/24 00:54:52 flameeyes Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.54 2010/01/31 17:19:09 flameeyes Exp $ |
29 |
+ |
30 |
+*jruby-1.4.0-r5 (31 Jan 2010) |
31 |
+ |
32 |
+ 31 Jan 2010; Diego E. Pettenò <flameeyes@g.o> |
33 |
+ +jruby-1.4.0-r5.ebuild, +files/jruby-1.4.0-system-jars-r2.patch: |
34 |
+ Require a new version of jffi so that the jruby wrapper has one less |
35 |
+ java-config call. Also drop RubyGems and leave it to dev-ruby/rubygems to |
36 |
+ install it. |
37 |
|
38 |
24 Jan 2010; Diego E. Pettenò <flameeyes@g.o> |
39 |
jruby-1.4.0-r4.ebuild, +files/jruby-1.4.0-bindir.patch: |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-java/jruby/jruby-1.4.0-r5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.4.0-r5.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.4.0-r5.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: jruby-1.4.0-r5.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2010 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r5.ebuild,v 1.1 2010/01/31 17:19:09 flameeyes Exp $ |
53 |
|
54 |
EAPI="2" |
55 |
JAVA_PKG_IUSE="doc source test" |
56 |
inherit eutils java-pkg-2 java-ant-2 |
57 |
|
58 |
MY_PV="${PV/_rc1/RC1}" |
59 |
|
60 |
DESCRIPTION="Java-based Ruby interpreter implementation" |
61 |
HOMEPAGE="http://jruby.codehaus.org/" |
62 |
SRC_URI="http://jruby.kenai.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz" |
63 |
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~x86" |
66 |
IUSE="bsf java6 ssl" |
67 |
|
68 |
CDEPEND=">=dev-java/bytelist-1.0.2:0 |
69 |
>=dev-java/constantine-0.6:0 |
70 |
>=dev-java/jline-0.9.94:0 |
71 |
>=dev-java/joni-1.1.3:0 |
72 |
>=dev-java/jna-posix-1.0.1:0 |
73 |
>=dev-java/jvyamlb-0.2.5:0 |
74 |
>=dev-java/asm-3.2:3 |
75 |
dev-java/jcodings:0 |
76 |
>=dev-java/jffi-0.7_pre:0.4 |
77 |
dev-java/jna:0 |
78 |
dev-java/joda-time:0 |
79 |
dev-util/jay:0[java] |
80 |
!java6? ( dev-java/backport-util-concurrent:0 ) |
81 |
dev-java/nailgun:0 |
82 |
dev-java/jaffl:0 |
83 |
dev-java/jgrapht:0" |
84 |
|
85 |
RDEPEND="${CDEPEND} |
86 |
!java6? ( =virtual/jre-1.5* ) |
87 |
java6? ( >=virtual/jre-1.6 )" |
88 |
|
89 |
# using 1.6 produces 1.6 bytecode, not sure why |
90 |
DEPEND="${CDEPEND} |
91 |
!java6? ( =virtual/jdk-1.5* ) |
92 |
java6? ( >=virtual/jdk-1.6 ) |
93 |
bsf? ( dev-java/bsf:2.3 ) |
94 |
test? ( |
95 |
dev-java/ant-junit |
96 |
dev-java/ant-trax |
97 |
) |
98 |
!!<dev-ruby/jruby-1.3.1-r1" |
99 |
|
100 |
PDEPEND="ssl? ( dev-ruby/jruby-openssl )" |
101 |
|
102 |
# Tests work for ali_bush. But fail for flameeyes see #282439. |
103 |
# Tests work for ali_bush inside the ebuild env |
104 |
# but fail when using vanilla src tarball. |
105 |
# Restrict tests so we can stablise this package. |
106 |
#RESTRICT="test" |
107 |
|
108 |
S="${WORKDIR}/${PN}-${MY_PV}" |
109 |
|
110 |
RUBY_HOME=/usr/share/${PN}/lib/ruby |
111 |
SITE_RUBY=${RUBY_HOME}/site_ruby |
112 |
GEMS=${RUBY_HOME}/gems |
113 |
|
114 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
115 |
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
116 |
EANT_GENTOO_CLASSPATH="asm-3 bytelist constantine jay jcodings jffi-0.4 jline \ |
117 |
joda-time joni jna jna-posix jvyamlb nailgun jaffl jgrapht" |
118 |
EANT_NEEDS_TOOLS="true" |
119 |
|
120 |
pkg_setup() { |
121 |
java-pkg-2_pkg_setup |
122 |
use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent" |
123 |
|
124 |
local fail |
125 |
|
126 |
for directory in "${GEMS}" "${SITE_RUBY}"; do |
127 |
if [[ -L ${directory} ]]; then |
128 |
eerror "${directory} is a symlink. Please remove this symlink." |
129 |
fail="true" |
130 |
fi |
131 |
done |
132 |
|
133 |
if [[ -n ${fail} ]]; then |
134 |
die "Please address the above errors, then run emerge --resume" |
135 |
fi |
136 |
} |
137 |
|
138 |
java_prepare() { |
139 |
epatch "${FILESDIR}/ftype-test-fixes.patch" |
140 |
epatch "${FILESDIR}/user-test-fixes.patch" |
141 |
epatch "${FILESDIR}"/${P}-system-jars-r2.patch |
142 |
epatch "${FILESDIR}"/${P}-bindir.patch |
143 |
|
144 |
# We don't need to use Retroweaver. There is a jarjar and a regular jar |
145 |
# target but even with jarjarclean, both are a pain. The latter target |
146 |
# is slightly easier so go with this one. |
147 |
sed -r -i \ |
148 |
-e 's/maxmemory="128m"/maxmemory="192m"/' \ |
149 |
-e "/RetroWeaverTask/d" \ |
150 |
-e "/<zipfileset .+\/>/d" \ |
151 |
build.xml || die |
152 |
|
153 |
sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java |
154 |
|
155 |
# Delete the bundled JARs but keep invokedynamic.jar. |
156 |
# No source is available and it's only a dummy anyway. |
157 |
find build_lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die |
158 |
rm lib/profile.jar || die |
159 |
|
160 |
if ! use bsf; then |
161 |
# Remove BSF test cases. |
162 |
cd "${S}/test/org/jruby" |
163 |
rm -f test/TestAdoptedThreading.java || die |
164 |
rm -f javasupport/test/TestBSF.java || die |
165 |
sed -i '/TestBSF.class/d' javasupport/test/JavaSupportTestSuite.java || die |
166 |
sed -i '/TestAdoptedThreading.class/d' test/MainTestSuite.java || die |
167 |
fi |
168 |
} |
169 |
|
170 |
src_compile() { |
171 |
eant jar $(use_doc apidocs) -Djdk1.5+=true |
172 |
} |
173 |
|
174 |
src_test() { |
175 |
if [ ${UID} == 0 ] ; then |
176 |
ewarn 'The tests will fail if run as root so skipping them.' |
177 |
ewarn 'Enable FEATURES="userpriv" if you want to run them.' |
178 |
return |
179 |
fi |
180 |
|
181 |
# ali_bush was getting crashes while attempting to run a test. |
182 |
# No info about why it crashed seemed to be produced. |
183 |
# remove it as temp fix. |
184 |
#sed -i -e '/MRI/d' build.xml || die "Failed to sed build.xml" |
185 |
|
186 |
# BSF is a compile-time only dependency because it's just the adapter |
187 |
# classes and they won't be used unless invoked from BSF itself. |
188 |
use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3 |
189 |
|
190 |
# Our jruby.jar is unbundled so we need to add the classpath to this test. |
191 |
sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die |
192 |
|
193 |
ANT_TASKS="ant-junit ant-trax" JRUBY_CP=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,}` JRUBY_OPTS="" eant test -Djdk1.5+=true |
194 |
} |
195 |
|
196 |
src_install() { |
197 |
local bin |
198 |
|
199 |
java-pkg_dojar lib/${PN}.jar |
200 |
dodoc README docs/{*.txt,README.*} || die |
201 |
|
202 |
use doc && java-pkg_dojavadoc docs/api |
203 |
use source && java-pkg_dosrc src/org |
204 |
|
205 |
# We run the sed here in install so that we don't get the wrong |
206 |
# data during the test phase! |
207 |
sed \ |
208 |
-e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \ |
209 |
-e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \ |
210 |
bin/jruby > "${T}"/jruby |
211 |
|
212 |
dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die |
213 |
|
214 |
insinto "${RUBY_HOME}" |
215 |
doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die |
216 |
|
217 |
# Remove all the references to RubyGems as we're just going to |
218 |
# install it through dev-ruby/rubygems. |
219 |
find "${D}${RUBY_HOME}" -type f \ |
220 |
'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \ |
221 |
-delete || die |
222 |
} |
223 |
|
224 |
pkg_postinst() { |
225 |
ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related" |
226 |
ewarn "to gentoo.rb load failure." |
227 |
ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds." |
228 |
ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'" |
229 |
ewarn "or explicitly unset the variable before running jruby." |
230 |
} |