From 445b9a5c9d146200fef890fb4fd833c57e7f9d3c Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Thu, 15 May 2014 18:09:05 +0200
Subject: dev-lang/ruby: Bump/Sync with upstream

Package-Manager: portage-2.2.10
---
 dev-lang/ruby/ChangeLog                            |   6 +
 dev-lang/ruby/Manifest                             |  12 +-
 .../ruby-2.0.0_p451-SVNr39186-asm-volatile.diff    |  16 --
 .../files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff |  13 --
 .../ruby-2.0.0_p481-SVNr39186-asm-volatile.diff    |  16 ++
 .../files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff |  13 ++
 dev-lang/ruby/ruby-2.0.0_p451.ebuild               | 234 ---------------------
 dev-lang/ruby/ruby-2.0.0_p481.ebuild               | 229 ++++++++++++++++++++
 8 files changed, 270 insertions(+), 269 deletions(-)
 delete mode 100644 dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff
 delete mode 100644 dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff
 create mode 100644 dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff
 create mode 100644 dev-lang/ruby/files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff
 delete mode 100644 dev-lang/ruby/ruby-2.0.0_p451.ebuild
 create mode 100644 dev-lang/ruby/ruby-2.0.0_p481.ebuild

(limited to 'dev-lang')

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index d484d004..d1f241ad 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,3 +1,9 @@
+*ruby-2.0.0_p481 (15 May 2014)
+
+  15 May 2014; Bertrand Jacquin <beber@meleeweb.net> +ruby-2.0.0_p481.ebuild,
+  -ruby-2.0.0_p451.ebuild:
+  dev-lang/ruby: Bump and sync with upstream
+
 *ruby-2.0.0_p451 (07 Mar 2014)
 
   07 Mar 2014; Bertrand Jacquin <beber@meleeweb.net>
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index fde5351d..3dbc8717 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,11 @@
 AUX ruby-1.9.3_p545-asm-ilp32+volatile.diff 811 SHA256 59a0dcb93c9d9d937d2a64bf38ea3edb03070b4a2658023dee0c31eabf230dc9 WHIRLPOOL 68c29419065843908ca109cda3c4e36d2ea8ec823f4fff481113776ffc552a5a1e8393299709c672774b5f72aa158d49a9497ca41d40000da6eab7205d98f9cb
-AUX ruby-2.0.0_p451-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52
-AUX ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058
+AUX ruby-2.0.0_p481-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52
+AUX ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058
 DIST ruby-1.9.3-p545.tar.bz2 10038164 SHA256 2533de9f56d62f11c06a02dd32b5ab6d22a8f268c94b8e1e1ade6536adfd1aab WHIRLPOOL 9da723998cc64b55fb3ea6df922d75997f47f1c89f1f3154c893389d4403f0e590597d1e724a6adf9f2545f0645cb6312f58717af0cec4f59a2ce710bd6b46ed
-DIST ruby-2.0.0-p451.tar.bz2 10725438 SHA256 5bf8a1c7616286b9dbc962912c3f58e67bc3a70306ca90b0882ef0bd442e02f5 WHIRLPOOL c8ee41ffcc5f54541e5b73f3a39d8092922236d7140c004dd312eb62c037f424e177541388047e2b173756a4f78f2ab3fa1acaf27246618fbb2792a784b7fd59
+DIST ruby-2.0.0-p481.tar.bz2 10727244 SHA256 0762dad7e96d8091bdf33b3e3176c2066fbf3dc09dfe85fbf40e74e83c63d8e2 WHIRLPOOL 5d9a408c7f67e416dffda84283ea50f92baee5197f00486a84a25c0da9c173d00aaad762487dcea31bca34713e2798262e64588005bbb7abd23ba3127c394d87
 DIST ruby-patches-1.9.3_p545.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
-DIST ruby-patches-2.0.0_p451.tar.bz2 2931 SHA256 7ed87d7eae176a7b164a2d11fdcc5ff98acf477f56e8030667c0e5ac3fd68781 WHIRLPOOL 272093c06bd1109bc6ee91c014364373d3af68b4c26afdd90e1f3ce11eb206287655225d60c308e3c7e62070611a7fccbb2d4174d2726ee126ce9494c30cb7dc
+DIST ruby-patches-2.0.0_p481.tar.bz2 2525 SHA256 9842526b161105af36bf67d22ad578a5c4f82bd1feaf78eee72e674df594d997 WHIRLPOOL 2c302058886d9bc06a5e5febd54e2419a362ca141dd18f70bf7d4c4be65484fc95c9cd432717f6f97f5949f7cf69bb9f5df6e99ae94e14df1802a6f9244a2a7a
 EBUILD ruby-1.9.3_p545.ebuild 6247 SHA256 fb7ea472d0632099af34a04fa8f04a967c595f445695bc1dd9591f647d10d9d8 WHIRLPOOL 9bc6952e2a36c0e981ad7418149f6f78698dc03eaf4a6967e6f88ca076149ff72a6d76711d1d2e4a7daace032e0992202e920844ef1a988a93da8b5820260398
-EBUILD ruby-2.0.0_p451.ebuild 6717 SHA256 f77154cc394fc9d54a30735d44f3d07e1535bb35654c4a88460b0a788b80c63f WHIRLPOOL f27547ce70fe49dbea303c046c0dbd2efdc97835c5109df4cdcc098a07ecf1dc11a06f2334c6790801c2a9f8bb774d4c8de4edca35ead1a86662266adbe391c6
-MISC ChangeLog 1900 SHA256 e20edc755a0697b08b4eba81f7c8cf439549c0465e0e403ff79001256fb8a6a1 WHIRLPOOL 7bf677572922ca0269840b0f6b3d220a67ef8eec91ead3304d75b3750c55b8315baa0b06f6f9d3341f9f43e2526300306f0e734cfd2abbc88a963248ada2b3a5
+EBUILD ruby-2.0.0_p481.ebuild 6500 SHA256 a92fed2ad74fa04d816a1176e425deeecf040b0c2c6c375ef4b05652577caca7 WHIRLPOOL ace5f1da769eee095c4aae206b1df07b914b33acac0667458f136581854dcd29d8db02f11bfa0f0db6642d7dd764c08bdb5dfcf8ce703c4accc03ac2fbd43935
+MISC ChangeLog 2083 SHA256 6fe700546c5d0dcb1fc0145abd6086bbbd01d08ce4fec448ab618068ffa9c064 WHIRLPOOL 97721cb932945549a87e210cd051aa41eedfd3ed4fa36053eab256a4bd5ddce58ff40b4c25339051257fb8a5e674f8203cd29aa077b9fd45524e321e8b37c2e2
 MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff
deleted file mode 100644
index 870dc5bb..00000000
--- a/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gc.h
-===================================================================
---- gc.h	(revision 39185)
-+++ gc.h	(revision 39186)
-@@ -3,9 +3,9 @@
- #define RUBY_GC_H 1
- 
- #if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__)
--#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p)))
-+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
- #elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
--#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movl\t%%esp, %0" : "=r" (*(p)))
-+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
- #else
- NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
- #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff
deleted file mode 100644
index 81b7fe83..00000000
--- a/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gc.h
-===================================================================
---- gc.h	(revision 40635)
-+++ gc.h	(revision 40636)
-@@ -2,7 +2,7 @@
- #ifndef RUBY_GC_H
- #define RUBY_GC_H 1
- 
--#if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__)
-+#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__)
- #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
- #elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
- #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff
new file mode 100644
index 00000000..870dc5bb
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff
@@ -0,0 +1,16 @@
+Index: gc.h
+===================================================================
+--- gc.h	(revision 39185)
++++ gc.h	(revision 39186)
+@@ -3,9 +3,9 @@
+ #define RUBY_GC_H 1
+ 
+ #if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__)
+-#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p)))
++#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
+ #elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
+-#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movl\t%%esp, %0" : "=r" (*(p)))
++#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
+ #else
+ NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
+ #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff
new file mode 100644
index 00000000..81b7fe83
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff
@@ -0,0 +1,13 @@
+Index: gc.h
+===================================================================
+--- gc.h	(revision 40635)
++++ gc.h	(revision 40636)
+@@ -2,7 +2,7 @@
+ #ifndef RUBY_GC_H
+ #define RUBY_GC_H 1
+ 
+-#if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__)
++#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__)
+ #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
+ #elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
+ #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
diff --git a/dev-lang/ruby/ruby-2.0.0_p451.ebuild b/dev-lang/ruby/ruby-2.0.0_p451.ebuild
deleted file mode 100644
index fcf5f000..00000000
--- a/dev-lang/ruby/ruby-2.0.0_p451.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p451.ebuild,v 1.1 2014/03/05 07:37:18 graaff Exp $
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.0.0
-
-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/2.0/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses )
-	readline?  ( sys-libs/readline )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100402
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	>=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20]
-	>=dev-ruby/json-1.7.7[ruby_targets_ruby20]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
-	rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	epatch "${FILESDIR}/${P}-SVNr39186-asm-volatile.diff"
-	epatch "${FILESDIR}/${P}-SVNr40636-asm-ilp32.diff"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal 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=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -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
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# 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"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 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() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# 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 V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	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* README* || 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
-}
diff --git a/dev-lang/ruby/ruby-2.0.0_p481.ebuild b/dev-lang/ruby/ruby-2.0.0_p481.ebuild
new file mode 100644
index 00000000..d47e8446
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.0.0_p481.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p451.ebuild,v 1.3 2014/04/21 12:55:35 graaff Exp $
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+RUBYPL=$(get_version_component_range 4)
+
+MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.0.0
+
+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/2.0/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( dev-libs/openssl )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	ncurses? ( sys-libs/ncurses )
+	readline?  ( sys-libs/readline )
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100402
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20]
+	>=dev-ruby/json-1.7.7[ruby_targets_ruby20]
+	>=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
+	rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	epatch "${FILESDIR}/${P}-SVNr39186-asm-volatile.diff"
+	epatch "${FILESDIR}/${P}-SVNr40636-asm-ilp32.diff"
+
+	# We can no longer unbundle all of rake because rubygems now depends
+	# on this. We leave the actual rake code around to bootstrap
+	# rubygems, but remove the bits that would cause a file collision.
+	einfo "Unbundling gems..."
+	cd "$S"
+	rm -r \
+		{bin,lib}/rake lib/rake.rb man/rake.1 \
+		bin/gem || die "removal 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=
+
+	# The Tk module can no longer be built because the module code is no
+	# longer compatible with newer stable versions.
+	# https://bugs.gentoo.org/show_bug.cgi?id=500894
+	local modules="tk"
+
+	# -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
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# 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"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use readline ; then
+		modules="${modules},readline"
+	fi
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use ncurses ; then
+		modules="${modules},curses"
+	fi
+
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 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() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# 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 V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems copy
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	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
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || 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(19|20|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
-- 
cgit v1.2.3