Gentoo Archives: gentoo-commits

From: "Hans de Graaff (graaff)" <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jruby: ChangeLog jruby-1.6.8.ebuild
Date: Mon, 03 Jun 2013 19:25:47
Message-Id: 20130603192543.8D6232171D@flycatcher.gentoo.org
1 graaff 13/06/03 19:25:43
2
3 Modified: ChangeLog
4 Added: jruby-1.6.8.ebuild
5 Log:
6 Version bump. Force due to lacking ppc keyword, bug 469268.
7
8 (Portage version: 2.1.11.62/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)
9
10 Revision Changes Path
11 1.88 dev-java/jruby/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.88&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.88&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.87&r2=1.88
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
20 retrieving revision 1.87
21 retrieving revision 1.88
22 diff -u -r1.87 -r1.88
23 --- ChangeLog 20 Aug 2012 02:32:48 -0000 1.87
24 +++ ChangeLog 3 Jun 2013 19:25:43 -0000 1.88
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-java/jruby
27 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.87 2012/08/20 02:32:48 ottxor Exp $
29 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.88 2013/06/03 19:25:43 graaff Exp $
31 +
32 +*jruby-1.6.8 (03 Jun 2013)
33 +
34 + 03 Jun 2013; Hans de Graaff <graaff@g.o> +jruby-1.6.8.ebuild,
35 + +files/jruby-1.6.8-bash-launcher.patch:
36 + Version bump.
37
38 20 Aug 2012; Christoph Junghans <ottxor@g.o> jruby-1.6.7.2.ebuild:
39 added prefix keywords
40
41
42
43 1.1 dev-java/jruby/jruby-1.6.8.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.6.8.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.6.8.ebuild?rev=1.1&content-type=text/plain
47
48 Index: jruby-1.6.8.ebuild
49 ===================================================================
50 # Copyright 1999-2013 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.6.8.ebuild,v 1.1 2013/06/03 19:25:43 graaff Exp $
53
54 EAPI="4"
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.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
63 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
64 SLOT="0"
65 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
66 IUSE="bsf ssl"
67
68 # jffi still needed? Or do we call that jnr-ffi?
69 # jnr-ffi depends on jffi which depends on libffi
70 CDEPEND=">=dev-java/bytelist-1.0.8:0
71 >=dev-java/jline-1.0:0
72 >=dev-java/joni-1.1.3:0
73 >=dev-java/jnr-netdb-1.0:0
74 >=dev-java/asm-3.3.1:3
75 >=dev-java/jcodings-1.0.5:0
76 dev-java/jffi:1.0
77 dev-java/jnr-constants:0
78 dev-java/jnr-ffi:0.5
79 dev-java/jnr-posix:1.1
80 >=dev-java/joda-time-1.6:0
81 dev-util/jay:0[java]
82 dev-java/nailgun:0
83 dev-java/jgrapht:0
84 dev-java/ant-core:0
85 dev-java/bsf:2.3
86 dev-java/osgi-core-api:0
87 >=dev-java/snakeyaml-1.9:0
88 dev-java/jzlib:1.1"
89
90 RDEPEND="${CDEPEND}
91 >=virtual/jre-1.6"
92
93 # Is jna-posix still needed? Or has that been renamed to jnr-posix?
94 # jna-posix is the original project name which was abononed years ago.
95 # jnr-posix < 1.1.8 are from the original fork
96 # later jnr-posix are from the jnr umbrella project.
97 DEPEND="${CDEPEND}
98 >=virtual/jdk-1.6
99 test? (
100 dev-java/ant-junit4:0
101 dev-java/ant-trax:0
102 dev-java/junit:4
103 java-virtuals/jdk-with-com-sun
104 dev-java/commons-logging:0
105 dev-java/xalan:0
106 )
107 !!<dev-ruby/jruby-1.3.1-r1"
108
109 PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
110
111 # Tests fail.
112 # Need to stop injecting jar's into classpath.
113 RESTRICT="test"
114
115 S="${WORKDIR}/${PN}-${MY_PV}"
116
117 RUBY_HOME=/usr/share/${PN}/lib/ruby
118 SITE_RUBY=${RUBY_HOME}/site_ruby
119 GEMS=${RUBY_HOME}/gems
120
121 JAVA_ANT_REWRITE_CLASSPATH="true"
122 JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
123 EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
124 jcodings jffi-1.0 jline \
125 joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
126 snakeyaml jzlib-1.1"
127 EANT_NEEDS_TOOLS="true"
128
129 pkg_setup() {
130 unset RUBYOPT
131 java-pkg-2_pkg_setup
132
133 local fail
134
135 for directory in "${GEMS}" "${SITE_RUBY}"; do
136 if [[ -L ${directory} ]]; then
137 eerror "${directory} is a symlink. Please do the following to resolve the situation:"
138 echo 'emerge -an app-portage/gentoolkit'
139 echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
140 echo 'emerge -1C $(< ~/jruby.fix)'
141 echo "rm ${directory}"
142 echo 'emerge -1 $(< ~/jruby.fix)'
143 echo 'rm ~/jruby.fix'
144
145 eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
146 fail="true"
147 fi
148 done
149
150 if [[ -n ${fail} ]]; then
151 die "Please address the above errors, then run emerge --resume"
152 fi
153 }
154
155 java_prepare() {
156 epatch "${FILESDIR}"/${P}-bash-launcher.patch
157 epatch "${FILESDIR}/1.5.1/build.xml.patch"
158
159 # We don't need to use Retroweaver. There is a jarjar and a regular jar
160 # target but even with jarjarclean, both are a pain. The latter target
161 # is slightly easier so go with this one.
162 sed -r -i \
163 -e 's/maxmemory="128m"/maxmemory="192m"/' \
164 -e "/RetroWeaverTask/d" \
165 -e "/yecht/! { /<zipfileset .+\/>/d }" \
166 build.xml || die
167
168 sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
169
170 # Delete the bundled JARs but keep invokedynamic.jar.
171 # No source is available and it's only a dummy anyway.
172 find build_lib -name "*.jar" ! -name "jsr292-mock.jar" ! -name "yecht.jar" ! -name 'coro-mock-1.0-SNAPSHOT.jar' -delete || die
173 }
174
175 src_compile() {
176 # Avoid generating the ri cache since that currently fails.
177 local flags="-Dgenerate-ri-cache.hasrun=true"
178 #local flags=""
179 use bsf && flags="-Dbsf.present=true"
180
181 export RUBYOPT=""
182 einfo $RUBYOPT
183 #eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
184 eant -Djdk1.5+=true ${flags}
185 }
186
187 src_test() {
188 if [ ${UID} == 0 ] ; then
189 ewarn 'The tests will fail if run as root so skipping them.'
190 ewarn 'Enable FEATURES="userpriv" if you want to run them.'
191 return
192 fi
193 # Our jruby.jar is unbundled so we need to add the classpath to this test.
194 sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
195 sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
196 rakelib/commands.rake || die
197 #sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
198 # rakelib/commands.rake || die
199
200 #bsf optionally depends on jruby, which means that the previously
201 #installed jruby will be added to classpath, nasty things will happen.
202 local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
203 cpath="$(echo ${cpath} | sed -e "s_${EROOT}/usr/share/jruby/lib/jruby.jar:__g")"
204 cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
205 EANT_GENTOO_CLASSPATH=""
206
207 local flags=""
208 use bsf && flags="-Dbsf.present=true"
209
210 #Clear RUBYOPT
211 export RUBYOPT=""
212 export JRUBY_CP="${cpath}"
213 ANT_TASKS="ant-junit4 ant-trax" \
214 JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
215 -Dgentoo.classpath="${cpath}" ${flags}
216 }
217
218 src_install() {
219 java-pkg_dojar lib/${PN}.jar
220 dodoc README docs/{*.txt,README.*} || die
221
222 use doc && java-pkg_dojavadoc docs/api
223 use source && java-pkg_dosrc src/org
224
225 # Use the bash based launcher to preserve whitespace in arguments.
226 # Ie allow >jruby -e "puts 'hello'"< to work otherwise
227 # >jruby -e "\"puts 'hello'\""< is needed.
228 #
229 # # We run the sed here in install so that we don't get the wrong
230 # # data during the test phase!
231 # sed \
232 # -e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
233 # -e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
234 # bin/jruby.sh > "${T}"/jruby
235
236 newbin bin/jruby.bash jruby
237 dobin bin/j{irb{,_swing},rubyc}
238
239 insinto "${RUBY_HOME}"
240 doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby}
241
242 # Remove all the references to RubyGems as we're just going to
243 # install it through dev-ruby/rubygems.
244 find "${ED}${RUBY_HOME}" -type f \
245 '(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
246 -delete || die
247 }