Readd YAML patch from bug #115388

Package-Manager: portage-2.1_pre3-r1

4 files changed, 157 insertions, 0 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 059652ae61c9..d4978c6f1226 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,15 +4,18 @@ MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
 MD5 e496eaf8c6af0debd1c74f8e66746a0c files/digest-ruby-1.8.3 125
 MD5 abf0468a972fff8b129ec750fd804ab5 files/digest-ruby-1.8.4 125
+MD5 abf0468a972fff8b129ec750fd804ab5 files/digest-ruby-1.8.4-r1 125
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
 MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
 MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
 MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+MD5 2fade36ba9727ddc61257d1588b5db16 files/ruby-1.8.4-yaml.diff 457
 MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
 MD5 a0045c7bdab6743aede398ec740b44ae ruby-1.8.2-r2.ebuild 3917
 MD5 e847e0e7a41e6a1492eb66edab66a10d ruby-1.8.2.ebuild 3449
 MD5 1787aa2cd633f70825ea753ac529533b ruby-1.8.3.ebuild 3670
+MD5 8cc8cdcffa1e444f08e2f6557c009cc1 ruby-1.8.4-r1.ebuild 3789
 MD5 7ca69fa86c7a26c9524914e69cf76a91 ruby-1.8.4.ebuild 3744
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4-r1 b/dev-lang/ruby/files/digest-ruby-1.8.4-r1
new file mode 100644
index 000000000000..8f2e5207bdab
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4-r1
@@ -0,0 +1,2 @@
+MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448
+MD5 bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz 4312965
diff --git a/dev-lang/ruby/files/ruby-1.8.4-yaml.diff b/dev-lang/ruby/files/ruby-1.8.4-yaml.diff
new file mode 100644
index 000000000000..35cd1602cbe0
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.4-yaml.diff
@@ -0,0 +1,12 @@
+--- ext/syck/rubyext.c	27 Sep 2005 22:57:52 -0000	1.30.2.15
++++ ext/syck/rubyext.c	5 Oct 2005 10:24:16 -0000
+@@ -1142,6 +1142,9 @@
+             }
+             else if ( !NIL_P( target_class ) )
+             {
++                if (subclass == rb_cBignum)
++                    obj = rb_str2inum(val, 10);
++                else
+                 obj = rb_obj_alloc( subclass );
+                 if ( rb_respond_to( obj, s_yaml_initialize ) )
+                 {
diff --git a/dev-lang/ruby/ruby-1.8.4-r1.ebuild b/dev-lang/ruby/ruby-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..51c94f3f60c9
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.4-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4-r1.ebuild,v 1.1 2006/01/02 21:09:38 caleb Exp $
+
+ONIGURUMA="onigd2_5_0"
+
+inherit flag-o-matic alternatives eutils gnuconfig multilib
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+# please keep sorted
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="socks5 tcltk cjk doc threads"
+
+RDEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tcltk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc"
+
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+S=${WORKDIR}/${P%_*}
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${SLOT/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
+	gnuconfig_update || die "gnuconfig_update failed"
+
+	cd ${S}
+
+	epatch ${FILESDIR}/ruby-1.8.4-yaml.diff
+
+	# 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"
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+
+	# 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
+
+	# On ia64 we need to build without optimization #48824
+	if use ia64; then
+		replace-flags '-O*' -O0
+	fi
+
+	econf --program-suffix=${SLOT/./} --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	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
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	if use doc; then
+		make DESTDIR=${D} install-doc || die "make install-doc failed"
+	fi
+
+	if use ppc-macos ; then
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
+	else
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
+	fi
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+	if ! use ppc-macos ; then
+		ewarn
+		ewarn "Warning: Vim won't work if you've just updated ruby from"
+		ewarn "1.6.x to 1.8.x due to the library version change."
+		ewarn "In that case, you will need to remerge vim."
+		ewarn
+
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+		einfo
+		einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	if ! use ppc-macos ; then
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+	fi
+}