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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 49 insertions, 20 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/Manifest b/app-i18n/prime/Manifest
index 34a01d81a064..4f94d8bf66a0 100644
--- a/app-i18n/prime/Manifest
+++ b/app-i18n/prime/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX prime-1.0.0.1-libdir.patch 430 RMD160 f7fefd6241f8b928ba8c2957a74832c0facab667 SHA1 ce6caf90d9f158cbf3433d071a6912741933b64f SHA256 eec73ffd498e4b8d1df014e6b39558cad12b610f3c75131e053b5e6d3ddd857c
 AUX prime-1.0.0.1-parallel.patch 535 RMD160 3c7ad01afe3d83b3c065ecd3ccedf72a0b8866cb SHA1 7afa386a532ad3471f7ba496967c9ffe0d0dccf2 SHA256 aa526f3b8ebd22bcbef4fc6a291d52f5dc8cecfc45f32e7782029c2aebb8b0ea
+AUX prime-1.0.0.1-require.patch 354 RMD160 2496cfbcc0ee947018599476af7b066477f61896 SHA1 7ef3ae277ebcff50f3d04657149264716f84fa3c SHA256 a3009cbe26a9fc9a0f56fa5fd1a50969ec7511ef1de5be254d58e8b4924a1124
 DIST prime-1.0.0.1.tar.gz 300251 RMD160 ce8bc8da881cfae6fe6ddaa3cab498ef874db6ce SHA1 cb634fcbc1e26903d690bd913798ce23776e6026 SHA256 3f647c98e09146e41d7c387b395788649534c8c8831c406ec3de5d1436ade4b4
-EBUILD prime-1.0.0.1-r1.ebuild 1220 RMD160 1b4b4cd7d0d514cc8339b84a36f08ef46f98d661 SHA1 6aa3d77476e94580103ef0fbc2e27954a3049995 SHA256 e5686dbacd83a03a308876f69896409530084e104165a238adf7bbe2d06cd652
+EBUILD prime-1.0.0.1-r2.ebuild 1445 RMD160 afe4e5cf54508009c7f0a5d51114ed25e0b1ece3 SHA1 992dd7f7852b38c8b56482f7a061c9a43b071473 SHA256 10ac53e27fdc7e479eb694a0227f935a847c8d365484c9720d93b7bb8662f721
 EBUILD prime-1.0.0.1.ebuild 903 RMD160 c679fe5e0f7908a4f4050883f80ff4437b5725d3 SHA1 4873d062958e1aa90e4d04e7919f3725307c3b14 SHA256 0a22ba316cecb20b2af23399aefea4525874d1afbd19cf7a16886d98d032e7cf
-MISC ChangeLog 10107 RMD160 398009fc97873192617d464a148fb7664b1effa5 SHA1 02878e356e4787c1e404311bc0d15ea17bd35505 SHA256 64d91311f9d7b66eceb32ea3bc4e05f6ca94bd050e8d2924c0562e16a369a907
+MISC ChangeLog 10347 RMD160 7cddf81c48328751e3302ed9e53749334f5d95fd SHA1 21927c7f805a35dd7a682ed50e930eb4ed7d8455 SHA256 ff099d8d17d080b717b056a2a2af8f769598c61546765836d1f82e862910c4ba
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPG+24AAoJECaGw+YFKA1p5hQQAJ8XGE/ZtH93KpH2CV3t4Cjs
-TYRQqVj8AoCsfPER3Y+B5TNEYcV6h+W7T9ywoJCdYEebwBkNa+1/t6zrV7SHZ9q5
-0lkBPks829f1Ek3fQ3TvjDLohGFHQFOBVR2KaTUcK2bJNLASufHygb/HSww0xkAW
-QYJw2ixsrmUkeEim41lS5rUuL7zqEResrQDs0vbH+WaFYQEsdhsTIMSbfUeMUksS
-AZ55WPfwmrp0Gdv7AkvpmYmIQnP+7ey2XlDe/1/bN6nb3zGKFzMzKBFKrDPE7zfG
-Ul/MM+eTz3s8kcgtYJlqdZgAXB8DQtRLT5XrBjt1ltALPq+AUTvt15dsDIcayRbn
-USJaeFkaQc7YchN6wgKxoqmc8lL0e8bRFKoNxPtWuP3PIdCmP+VEJhOfWQYi+C7f
-uLOHz9xCXiAlA1NSMmLSMzXAQMa2s3FWFnILBPAw9crxv0LWF8P1zRQzSFqn5eMf
-i4IygvbNgOsff1kKKQ6m9n+VlVjTMKvu76FRDm69wiDHhJn3Q167qKD4wcsNyS+a
-CKf3VdgHRswgcw1xmPimRUm/e0gjDZiRDBe0u186Qg7Zxv9pdiMwfa/raVaGMF5a
-mmUi+OPJASAZ5Bnd811Xx9tGsdpY51aKwGnAglZtv6ORNZz5YLYFjzmt6nyqaK3y
-20N2GZTImqEUQcCOj/oS
-=Vvsm
+iQIcBAEBCAAGBQJP42DMAAoJEDYO1FT4VRUUlv8QAItei57z6eRAKB1eCmd4xuTk
+9VCVc+ANWVAYreRJULriF29aSPrWl5lmk++Cx2cATuh3XuW/4hFincgX/0bkX4Ug
+bV7aLpb+NKQI3k2aVDmtkvIjI3uP+Gu7Xl7S6OUgj8/z/xwIjwJHZk5c3I7IlZFu
+8TT8u/MSeqJb891/WpLnqITNwwRzGL4uIb6roN9BmMP29svF6kIjMXfw/PNdeHnN
+k6uOhSXOGEa9JXzf0p+90WO0kA+ooKwJtpKFOgavRjTImtxRH3wXLWfIBNL0KizY
+5J+erKgYgWKsO501OgK7DoEsLFXRsU2Y59QkNo+SHnW0ZBQdVQHy4MMjIm2fwh7w
+8EehytTbX/bZ4p/4qHfbg56VYizOjzKFM9gf2mn+8yGobNFd9aNZmL953qLVTNFl
+cp0wOc32tywmcHUs57Ir8/yKeyOpP8OlpPHbv63NB1cgmw4EJos9l7kd/HUOw9F8
+XSDc2BdI56ARf0mV5cOWi9SRDPxMCrhI0vNMeh1M2QgaShs7fX00ffBKBKptN7yt
+9Y//zcSvDrHyKk2swyTnLTn47pxQMFVhe4ksSXqJyPlht4AaOAYliLYr56tF2NLf
+jjZ+veLl0ALHAfrEnHGnhFT9ftCb1LrmdMPA1udQO2xALWlk56/8C+bxP3tSxBi/
+6EuFv8q56U0sp7ycJKpL
+=x8uK
 -----END PGP SIGNATURE-----
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
 }