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