From 4f39bcda22ad922bf9aa7715181ad3a94df14874 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Wed, 14 Jul 2010 20:44:46 +0000
Subject: [PATCH] Bump to 1.9.2 release candidate, that works with OpenSSL 1.
 This version might cause _further_ build failures as it changed slightly
 behaviour. You're going to need to rebuild rubygems and then all the packages
 previously installed after upgrading to this. Package-Manager:
 portage-2.2_rc67/cvs/Linux x86_64

---
 dev-lang/ruby/ChangeLog             |  11 +-
 dev-lang/ruby/Manifest              |  11 +-
 dev-lang/ruby/ruby-1.9.2_rc2.ebuild | 193 ++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 5 deletions(-)
 create mode 100644 dev-lang/ruby/ruby-1.9.2_rc2.ebuild

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 3ce7ca4c2c33..8ed5eb4d8ca2 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,15 @@
 # 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.455 2010/07/04 15:47:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.456 2010/07/14 20:44:46 flameeyes Exp $
+
+*ruby-1.9.2_rc2 (14 Jul 2010)
+
+  14 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +ruby-1.9.2_rc2.ebuild:
+  Bump to 1.9.2 release candidate, that works with OpenSSL 1. This version
+  might cause _further_ build failures as it changed slightly behaviour.
+  You're going to need to rebuild rubygems and then all the packages
+  previously installed after upgrading to this.
 
   04 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   -ruby-1.8.7_p249-r1.ebuild, -ruby-1.8.7_p249-r2.ebuild,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 0aafe4b43595..e1e34607a7ba 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -5,22 +5,25 @@ 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.8.7-p299.tar.bz2 4183359 RMD160 0ea4a05f439b6a2cf4bf53339df48aed329f9e43 SHA1 9c66c6ee21d427b5f3183b6c42beb02aa8618cef SHA256 3d8a1e4204f1fb69c9e9ffd637c7f7661a062fc2246c559f25fda5312cfd65d8
 DIST ruby-1.9.1-p429.tar.bz2 7300923 RMD160 e60bf27b7b7aca60f469f486bf17f0b7a45b2ec4 SHA1 66091777a43939b888fabafddeb659fe5ba0de0d SHA256 e0b9471d77354628a8041068f45734eb2d99f5b5df08fe5a76d785d989a47bfb
+DIST ruby-1.9.2-rc2.tar.bz2 8480974 RMD160 d1f1eded267407699d6975bc284f00a6ad7930a5 SHA1 d4cbbb275b0534ccf4da27847972989adcfdb76d SHA256 692ebae991b104482dc9f0d220c1afb6b690a338b3b815aaa4f62954d2fa1b4a
 DIST ruby-patches-1.8.6_p388-r1.tar.bz2 5085 RMD160 bfe19c6c9920181f1957971ea7ec8d6c62a03bf4 SHA1 5ad1ddfcb019b8cf6d46ae39ab4bcbef78737be0 SHA256 f922577613ea96fd51d5656d4ecedf46a09a835e834256a1b3272c68b83c4047
 DIST ruby-patches-1.8.6_p388.tar.bz2 3137 RMD160 6c9b3099687aef29bf9881f11c2915fbd0ba8196 SHA1 7222102440156b9fd0b461bd23828301aa62a5ad SHA256 93053c8fe2e9fcf9fba714780466678c78b42be59547f76055ffea53aef4c4e5
 DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
 DIST ruby-patches-1.8.7_p299.tar.bz2 1781 RMD160 edf80f6ea3809b3a9f2e697b8f78baeb5df2e346 SHA1 29743874ace02f75dc4e1fcf4516cfac589748b3 SHA256 83931a1d9d59a307cf5b173e7b4235a8606f61c86636e6e489f4da15bde8110d
 DIST ruby-patches-1.9.1_p429.tar.bz2 2115 RMD160 1d9e9f6450fb703df2a3d7787e9323fc1000fa24 SHA1 dde517b7302c245e8d443a1cd17781038fc4671b SHA256 d62e7f09e54c35cae0d7a9c780daf6d0cf5f8400fa59029a920d63088a6bd4cd
+DIST ruby-patches-1.9.2_rc2.tar.bz2 1218 RMD160 06d727671caf3b433fdcafc73f62e29bf39cceff SHA1 3b81e0521523bd9298e7a2b00bd8112c94510f80 SHA256 01cebb7ba6f7726bcf509746690abb8522ce26634849ec93fd23781aacbf9082
 EBUILD ruby-1.8.6_p388-r1.ebuild 5413 RMD160 c880ceb23dc375129909c2a7e578ad00026bdf9c SHA1 b51021864f4d758425d020ffd45fc3fbce6c6da0 SHA256 41ceb77309098a910cd7b300b774a830616471790835ca8689c8df0cdf5f9999
 EBUILD ruby-1.8.6_p388.ebuild 5329 RMD160 91d80731628a54a76254540a816b7be7cb22e91e SHA1 2bfe49e18e9c39cd2fcc79dd6aadbc678073c8b5 SHA256 92c012a949f9d274754f22d0fb80e35f0c22559b2cad2ce5d7c79ab64fa8bce7
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
 EBUILD ruby-1.8.7_p299.ebuild 5427 RMD160 ea91ad2c6b378fe391d74040d6a858f2b82b853f SHA1 4d5eb522d4efd6dfaad65590199aad8e051fd8e7 SHA256 1db8b54e29bc947138d5584a56444baa0b7dc0f1960e7bb35ed0c8722b2dff7f
 EBUILD ruby-1.9.1_p429.ebuild 5453 RMD160 16869eaca27fe73a6d47d42063172400490f36c5 SHA1 d5db5d98fe11197bc44185d611d10f03078f6f71 SHA256 bc6d7a78a7441941402e486a229006152d0f81a8f2688d0a6ac8a4e00c36b842
-MISC ChangeLog 70415 RMD160 604c2138ff2661ee14bdf1921b9c67f0e0938a76 SHA1 38ec3e86b07931b79af6db12f21b3c9d266c11fc SHA256 748c089e03d7a1ab861761028dfec84ddbd73dfc9794652c746cabc2f7ed64a0
+EBUILD ruby-1.9.2_rc2.ebuild 5502 RMD160 e8664a5b5b8e1972d34cb7f4936d8515554946f7 SHA1 7cde0a35fd1f440b8fbef2c5bf210bc5b10aadcb SHA256 a6a36e34804f2f7390fca10cf78311e6df3718b21c1c493a0526c115ce7f4a58
+MISC ChangeLog 70794 RMD160 21c3be4648e22afdd08f4fe4a132933bc6d4d0f7 SHA1 18f2c3b7e7675828a422bc3990e3c95f30ec64d3 SHA256 cee1dac4f1342d5da594a621679ab952f2f9508314870df2f62f4786af227de0
 MISC metadata.xml 1081 RMD160 77ebe9b23b118075684351f9c6443aaa81fab263 SHA1 d3d03be57aab9b84a4712b51a69eff47bc47124d SHA256 428eb9a33cba960d1d03ba6c9b4566b99f0ff8171d5d16873b600bb75837745d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkww5DEACgkQAiZjviIA2XhRoQCghWjsoBt4cz9CFIeqRaYB+rep
-Bh8AoOQBU6v0KLu9KLTIZsB3H4J4qQZo
-=UaBd
+iEYEARECAAYFAkw+IeoACgkQAiZjviIA2XgmwQCfTthVDVComLiO/1etSqVPS2rw
+8BUAn2N1OduaRO/P4Co1uCCyGYecMCiw
+=Gf0a
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.9.2_rc2.ebuild b/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
new file mode 100644
index 000000000000..c4108a4d8dcf
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
@@ -0,0 +1,193 @@
+# 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.9.2_rc2.ebuild,v 1.1 2010/07/14 20:44:46 flameeyes 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-3)
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
+
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 rubytests socks5 ssl tk xemacs ncurses +readline libedit"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( dev-libs/openssl )
+	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 ) )
+	dev-libs/libffi
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100402
+	!=dev-lang/ruby-cvs-${SLOT}*
+	!<dev-ruby/rdoc-2
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
+
+PROVIDE="virtual/ruby"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Removing rake and rubygems..."
+	# Strip rake and rubygems
+	rm -rf bin/rake lib/rake.rb lib/rake || die "rm rake failed"
+	rm -rf bin/gem || die "rm gem failed"
+
+	# 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} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--enable-shared \
+		--enable-pthread \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		$(use_with berkdb dbm) \
+		$(use_with gdbm) \
+		$(use_with ssl openssl) \
+		$(use_with tk) \
+		$(use_with ncurses curses) \
+		${myconf} \
+		--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)/ruby19/${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 doc/NEWS-1.8.7 README* ToDo || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}
+		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
+}
-- 
2.26.2