From bf18b746f742f92beed87a6d2e4d6a3da8099294 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 19 Jan 2015 14:36:50 -0500
Subject: [PATCH] ruby: recipe for 2.1.5.

 * Also, install to $prefix/bin and not $binDir
 * Still crashes on the second test...
---
 ...uby-2.1.2.patchset => ruby-2.1.5.patchset} |  0
 .../{ruby-2.1.2.recipe => ruby-2.1.5.recipe}  | 40 +++++++++----------
 2 files changed, 19 insertions(+), 21 deletions(-)
 rename dev-lang/ruby/patches/{ruby-2.1.2.patchset => ruby-2.1.5.patchset} (100%)
 rename dev-lang/ruby/{ruby-2.1.2.recipe => ruby-2.1.5.recipe} (73%)

diff --git a/dev-lang/ruby/patches/ruby-2.1.2.patchset b/dev-lang/ruby/patches/ruby-2.1.5.patchset
similarity index 100%
rename from dev-lang/ruby/patches/ruby-2.1.2.patchset
rename to dev-lang/ruby/patches/ruby-2.1.5.patchset
diff --git a/dev-lang/ruby/ruby-2.1.2.recipe b/dev-lang/ruby/ruby-2.1.5.recipe
similarity index 73%
rename from dev-lang/ruby/ruby-2.1.2.recipe
rename to dev-lang/ruby/ruby-2.1.5.recipe
index a64583a98..b9f74a191 100644
--- a/dev-lang/ruby/ruby-2.1.2.recipe
+++ b/dev-lang/ruby/ruby-2.1.5.recipe
@@ -1,6 +1,5 @@
 SUMMARY="A programming language focused on simplicity and productivity"
-DESCRIPTION="
-Ruby is a dynamic, reflective, object-oriented, general-purpose \
+DESCRIPTION="Ruby is a dynamic, reflective, object-oriented, general-purpose \
 programming language. It was designed and developed in the mid-1990s \
 by Yukihiro 'Matz' Matsumoto in Japan.
 
@@ -9,16 +8,14 @@ was also influenced by Eiffel and Lisp.  It supports multiple \
 programming paradigms, including functional, object oriented, and \
 imperative. It also has a dynamic type system and automatic memory \
 management. Therefore, it is similar in varying degrees to, Smalltalk, \
-Python, Perl, Lisp, Dylan, and CLU.
-"
-HOMEPAGE="http://www.ruby-lang.org" 
-SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.gz"
-CHECKSUM_SHA256="f22a6447811a81f3c808d1c2a5ce3b5f5f0955c68c9a749182feb425589e6635"
-LICENSE="
-	Ruby
-	BSD (3-clause)
-	"
+Python, Perl, Lisp, Dylan, and CLU."
+HOMEPAGE="http://www.ruby-lang.org"
+SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-$portVersion.tar.gz"
+CHECKSUM_SHA256="4305cc6ceb094df55210d83548dcbeb5117d74eea25196a9b14fa268d354b100"
+LICENSE="Ruby
+	BSD (3-clause)"
 COPYRIGHT="1993-2014 Yukihiro Matsumoto"
+PATCHES="ruby-$portVersion.patchset"
 
 REVISION="1"
 
@@ -32,14 +29,14 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	ruby$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:ruby$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:erb$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:gem$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:irb$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:rake$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:rdoc$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:ri$secondaryArchSuffix = $portVersion compat >= 2.1
-	cmd:testrb$secondaryArchSuffix = $portVersion compat >= 2.1
+	cmd:ruby = $portVersion compat >= 2.1
+	cmd:erb = $portVersion compat >= 2.1
+	cmd:gem = $portVersion compat >= 2.1
+	cmd:irb = $portVersion compat >= 2.1
+	cmd:rake = $portVersion compat >= 2.1
+	cmd:rdoc = $portVersion compat >= 2.1
+	cmd:ri = $portVersion compat >= 2.1
+	cmd:testrb = $portVersion compat >= 2.1
 	lib:libruby$secondaryArchSuffix = $portVersion compat >= 2.1
 	"
 REQUIRES="
@@ -82,12 +79,13 @@ REQUIRES_devel="
 	ruby$secondaryArchSuffix == $portVersion base
 	"
 
-PATCHES="ruby-2.1.2.patchset"
 BUILD()
 {
 	libtoolize --force --copy --install
 	autoconf
-	runConfigure ./configure --enable-shared --disable-silent-rules
+	runConfigure --omit-dirs binDir ./configure --enable-shared \
+		--disable-silent-rules \
+		--bindir=$prefix/bin
 	# The build process needs to run ruby, and without this it fails to find
 	# libruby.so.
 	export LIBRARY_PATH=$LIBRARY_PATH:%A