1 |
graaff 08/11/26 22:12:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ruby-1.8.6_p287-r2.ebuild ruby-1.8.7_p72-r1.ebuild |
5 |
Log: |
6 |
Fix bug 247790 with upstream patch |
7 |
(Portage version: 2.1.4.5) |
8 |
|
9 |
Revision Changes Path |
10 |
1.355 dev-lang/ruby/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.355&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.355&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ChangeLog?r1=1.354&r2=1.355 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v |
19 |
retrieving revision 1.354 |
20 |
retrieving revision 1.355 |
21 |
diff -u -r1.354 -r1.355 |
22 |
--- ChangeLog 26 Nov 2008 21:54:07 -0000 1.354 |
23 |
+++ ChangeLog 26 Nov 2008 22:12:12 -0000 1.355 |
24 |
@@ -1,6 +1,15 @@ |
25 |
# ChangeLog for dev-lang/ruby |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.354 2008/11/26 21:54:07 graaff Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.355 2008/11/26 22:12:12 graaff Exp $ |
29 |
+ |
30 |
+*ruby-1.8.7_p72-r1 (26 Nov 2008) |
31 |
+*ruby-1.8.6_p287-r2 (26 Nov 2008) |
32 |
+ |
33 |
+ 26 Nov 2008; Hans de Graaff <graaff@g.o> |
34 |
+ +files/ruby-1.8.6-shortname_constants.patch, +ruby-1.8.6_p287-r2.ebuild, |
35 |
+ +ruby-1.8.7_p72-r1.ebuild: |
36 |
+ Fix problem with shortname constants #247790, already fixed in upstream SVN. |
37 |
+ Thanks to Alex Legler for providing the patch. |
38 |
|
39 |
26 Nov 2008; Hans de Graaff <graaff@g.o> -ruby-1.8.6_p286.ebuild, |
40 |
-ruby-1.8.6_p287.ebuild: |
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-lang/ruby/ruby-1.8.6_p287-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: ruby-1.8.6_p287-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2008 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r2.ebuild,v 1.1 2008/11/26 22:12:12 graaff Exp $ |
54 |
|
55 |
WANT_AUTOCONF="latest" |
56 |
WANT_AUTOMAKE="latest" |
57 |
|
58 |
ONIGURUMA="onigd2_5_9" |
59 |
|
60 |
inherit autotools eutils flag-o-matic multilib versionator |
61 |
|
62 |
MY_P="${PN}-$(replace_version_separator 3 '-')" |
63 |
S=${WORKDIR}/${MY_P} |
64 |
|
65 |
SLOT=$(get_version_component_range 1-2) |
66 |
MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) |
67 |
|
68 |
DESCRIPTION="An object-oriented scripting language" |
69 |
HOMEPAGE="http://www.ruby-lang.org/" |
70 |
SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.bz2" |
71 |
|
72 |
LICENSE="Ruby" |
73 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
74 |
IUSE="berkdb debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs" |
75 |
|
76 |
RDEPEND=" |
77 |
berkdb? ( sys-libs/db ) |
78 |
gdbm? ( sys-libs/gdbm ) |
79 |
ssl? ( dev-libs/openssl ) |
80 |
socks5? ( >=net-proxy/dante-1.1.13 ) |
81 |
tk? ( dev-lang/tk ) |
82 |
>=dev-ruby/ruby-config-0.3.1 |
83 |
!=dev-lang/ruby-cvs-${SLOT}* |
84 |
!dev-ruby/rdoc |
85 |
!dev-ruby/rexml" |
86 |
DEPEND="${RDEPEND}" |
87 |
PDEPEND="emacs? ( app-emacs/ruby-mode ) |
88 |
xemacs? ( app-xemacs/ruby-modes )" |
89 |
|
90 |
PROVIDE="virtual/ruby" |
91 |
|
92 |
src_unpack() { |
93 |
unpack ${A} |
94 |
|
95 |
cd "${S}/ext/dl" |
96 |
epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff" |
97 |
cd "${S}" |
98 |
|
99 |
epatch "${FILESDIR}/${P}-entity_expansion_limit.diff" |
100 |
epatch "${FILESDIR}/${PN}-1.8.6-shortname_constants.patch" |
101 |
|
102 |
# Fix a hardcoded lib path in configure script |
103 |
sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ |
104 |
configure.in || die "sed failed" |
105 |
|
106 |
eautoreconf |
107 |
} |
108 |
|
109 |
src_compile() { |
110 |
# -fomit-frame-pointer makes ruby segfault, see bug #150413. |
111 |
filter-flags -fomit-frame-pointer |
112 |
# In many places aliasing rules are broken; play it safe |
113 |
# as it's risky with newer compilers to leave it as it is. |
114 |
append-flags -fno-strict-aliasing |
115 |
|
116 |
# Socks support via dante |
117 |
if use socks5 ; then |
118 |
# Socks support can't be disabled as long as SOCKS_SERVER is |
119 |
# set and socks library is present, so need to unset |
120 |
# SOCKS_SERVER in that case. |
121 |
unset SOCKS_SERVER |
122 |
fi |
123 |
|
124 |
# Increase GC_MALLOC_LIMIT if set (default is 8000000) |
125 |
if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then |
126 |
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
127 |
fi |
128 |
|
129 |
econf --program-suffix=$MY_SUFFIX --enable-shared \ |
130 |
$(use_enable socks5 socks) \ |
131 |
$(use_enable doc install-doc) \ |
132 |
$(use_enable threads pthread) \ |
133 |
$(use_enable ipv6) \ |
134 |
$(use_enable debug) \ |
135 |
$(use_with berkdb dbm) \ |
136 |
$(use_with gdbm) \ |
137 |
$(use_with ssl openssl) \ |
138 |
$(use_with tk) \ |
139 |
${myconf} \ |
140 |
--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ |
141 |
|| die "econf failed" |
142 |
|
143 |
emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed" |
144 |
} |
145 |
|
146 |
src_test() { |
147 |
emake -j1 test || die "make test failed" |
148 |
|
149 |
elog "Ruby's make test has been run. Ruby also ships with a make check" |
150 |
elog "that cannot be run until after ruby has been installed." |
151 |
elog |
152 |
if use rubytests; then |
153 |
elog "You have enabled rubytests, so they will be installed to" |
154 |
elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" |
155 |
elog "than root, and you must place them into a writeable directory." |
156 |
elog "Then call: " |
157 |
elog |
158 |
elog "ruby -C /location/of/tests runner.rb" |
159 |
else |
160 |
elog "Enable the rubytests USE flag to install the make check tests" |
161 |
fi |
162 |
} |
163 |
|
164 |
src_install() { |
165 |
LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" |
166 |
RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" |
167 |
for d in $(find "${S}/ext" -type d) ; do |
168 |
RUBYLIB="${RUBYLIB}:$d" |
169 |
done |
170 |
export LD_LIBRARY_PATH RUBYLIB |
171 |
|
172 |
emake DESTDIR="${D}" install || die "make install failed" |
173 |
|
174 |
MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
175 |
keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") |
176 |
keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") |
177 |
|
178 |
if use doc; then |
179 |
make DESTDIR="${D}" install-doc || die "make install-doc failed" |
180 |
fi |
181 |
|
182 |
if use examples; then |
183 |
dodir /usr/share/doc/${PF} |
184 |
cp -pPR sample "${D}/usr/share/doc/${PF}" |
185 |
fi |
186 |
|
187 |
dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) |
188 |
dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) |
189 |
|
190 |
dodoc ChangeLog NEWS README* ToDo |
191 |
|
192 |
if use rubytests; then |
193 |
dodir /usr/share/${PN}-${SLOT} |
194 |
cp -pPR test "${D}/usr/share/${PN}-${SLOT}" |
195 |
fi |
196 |
} |
197 |
|
198 |
pkg_postinst() { |
199 |
|
200 |
if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then |
201 |
"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX |
202 |
fi |
203 |
elog |
204 |
elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" |
205 |
elog |
206 |
} |
207 |
|
208 |
pkg_postrm() { |
209 |
if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then |
210 |
"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX |
211 |
fi |
212 |
} |
213 |
|
214 |
|
215 |
|
216 |
1.1 dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild |
217 |
|
218 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild?rev=1.1&view=markup |
219 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild?rev=1.1&content-type=text/plain |
220 |
|
221 |
Index: ruby-1.8.7_p72-r1.ebuild |
222 |
=================================================================== |
223 |
# Copyright 1999-2008 Gentoo Foundation |
224 |
# Distributed under the terms of the GNU General Public License v2 |
225 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild,v 1.1 2008/11/26 22:12:12 graaff Exp $ |
226 |
|
227 |
WANT_AUTOCONF="latest" |
228 |
WANT_AUTOMAKE="latest" |
229 |
|
230 |
#PATCHES APPLY, DOESN'T COMPILE THOUGH |
231 |
#ONIGURUMA="onigd2_5_9" |
232 |
|
233 |
inherit autotools eutils flag-o-matic multilib versionator |
234 |
|
235 |
SLOT=$(get_version_component_range 1-2) |
236 |
MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) |
237 |
|
238 |
MY_P="${PN}-$(replace_version_separator 3 '-')" |
239 |
S=${WORKDIR}/${MY_P} |
240 |
|
241 |
DESCRIPTION="An object-oriented scripting language" |
242 |
HOMEPAGE="http://www.ruby-lang.org/" |
243 |
SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2" |
244 |
# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" |
245 |
|
246 |
LICENSE="Ruby" |
247 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
248 |
IUSE="berkdb debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs" #cjk |
249 |
|
250 |
RDEPEND=" |
251 |
berkdb? ( sys-libs/db ) |
252 |
gdbm? ( sys-libs/gdbm ) |
253 |
ssl? ( dev-libs/openssl ) |
254 |
socks5? ( >=net-proxy/dante-1.1.13 ) |
255 |
tk? ( dev-lang/tk ) |
256 |
>=dev-ruby/ruby-config-0.3.1 |
257 |
!=dev-lang/ruby-cvs-${SLOT}* |
258 |
!dev-ruby/rdoc |
259 |
!dev-ruby/rexml" |
260 |
DEPEND="${RDEPEND}" |
261 |
PDEPEND="emacs? ( app-emacs/ruby-mode ) |
262 |
xemacs? ( app-xemacs/ruby-modes )" |
263 |
|
264 |
PROVIDE="virtual/ruby" |
265 |
|
266 |
src_unpack() { |
267 |
unpack ${A} |
268 |
|
269 |
# if use cjk ; then |
270 |
# einfo "Applying ${ONIGURUMA}" |
271 |
# pushd "${WORKDIR}/oniguruma" |
272 |
# econf --with-rubydir="${S}" || die "oniguruma econf failed" |
273 |
# emake $MY_SUFFIX || die "oniguruma emake failed" |
274 |
# popd |
275 |
# fi |
276 |
|
277 |
cd "${S}/ext/dl" |
278 |
epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff" |
279 |
cd "${S}" |
280 |
epatch "${FILESDIR}/${PN}-1.8.6-shortname_constants.patch" |
281 |
|
282 |
# Fix a hardcoded lib path in configure script |
283 |
sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ |
284 |
configure.in || die "sed failed" |
285 |
|
286 |
eautoreconf |
287 |
} |
288 |
|
289 |
src_compile() { |
290 |
# -fomit-frame-pointer makes ruby segfault, see bug #150413. |
291 |
filter-flags -fomit-frame-pointer |
292 |
# In many places aliasing rules are broken; play it safe |
293 |
# as it's risky with newer compilers to leave it as it is. |
294 |
append-flags -fno-strict-aliasing |
295 |
|
296 |
# Socks support via dante |
297 |
if use socks5 ; then |
298 |
# Socks support can't be disabled as long as SOCKS_SERVER is |
299 |
# set and socks library is present, so need to unset |
300 |
# SOCKS_SERVER in that case. |
301 |
unset SOCKS_SERVER |
302 |
fi |
303 |
|
304 |
# Increase GC_MALLOC_LIMIT if set (default is 8000000) |
305 |
if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then |
306 |
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
307 |
fi |
308 |
|
309 |
econf --program-suffix=$MY_SUFFIX --enable-shared \ |
310 |
$(use_enable socks5 socks) \ |
311 |
$(use_enable doc install-doc) \ |
312 |
$(use_enable threads pthread) \ |
313 |
$(use_enable ipv6) \ |
314 |
$(use_enable debug) \ |
315 |
$(use_with berkdb dbm) \ |
316 |
$(use_with gdbm) \ |
317 |
$(use_with ssl openssl) \ |
318 |
$(use_with tk) \ |
319 |
${myconf} \ |
320 |
--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ |
321 |
|| die "econf failed" |
322 |
|
323 |
emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed" |
324 |
} |
325 |
|
326 |
src_test() { |
327 |
emake -j1 test || die "make test failed" |
328 |
|
329 |
elog "Ruby's make test has been run. Ruby also ships with a make check" |
330 |
elog "that cannot be run until after ruby has been installed." |
331 |
elog |
332 |
if use rubytests; then |
333 |
elog "You have enabled rubytests, so they will be installed to" |
334 |
elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" |
335 |
elog "than root, and you must place them into a writeable directory." |
336 |
elog "Then call: " |
337 |
elog |
338 |
elog "ruby -C /location/of/tests runner.rb" |
339 |
else |
340 |
elog "Enable the rubytests USE flag to install the make check tests" |
341 |
fi |
342 |
} |
343 |
|
344 |
src_install() { |
345 |
LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" |
346 |
RUBYLIB="${S}:${LD_LIBRARY_PATH}/ruby/${SLOT}" |
347 |
for d in $(find "${S}/ext" -type d) ; do |
348 |
RUBYLIB="${RUBYLIB}:$d" |
349 |
done |
350 |
export LD_LIBRARY_PATH RUBYLIB |
351 |
|
352 |
emake DESTDIR="${D}" install || die "make install failed" |
353 |
|
354 |
MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
355 |
keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") |
356 |
keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") |
357 |
|
358 |
if use doc; then |
359 |
make DESTDIR="${D}" install-doc || die "make install-doc failed" |
360 |
fi |
361 |
|
362 |
if use examples; then |
363 |
dodir /usr/share/doc/${PF} |
364 |
cp -pPR sample "${D}/usr/share/doc/${PF}" |
365 |
fi |
366 |
|
367 |
dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) |
368 |
dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) |
369 |
|
370 |
dodoc ChangeLog NEWS README* ToDo |
371 |
|
372 |
if use rubytests; then |
373 |
dodir /usr/share/${PN}-${SLOT} |
374 |
cp -pPR test "${D}/usr/share/${PN}-${SLOT}" |
375 |
fi |
376 |
} |
377 |
|
378 |
pkg_postinst() { |
379 |
|
380 |
if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then |
381 |
"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX |
382 |
fi |
383 |
elog |
384 |
elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" |
385 |
elog |
386 |
} |
387 |
|
388 |
pkg_postrm() { |
389 |
if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then |
390 |
"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX |
391 |
fi |
392 |
} |