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-lang/ruby: ChangeLog ruby-2.0.0_p353.ebuild ruby-1.9.3_p484.ebuild
Date: Fri, 22 Nov 2013 19:22:44
Message-Id: 20131122192240.1CD482004B@flycatcher.gentoo.org
1 graaff 13/11/22 19:22:40
2
3 Modified: ChangeLog
4 Added: ruby-2.0.0_p353.ebuild ruby-1.9.3_p484.ebuild
5 Log:
6 Version bumps for security bug 492282.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
9
10 Revision Changes Path
11 1.617 dev-lang/ruby/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.617&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.617&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ChangeLog?r1=1.616&r2=1.617
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v
20 retrieving revision 1.616
21 retrieving revision 1.617
22 diff -u -r1.616 -r1.617
23 --- ChangeLog 14 Oct 2013 18:38:57 -0000 1.616
24 +++ ChangeLog 22 Nov 2013 19:22:39 -0000 1.617
25 @@ -1,6 +1,13 @@
26 # ChangeLog for dev-lang/ruby
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.616 2013/10/14 18:38:57 graaff Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.617 2013/11/22 19:22:39 graaff Exp $
30 +
31 +*ruby-2.0.0_p353 (22 Nov 2013)
32 +*ruby-1.9.3_p484 (22 Nov 2013)
33 +
34 + 22 Nov 2013; Hans de Graaff <graaff@g.o> +ruby-1.9.3_p484.ebuild,
35 + +ruby-2.0.0_p353.ebuild:
36 + Version bumps for security bug 492282.
37
38 *ruby-2.0.0_p247-r2 (14 Oct 2013)
39
40
41
42
43 1.1 dev-lang/ruby/ruby-2.0.0_p353.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353.ebuild?rev=1.1&content-type=text/plain
47
48 Index: ruby-2.0.0_p353.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-lang/ruby/ruby-2.0.0_p353.ebuild,v 1.1 2013/11/22 19:22:39 graaff Exp $
53
54 EAPI=5
55
56 #PATCHSET=1
57
58 inherit autotools eutils flag-o-matic multilib versionator
59
60 RUBYPL=$(get_version_component_range 4)
61
62 MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
63 S=${WORKDIR}/${MY_P}
64
65 SLOT=$(get_version_component_range 1-2)
66 MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
67 RUBYVERSION=2.0.0
68
69 if [[ -n ${PATCHSET} ]]; then
70 if [[ ${PVR} == ${PV} ]]; then
71 PATCHSET="${PV}-r0.${PATCHSET}"
72 else
73 PATCHSET="${PVR}.${PATCHSET}"
74 fi
75 else
76 PATCHSET="${PVR}"
77 fi
78
79 DESCRIPTION="An object-oriented scripting language"
80 HOMEPAGE="http://www.ruby-lang.org/"
81 SRC_URI="mirror://ruby/2.0/${MY_P}.tar.bz2
82 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
83
84 LICENSE="|| ( Ruby-BSD BSD-2 )"
85 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
86 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
87
88 RDEPEND="
89 berkdb? ( sys-libs/db )
90 gdbm? ( sys-libs/gdbm )
91 ssl? ( dev-libs/openssl )
92 socks5? ( >=net-proxy/dante-1.1.13 )
93 tk? ( dev-lang/tk[threads] )
94 ncurses? ( sys-libs/ncurses )
95 readline? ( sys-libs/readline )
96 dev-libs/libyaml
97 virtual/libffi
98 sys-libs/zlib
99 >=app-admin/eselect-ruby-20100402
100 !<dev-ruby/rdoc-3.9.4
101 !<dev-ruby/rubygems-1.8.10-r1"
102
103 DEPEND="${RDEPEND}"
104 PDEPEND="
105 >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20]
106 >=dev-ruby/json-1.7.7[ruby_targets_ruby20]
107 >=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
108 rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
109 xemacs? ( app-xemacs/ruby-modes )"
110
111 src_prepare() {
112 EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
113 epatch "${WORKDIR}/patches"
114
115 # We can no longer unbundle all of rake because rubygems now depends
116 # on this. We leave the actual rake code around to bootstrap
117 # rubygems, but remove the bits that would cause a file collision.
118 einfo "Unbundling gems..."
119 cd "$S"
120 rm -r \
121 {bin,lib}/rake lib/rake.rb man/rake.1 \
122 bin/gem || die "removal failed"
123
124 # Fix a hardcoded lib path in configure script
125 sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
126 configure.in || die "sed failed"
127
128 eautoreconf
129 }
130
131 src_configure() {
132 local myconf=
133
134 # -fomit-frame-pointer makes ruby segfault, see bug #150413.
135 filter-flags -fomit-frame-pointer
136 # In many places aliasing rules are broken; play it safe
137 # as it's risky with newer compilers to leave it as it is.
138 append-flags -fno-strict-aliasing
139 # SuperH needs this
140 use sh && append-flags -mieee
141
142 # Socks support via dante
143 if use socks5 ; then
144 # Socks support can't be disabled as long as SOCKS_SERVER is
145 # set and socks library is present, so need to unset
146 # SOCKS_SERVER in that case.
147 unset SOCKS_SERVER
148 fi
149
150 # Increase GC_MALLOC_LIMIT if set (default is 8000000)
151 if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
152 append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
153 fi
154
155 # ipv6 hack, bug 168939. Needs --enable-ipv6.
156 use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
157
158 # if use libedit; then
159 # einfo "Using libedit to provide readline extension"
160 # myconf="${myconf} --enable-libedit --with-readline"
161 # elif use readline; then
162 # einfo "Using readline to provide readline extension"
163 # myconf="${myconf} --with-readline"
164 # else
165 # myconf="${myconf} --without-readline"
166 # fi
167 myconf="${myconf} $(use_with readline)"
168
169 INSTALL="${EPREFIX}/usr/bin/install -c" econf \
170 --program-suffix=${MY_SUFFIX} \
171 --with-soname=ruby${MY_SUFFIX} \
172 --enable-shared \
173 --enable-pthread \
174 --enable-psych \
175 --disable-rpath \
176 $(use_enable socks5 socks) \
177 $(use_enable doc install-doc) \
178 --enable-ipv6 \
179 $(use_enable debug) \
180 $(use_with berkdb dbm) \
181 $(use_with gdbm) \
182 $(use_with ssl openssl) \
183 $(use_with tk) \
184 $(use_with ncurses curses) \
185 ${myconf} \
186 --enable-option-checking=no \
187 || die "econf failed"
188 }
189
190 src_compile() {
191 emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
192 }
193
194 src_test() {
195 emake -j1 V=1 test || die "make test failed"
196
197 elog "Ruby's make test has been run. Ruby also ships with a make check"
198 elog "that cannot be run until after ruby has been installed."
199 elog
200 if use rubytests; then
201 elog "You have enabled rubytests, so they will be installed to"
202 elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
203 elog "than root, and you must place them into a writeable directory."
204 elog "Then call: "
205 elog
206 elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
207 else
208 elog "Enable the rubytests USE flag to install the make check tests"
209 fi
210 }
211
212 src_install() {
213 # Remove the remaining bundled gems. We do this late in the process
214 # since they are used during the build to e.g. create the
215 # documentation.
216 rm -rf ext/json || die
217
218 # Ruby is involved in the install process, we don't want interference here.
219 unset RUBYOPT
220
221 local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
222
223 LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
224 RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
225 for d in $(find "${S}/ext" -type d) ; do
226 RUBYLIB="${RUBYLIB}:$d"
227 done
228 export LD_LIBRARY_PATH RUBYLIB
229
230 emake V=1 DESTDIR="${D}" install || die "make install failed"
231
232 # Remove installed rubygems copy
233 rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
234 rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
235 rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
236
237 if use doc; then
238 make DESTDIR="${D}" install-doc || die "make install-doc failed"
239 fi
240
241 if use examples; then
242 insinto /usr/share/doc/${PF}
243 doins -r sample
244 fi
245
246 dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
247 "/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
248 dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
249 "/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
250
251 dodoc ChangeLog NEWS doc/NEWS* README* || die
252
253 if use rubytests; then
254 pushd test
255 insinto /usr/share/${PN}-${SLOT}/test
256 doins -r .
257 popd
258 fi
259 }
260
261 pkg_postinst() {
262 if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
263 eselect ruby set ruby${MY_SUFFIX}
264 fi
265
266 elog
267 elog "To switch between available Ruby profiles, execute as root:"
268 elog "\teselect ruby set ruby(18|19|...)"
269 elog
270 }
271
272 pkg_postrm() {
273 eselect ruby cleanup
274 }
275
276
277
278 1.1 dev-lang/ruby/ruby-1.9.3_p484.ebuild
279
280 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild?rev=1.1&view=markup
281 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild?rev=1.1&content-type=text/plain
282
283 Index: ruby-1.9.3_p484.ebuild
284 ===================================================================
285 # Copyright 1999-2013 Gentoo Foundation
286 # Distributed under the terms of the GNU General Public License v2
287 # $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild,v 1.1 2013/11/22 19:22:39 graaff Exp $
288
289 EAPI=4
290
291 #PATCHSET=1
292
293 inherit autotools eutils flag-o-matic multilib versionator
294
295 RUBYPL=$(get_version_component_range 4)
296
297 MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
298 S=${WORKDIR}/${MY_P}
299
300 SLOT=$(get_version_component_range 1-2)
301 MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
302 # 1.9.3 still uses 1.9.1
303 RUBYVERSION=1.9.1
304
305 if [[ -n ${PATCHSET} ]]; then
306 if [[ ${PVR} == ${PV} ]]; then
307 PATCHSET="${PV}-r0.${PATCHSET}"
308 else
309 PATCHSET="${PVR}.${PATCHSET}"
310 fi
311 else
312 PATCHSET="${PVR}"
313 fi
314
315 DESCRIPTION="An object-oriented scripting language"
316 HOMEPAGE="http://www.ruby-lang.org/"
317 SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
318 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
319
320 LICENSE="|| ( Ruby-BSD BSD-2 )"
321 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
322 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit
323
324 # libedit support is removed everywhere because of this upstream bug:
325 # http://redmine.ruby-lang.org/issues/show/3698
326
327 RDEPEND="
328 berkdb? ( sys-libs/db )
329 gdbm? ( sys-libs/gdbm )
330 ssl? ( dev-libs/openssl )
331 socks5? ( >=net-proxy/dante-1.1.13 )
332 tk? ( dev-lang/tk[threads] )
333 ncurses? ( sys-libs/ncurses )
334 readline? ( sys-libs/readline )
335 yaml? ( dev-libs/libyaml )
336 virtual/libffi
337 sys-libs/zlib
338 >=app-admin/eselect-ruby-20100402
339 !<dev-ruby/rdoc-3.9.4
340 !<dev-ruby/rubygems-1.8.10-r1"
341 # libedit? ( dev-libs/libedit )
342 # !libedit? ( readline? ( sys-libs/readline ) )
343
344 DEPEND="${RDEPEND}"
345 PDEPEND="
346 >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19]
347 rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
348 xemacs? ( app-xemacs/ruby-modes )"
349
350 src_prepare() {
351 EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
352 epatch "${WORKDIR}/patches"
353
354 einfo "Unbundling gems..."
355 cd "$S"
356 rm -r \
357 {bin,lib}/rake lib/rake.rb man/rake.1 \
358 ext/json \
359 bin/gem || die "removal failed"
360
361 # Fix a hardcoded lib path in configure script
362 sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
363 configure.in || die "sed failed"
364
365 eautoreconf
366 }
367
368 src_configure() {
369 local myconf=
370
371 # -fomit-frame-pointer makes ruby segfault, see bug #150413.
372 filter-flags -fomit-frame-pointer
373 # In many places aliasing rules are broken; play it safe
374 # as it's risky with newer compilers to leave it as it is.
375 append-flags -fno-strict-aliasing
376 # SuperH needs this
377 use sh && append-flags -mieee
378
379 # Socks support via dante
380 if use socks5 ; then
381 # Socks support can't be disabled as long as SOCKS_SERVER is
382 # set and socks library is present, so need to unset
383 # SOCKS_SERVER in that case.
384 unset SOCKS_SERVER
385 fi
386
387 # Increase GC_MALLOC_LIMIT if set (default is 8000000)
388 if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
389 append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
390 fi
391
392 # ipv6 hack, bug 168939. Needs --enable-ipv6.
393 use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
394
395 # if use libedit; then
396 # einfo "Using libedit to provide readline extension"
397 # myconf="${myconf} --enable-libedit --with-readline"
398 # elif use readline; then
399 # einfo "Using readline to provide readline extension"
400 # myconf="${myconf} --with-readline"
401 # else
402 # myconf="${myconf} --without-readline"
403 # fi
404 myconf="${myconf} $(use_with readline)"
405
406 INSTALL="${EPREFIX}/usr/bin/install -c" econf \
407 --program-suffix=${MY_SUFFIX} \
408 --with-soname=ruby${MY_SUFFIX} \
409 --enable-shared \
410 --enable-pthread \
411 $(use_enable socks5 socks) \
412 $(use_enable doc install-doc) \
413 --enable-ipv6 \
414 $(use_enable debug) \
415 $(use_with berkdb dbm) \
416 $(use_with gdbm) \
417 $(use_with ssl openssl) \
418 $(use_with tk) \
419 $(use_with ncurses curses) \
420 $(use_with yaml psych) \
421 ${myconf} \
422 --enable-option-checking=no \
423 || die "econf failed"
424 }
425
426 src_compile() {
427 emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
428 }
429
430 src_test() {
431 emake -j1 V=1 test || die "make test failed"
432
433 elog "Ruby's make test has been run. Ruby also ships with a make check"
434 elog "that cannot be run until after ruby has been installed."
435 elog
436 if use rubytests; then
437 elog "You have enabled rubytests, so they will be installed to"
438 elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
439 elog "than root, and you must place them into a writeable directory."
440 elog "Then call: "
441 elog
442 elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
443 else
444 elog "Enable the rubytests USE flag to install the make check tests"
445 fi
446 }
447
448 src_install() {
449 # Ruby is involved in the install process, we don't want interference here.
450 unset RUBYOPT
451
452 local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
453
454 LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
455 RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
456 for d in $(find "${S}/ext" -type d) ; do
457 RUBYLIB="${RUBYLIB}:$d"
458 done
459 export LD_LIBRARY_PATH RUBYLIB
460
461 emake V=1 DESTDIR="${D}" install || die "make install failed"
462
463 # Remove installed rubygems copy
464 rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
465 rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
466 rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
467
468 if use doc; then
469 make DESTDIR="${D}" install-doc || die "make install-doc failed"
470 fi
471
472 if use examples; then
473 insinto /usr/share/doc/${PF}
474 doins -r sample
475 fi
476
477 dodoc ChangeLog NEWS doc/NEWS* README* ToDo || die
478
479 if use rubytests; then
480 pushd test
481 insinto /usr/share/${PN}-${SLOT}/test
482 doins -r .
483 popd
484 fi
485 }
486
487 pkg_postinst() {
488 if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
489 eselect ruby set ruby${MY_SUFFIX}
490 fi
491
492 elog
493 elog "To switch between available Ruby profiles, execute as root:"
494 elog "\teselect ruby set ruby(18|19|...)"
495 elog
496 }
497
498 pkg_postrm() {
499 eselect ruby cleanup
500 }