Revbump 1.8.7 to add patch for threading/timeout-related hangs. Closes bug 309789...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 7f9bec5ffaa513836a6f6c082d5d006553b1c4cb..976610ac854c97e4d634d23e5d0b7762407850fa 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.447 2010/05/06 19:50:01 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.448 2010/05/06 20:10:08 a3li Exp $
+
+*ruby-1.8.7_p249-r1 (06 May 2010)
+
+  06 May 2010; Alex Legler <a3li@gentoo.org> +ruby-1.8.7_p249-r1.ebuild:
+  Revbump 1.8.7 to add patch for threading/timeout-related hangs. Closes bug
+  309789 by Sune Kloppenborg Jeppesen.
 
   06 May 2010; Alex Legler <a3li@gentoo.org> ruby-1.8.6_p388.ebuild,
   ruby-1.8.7_p249.ebuild:

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index f745f537584a3dff7f8bc37bda4ac918fcff155f..2556c5c192582a8b0f11c268537d6528c8ab3640 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -5,17 +5,19 @@ DIST ruby-1.8.6-p388.tar.bz2 3973412 RMD160 9f451182ef4fb485109d96953e6af388151c
 DIST ruby-1.8.7-p249.tar.bz2 4153461 RMD160 96b238bd7194652ec194a505c2e5911441c5c5ee SHA1 2947f21f22e9345a3e94d84e6f88e7d0fc98a871 SHA256 8b89448fc79df6862660e9f77e884f06c76da28f078d8edd2f17567a615f3af5
 DIST ruby-1.9.1-p376.tar.bz2 7293106 RMD160 0aa585333d337c030c93a8b405e46d990514709d SHA1 878e18719099b742c9353e0fe054a9d602568d2e SHA256 79164e647e23bb7c705195e0075ce6020c30dd5ec4f8c8a12a100fe0eb0d6783
 DIST ruby-patches-1.8.6_p388.tar.bz2 3137 RMD160 6c9b3099687aef29bf9881f11c2915fbd0ba8196 SHA1 7222102440156b9fd0b461bd23828301aa62a5ad SHA256 93053c8fe2e9fcf9fba714780466678c78b42be59547f76055ffea53aef4c4e5
+DIST ruby-patches-1.8.7_p249-r1.tar.bz2 3186 RMD160 94ec3d9cb38cd20f7431e796da0d6ef3cef72483 SHA1 51faacfe56ca16408d99a645627f64b819cc73f7 SHA256 24658d909a86ffb986703dfea26be2a5a18715d1a8a36a1a106aae03d59c5594
 DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
 DIST ruby-patches-1.9.1_p376.tar.bz2 2091 RMD160 b3a899bb98481081ff2de01c5c9e89549b28ebc8 SHA1 cea557a7732b3bc7c8140c3405dd193eb1c10714 SHA256 c2de7c1c0efb7e4f22d1a771931c886e8e76011cc02aab82652b6f71f4b613c6
 EBUILD ruby-1.8.6_p388.ebuild 5329 RMD160 91d80731628a54a76254540a816b7be7cb22e91e SHA1 2bfe49e18e9c39cd2fcc79dd6aadbc678073c8b5 SHA256 92c012a949f9d274754f22d0fb80e35f0c22559b2cad2ce5d7c79ab64fa8bce7
+EBUILD ruby-1.8.7_p249-r1.ebuild 5358 RMD160 7f1cab9efc8ef9a41c5c5645462358fa00c8acf4 SHA1 ba9ec839d4e42e8960f5739e5efd0c78d5987816 SHA256 9c328f8d00228d982c7b0b9294fe646f7fdfcf711a75e74a2ba316149afbc53a
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
 EBUILD ruby-1.9.1_p376.ebuild 5091 RMD160 6929424fff1510ed883dc70ac968b13cc5d603de SHA1 5ff2cb4b34b5f4d26027e2f5af8f0a9b0763577b SHA256 3d6070028fd5e38c2e8cab32d8b9c41c8930019dac36cb726ac1de2d709708e7
-MISC ChangeLog 68624 RMD160 37b02c97dc195f9d0806d5c27e65ae34bb2dade6 SHA1 2042e48d91d5648a4d07fab92aa087501a74e3ff SHA256 6c24f0ce855742ede6c841ef3bb8f8fdfcf629e8f4a3cc0d727226a931ac1a40
+MISC ChangeLog 68849 RMD160 8abd50e0d77bd9d3fb94aa5807ead55f1aae93cc SHA1 d3e62da44de8d598c98debaa389f4f4bd71bf63c SHA256 2fbe3b260b83a078db5f3725381f2e520e8221e3b90cb8166f241871cd088fdc
 MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvjHXEACgkQ+tgfDpkAy6DozACfVjSEzQcxlCVQzjZlrb9WLIGM
-ynYAnRwhR6KR4p4DiyvdO1o5cNMmhnuQ
-=1rjy
+iEYEARECAAYFAkvjIiYACgkQ+tgfDpkAy6ADWwCgkKYzO1SPGOtSvKBDmYVPSeAO
+t5MAoJIkUpbba+y9ZeEvgDo4xbLlrT0k
+=QXMi
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ruby/ruby-1.8.7_p249-r1.ebuild b/dev-lang/ruby/ruby-1.8.7_p249-r1.ebuild
new file mode 100644 (file)
index 0000000..3066118
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p249-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p249-r1.ebuild,v 1.1 2010/05/06 20:10:08 a3li Exp $
+
+EAPI=1
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
+                http://dev.a3li.li/gentoo/distfiles/${PN}-patches-${PVR}.tar.bz2"
+
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="+berkdb debug doc emacs examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs"
+
+RDEPEND="
+       berkdb? ( sys-libs/db )
+       gdbm? ( sys-libs/gdbm )
+       ssl? ( dev-libs/openssl )
+       socks5? ( >=net-proxy/dante-1.1.13 )
+       tk? ( dev-lang/tk )
+       >=app-admin/eselect-ruby-20091225
+       !=dev-lang/ruby-cvs-${SLOT}*
+       !<dev-ruby/rdoc-2
+       !dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PDEPEND="emacs? ( app-emacs/ruby-mode )
+       xemacs? ( app-xemacs/ruby-modes )"
+
+PROVIDE="virtual/ruby"
+
+pkg_setup() {
+       use tk || return
+
+       # Note for EAPI-2 lovers: We'd like to show that custom message.
+       # *If* you can make USE dependencies show that, too, feel free to migrate.
+       if (use threads && ! built_with_use dev-lang/tk threads) \
+               || (! use threads && built_with_use dev-lang/tk threads) ; then
+               eerror
+               eerror "You have Tk support enabled."
+               eerror
+               eerror "Ruby and Tk need the same 'threads' USE flag settings."
+               eerror "Either change the USE flag on dev-lang/ruby or on dev-lang/tk"
+               eerror "and recompile tk."
+
+               die "threads USE flag mismatch"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+               epatch "${WORKDIR}/patches-${PVR}"
+
+       # Fix a hardcoded lib path in configure script
+       sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+               configure.in || die "sed failed"
+
+       eautoreconf
+}
+
+src_compile() {
+       # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+       filter-flags -fomit-frame-pointer
+       # In many places aliasing rules are broken; play it safe
+       # as it's risky with newer compilers to leave it as it is.
+       append-flags -fno-strict-aliasing
+
+       # Socks support via dante
+       if use socks5 ; then
+               # Socks support can't be disabled as long as SOCKS_SERVER is
+               # set and socks library is present, so need to unset
+               # SOCKS_SERVER in that case.
+               unset SOCKS_SERVER
+       fi
+
+       # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+       if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+               append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+       fi
+
+       # ipv6 hack, bug 168939. Needs --enable-ipv6.
+       use ipv6 || myconf="--with-lookup-order-hack=INET"
+
+       econf --program-suffix=$MY_SUFFIX --enable-shared \
+               $(use_enable socks5 socks) \
+               $(use_enable doc install-doc) \
+               $(use_enable threads pthread) \
+               --enable-ipv6 \
+               $(use_enable debug) \
+               $(use_with berkdb dbm) \
+               $(use_with gdbm) \
+               $(use_with ssl openssl) \
+               $(use_with tk) \
+               ${myconf} \
+               --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+               --enable-option-checking=no \
+               || die "econf failed"
+
+       emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+       emake -j1 test || die "make test failed"
+
+       elog "Ruby's make test has been run. Ruby also ships with a make check"
+       elog "that cannot be run until after ruby has been installed."
+       elog
+       if use rubytests; then
+               elog "You have enabled rubytests, so they will be installed to"
+               elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+               elog "than root, and you must place them into a writeable directory."
+               elog "Then call: "
+               elog
+               elog "ruby -C /location/of/tests runner.rb"
+       else
+               elog "Enable the rubytests USE flag to install the make check tests"
+       fi
+}
+
+src_install() {
+       # Ruby is involved in the install process, we don't want interference here.
+       unset RUBYOPT
+
+       LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+       RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
+       for d in $(find "${S}/ext" -type d) ; do
+               RUBYLIB="${RUBYLIB}:$d"
+       done
+       export LD_LIBRARY_PATH RUBYLIB
+
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+       keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
+       keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
+
+       if use doc; then
+               make DESTDIR="${D}" install-doc || die "make install-doc failed"
+       fi
+
+       if use examples; then
+               dodir /usr/share/doc/${PF}
+               cp -pPR sample "${D}/usr/share/doc/${PF}"
+       fi
+
+       dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
+       dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
+
+       dodoc ChangeLog NEWS README* ToDo
+
+       if use rubytests; then
+               dodir /usr/share/${PN}-${SLOT}
+               cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
+       fi
+}
+
+pkg_postinst() {
+       if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+               eselect ruby set ruby${MY_SUFFIX}
+       fi
+
+       elog
+       elog "To switch between available Ruby profiles, execute as root:"
+       elog "\teselect ruby set ruby(18|19|...)"
+       elog
+}
+
+pkg_postrm() {
+       eselect ruby cleanup
+}