Add patch to fix threading bug on ppc64, bug 375075. Thanks to Kacper Kowalik for chasing down upstream and us.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 215 insertions, 2 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index feb3a34278e3..7f34add881ff 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.500 2011/07/15 17:25:03 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.501 2011/07/22 12:04:58 graaff Exp $
+
+*ruby-1.8.7_p334-r2 (22 Jul 2011)
+
+  22 Jul 2011; Hans de Graaff <graaff@gentoo.org> +ruby-1.8.7_p334-r2.ebuild:
+  Add patch to fix threading bug on ppc64, bug 375075. Thanks to Kacper Kowalik
+  for chasing down upstream and us.
 
   15 Jul 2011; Matt Turner <mattst88@gentoo.org> ruby-1.9.2-r1.ebuild:
   Added ~mips, bug 332593
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index af9b19fc617a..6effdf7818d8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,15 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ruby-1.8.7-p334.tar.bz2 4190857 RMD160 f3d078d526f1b19d3255dc236f5a46062883e7c9 SHA1 4311ce257f2e54f247bfe07b48e799d293d041f2 SHA256 3e7f1a15fb2c205ac9eb0da804983b83bf8c0ffeb2f146d1eb9e0579ea2507da
 DIST ruby-1.9.2-p0.tar.bz2 8495472 RMD160 dc15937c884b0f93863e9871304bae95e1233e15 SHA1 c0fc7e1047f1eac7e554e9818513593b0d398698 SHA256 e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
 DIST ruby-1.9.2-rc2.tar.bz2 8480974 RMD160 d1f1eded267407699d6975bc284f00a6ad7930a5 SHA1 d4cbbb275b0534ccf4da27847972989adcfdb76d SHA256 692ebae991b104482dc9f0d220c1afb6b690a338b3b815aaa4f62954d2fa1b4a
 DIST ruby-patches-1.8.7_p334-r1.tar.bz2 2060 RMD160 6c20b0cf9ce9f15dc0d0d63afc7f93abd7521317 SHA1 85360153650e942f1cfe4041018fcf1406c1c979 SHA256 fc6069897b0e6480e46c7fca3d8ef3508b6c106f34a8695a6784b20b97f5cc61
+DIST ruby-patches-1.8.7_p334-r2.tar.bz2 2638 RMD160 02feaf918801b8a81716ceb1e9761eca149246d0 SHA1 cbbd3d9d473458d44b83c5d8c9016a62db0337f4 SHA256 d4316ca0f4b504d5aa237c8852533c8e504da76d9aec8305227d12910239e431
 DIST ruby-patches-1.8.7_p334.tar.bz2 1770 RMD160 80c131ba5ea75941fd038bd8ea74078ff9c2f62c SHA1 85eb95d4bbb451fe403e3edd8c224e61d7c429ba SHA256 a3ce905072d3e0111a59a7901523bb760e3852d1d197cfc6fed80f7434fe8ff2
 DIST ruby-patches-1.9.2-r1.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
 DIST ruby-patches-1.9.2.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
 DIST ruby-patches-1.9.2_rc2-r1.tar.bz2 2403 RMD160 345fcf857e8760f66ded3759a9a84d4a4d94b067 SHA1 985dbbec258c319d1a256c53af1f79148cc7bdf6 SHA256 2b1b45ad4195fc8aba26858fc4ca31769a9c49af9711902bac95732baf26ed0f
 EBUILD ruby-1.8.7_p334-r1.ebuild 5572 RMD160 7a4fcb776af39dfce8f260ba5306a096e975fd81 SHA1 0857e58658e704b35e4f4eecc92c7fe47866ffff SHA256 9fc6b371b978fa2f9ddfd47f696575838cfb1893b7b9d63a548229ef9ccfd50d
+EBUILD ruby-1.8.7_p334-r2.ebuild 5579 RMD160 fe41cf76ed99e5e36e92ba2f9b12c87ead55488f SHA1 1d6aa9d8904873a9faafdb8f3248089ece08e437 SHA256 b37b037cfc07d5b5cb9ed8864fb0ecedae6073b1ba2aa504683d28dbe26cb272
 EBUILD ruby-1.8.7_p334.ebuild 5565 RMD160 8938c0deae0864973e8a4c4d3b2b7ca3e6e59d02 SHA1 7468f35da38e80050873ec9bffee83bdcffb6771 SHA256 f07c61ba15682d54b17b5c96033c54bdeafb3fb41af26ed0f90432d91fcaa039
 EBUILD ruby-1.9.2-r1.ebuild 6192 RMD160 2b6f13582639836819074839e0ec72492bf91d04 SHA1 81c01c6d6e553c0ce36cdfcffafdc4f38e72f07f SHA256 3ca4845d5277c4c0bf3e6fb0b73d7fef497937735115f9960a4425a9a6c5a65c
 EBUILD ruby-1.9.2.ebuild 6202 RMD160 8f66ed6c02a2c3d3380a9f67495231215936a7eb SHA1 b2ef86a24c06d5425d0960644e2b6101af4bc23d SHA256 ce85ca5181a0e6b67cc3c52e988275c8452ce430499eba788479c6d87fe59ec5
 EBUILD ruby-1.9.2_rc2-r1.ebuild 5831 RMD160 0ea468ff652e77e0961c842b9532b5eb38b95572 SHA1 aece647c15994af766adacb44b11e112bfa2306d SHA256 27be9162a4c84a4cb51931cdd6f5d37ddf7331a01a1e5479d56c5e4704c65871
-MISC ChangeLog 76706 RMD160 268ed0cc20dcbbf413d38ef7a33970b2667c7f80 SHA1 8e82918c9eb348ad09158131280ae0482ef01b74 SHA256 243294cfad7e2ab013df8118b613ea8a1b0601493ea5fdd770a2781db2a5cb79
+MISC ChangeLog 76934 RMD160 50f29c4175515be9cddc0d48c3c643567d3658b7 SHA1 450596c678d58503c4d002db84e89cb4638b4ee1 SHA256 5d952e38e0cecbc8c1c128a29e0523a9429f3347a0d78db27470b16214d822b3
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4pZ3kACgkQiIP6VqMIqNdGKgD/XBwj8wt2b6Mvl3RvMk00LAoH
+M+M6LEA0JKpZAbRyRp0A/jokouHH7DZ/0UD+typh1IECLhiYV9I646hdTxTvnFnB
+=Iy+o
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild b/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild
new file mode 100644
index 000000000000..666408065280
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2011 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_p334-r2.ebuild,v 1.1 2011/07/22 12:04:58 graaff Exp $
+
+EAPI=2
+
+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})
+# 1.8 and 1.9 series disagree on this
+RUBYVERSION=$(get_version_component_range 1-2)
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.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 examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( >=dev-libs/openssl-0.9.8m )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk[threads=] )
+	ncurses? ( sys-libs/ncurses )
+	libedit? ( dev-libs/libedit )
+	!libedit? ( readline? ( sys-libs/readline ) )
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100603
+	!=dev-lang/ruby-cvs-${SLOT}*
+	!<dev-ruby/rdoc-2
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# 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_configure() {
+	local myconf=
+
+	# -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="${myconf} --with-lookup-order-hack=INET"
+
+	if use libedit; then
+		einfo "Using libedit to provide readline extension"
+		myconf="${myconf} --enable-libedit --with-readline"
+	elif use readline; then
+		einfo "Using readline to provide readline extension"
+		myconf="${myconf} --with-readline"
+	else
+		myconf="${myconf} --without-readline"
+	fi
+
+	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) \
+		$(use_with ncurses curses) \
+		${myconf} \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	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${MY_SUFFIX} -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
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	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"
+
+	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
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	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 || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	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
+}