Patch Kernel::require to require to include rubygem path. #420499

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 31 insertions, 3 deletions

diff --git a/app-i18n/prime/ChangeLog b/app-i18n/prime/ChangeLog
index d3a8ecce46db..b65b1c6c07e3 100644
--- a/app-i18n/prime/ChangeLog
+++ b/app-i18n/prime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/prime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/ChangeLog,v 1.65 2012/01/22 11:06:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/ChangeLog,v 1.66 2012/06/21 17:58:39 naota Exp $
+
+*prime-1.0.0.1-r2 (21 Jun 2012)
+
+  21 Jun 2012; Naohiro Aota <naota@gentoo.org>
+  +files/prime-1.0.0.1-require.patch, +prime-1.0.0.1-r2.ebuild,
+  -prime-1.0.0.1-r1.ebuild:
+  Patch Kernel::require to require to include rubygem path. #420499
 
 *prime-1.0.0.1-r1 (22 Jan 2012)
 
diff --git a/app-i18n/prime/files/prime-1.0.0.1-require.patch b/app-i18n/prime/files/prime-1.0.0.1-require.patch
new file mode 100644
index 000000000000..6da1c3300842
--- /dev/null
+++ b/app-i18n/prime/files/prime-1.0.0.1-require.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/taiyaki.rb b/lib/taiyaki.rb
+index 3c2ca04..83632e4 100644
+--- a/lib/taiyaki.rb
++++ b/lib/taiyaki.rb
+@@ -12,7 +12,7 @@ $KCODE = 'e'
+ require 'jcode'
+ 
+ begin
+-  Kernel::require('progressbar')
++  require('progressbar')
+ rescue LoadError
+   $stderr.puts "WARNING:"
+   $stderr.puts("  The required Ruby library 'progressbar' is not found.")
diff --git a/app-i18n/prime/prime-1.0.0.1-r1.ebuild b/app-i18n/prime/prime-1.0.0.1-r2.ebuild
index f3fee1eecb6b..eb1ecf6c5653 100644
--- a/app-i18n/prime/prime-1.0.0.1-r1.ebuild
+++ b/app-i18n/prime/prime-1.0.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/prime-1.0.0.1-r1.ebuild,v 1.1 2012/01/22 11:06:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/prime-1.0.0.1-r2.ebuild,v 1.1 2012/06/21 17:58:39 naota Exp $
 
 EAPI="3"
 # don't work with ruby19
@@ -18,6 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
+ruby_add_bdepend "virtual/rubygems"
 ruby_add_rdepend ">=app-dicts/prime-dict-1.0.0
 	>=dev-libs/suikyo-2.1.0
 	dev-ruby/ruby-progressbar
@@ -28,7 +29,14 @@ S="${WORKDIR}/${P/_/-}"
 all_ruby_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-parallel.patch" \
-		"${FILESDIR}/${P}-libdir.patch"
+		"${FILESDIR}/${P}-libdir.patch" \
+		"${FILESDIR}/${P}-require.patch"
+	# eautoreconf
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby -r:${RUBY} -r:" acinclude.m4 || die
+	sed -i -e "s:ruby -e:${RUBY} -e:" src/Makefile.am || die
 	eautoreconf
 }