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