Backport to remove need for bundler, fixing bug 491456.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 14 insertions, 7 deletions

diff --git a/dev-ruby/msgpack/ChangeLog b/dev-ruby/msgpack/ChangeLog
index 2a40101f0898..8529fec7221c 100644
--- a/dev-ruby/msgpack/ChangeLog
+++ b/dev-ruby/msgpack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/msgpack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/ChangeLog,v 1.20 2013/11/19 19:35:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/ChangeLog,v 1.21 2013/11/19 19:47:55 graaff Exp $
+
+  19 Nov 2013; Hans de Graaff <graaff@gentoo.org> msgpack-0.5.5.ebuild:
+  Backport to remove need for bundler, fixing bug 491456.
 
 *msgpack-0.5.7 (19 Nov 2013)
 
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 79f32b15807b..80ef94291351 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -5,14 +5,14 @@ DIST msgpack-0.4.7.gem 20480 SHA256 48170bd136f8f96dd4fd2cbd0304503e41dff70714bd
 DIST msgpack-0.5.5.gem 36864 SHA256 937f07f9e3d9ec6393c4cfd6128196c43374d8e2940c51d13d71c626b1dd1eec SHA512 8ed33d4e7d2deda4a48e3a45c44a0ec8a7aaae04cfbb797726da1cbb612e312d69e75da4e68f0942a4ffd004b8f298b455e78a19f582d56d76120834f7de44f7 WHIRLPOOL 8b8a1c693a5086257e89f0c47d350347cff6ac9110b57c96ed54cb0982637ad8e52d4b1c39014b712c10ea1ddefc689b31f89f34446d5bb3d132d40a0dc88514
 DIST msgpack-0.5.7.gem 37376 SHA256 99f21f99187eb24bfee8283e7e16328c0479f27b64dc5475cfbc672cb3df982f SHA512 b195dcb15dde4e5fa7847f9a5b06f4304126d289e55f32aceef5d5303841df485133e6856355e089128ae88ce46a5dcc922f70fb6e033e2d658d3bdc8b62fc6a WHIRLPOOL 84fddc6f7f7ab9aae0617df92cb6d83e32bef63dbd4e57a85a6a403afdfef560f5fd902f2f31d624679711481023904968e54209984d832d2bc3c3aa5c3503f9
 EBUILD msgpack-0.4.7.ebuild 1020 SHA256 cd917787462e0c395136dfb57dd08afa1e4719eff56366319276403dc846ed43 SHA512 565e0016e64c5fc22be0b57758a09c78df27db8c3c4b1242a5ab8dcd23cad87bfc9562b1787311eeff668b13f783586494a3c01a1188d3d319e31c7a476a54a8 WHIRLPOOL 6b854f052d3b40610bd729cebddab67db5671b3133c3d028acffee382c3b6429090fb81562932787297e35dc76e405ca340f994d799f3e0b7b4d83683ed3fa97
-EBUILD msgpack-0.5.5.ebuild 1158 SHA256 66d64fadfcbbf5ca7d84fd28082946a6f73a02c257d6ad51b88ef81c7fd681f0 SHA512 b8f03944403a0ce26b69b814b42b8d955e678adaab784653be7f03c422684bb961fa5e023bff74a318c245d9d9500a82ef1dabf54d5d80f5cf4e8193f2bb9771 WHIRLPOOL 56d3cc6dce9ec15e89910847581a10a62918d79bf541c335500ac161df9b5fccd3e100136ebe7accbee582ea257766810b5a00b3d97e78aba3de8427a882736b
+EBUILD msgpack-0.5.5.ebuild 1230 SHA256 51c5adbc8489e150f992eba7dcdec60f9879fb29a8146d51bf5574256dc393cd SHA512 770dedcc1e4aa9395318186fdb020257d2ef83d062cca3648dadcc353e07c12c39cf8cab157ebbeac8484661f72d2274fd0dd7ae447d968240c9d4527cc8cf49 WHIRLPOOL b37e0ecf098463ac0838be4c4fc9f8b204e4d47dc41c78fc08dc689cf69dd780558e6f0c5eb4e7c5baf7c792a3db11663827553d593fa18944f85654ceb5674d
 EBUILD msgpack-0.5.7.ebuild 1397 SHA256 0a65d1e0a00c7e781b5f3057ff910374fa3aef8d54c6cf9569015aca2319c7f7 SHA512 93e50daeee2c95a9767f75f81bd7c3f5101392a63d92204bfe1be8be7c99c998b7592503300dd64f30725eaa0986c7aef4ec3128af54dffe4fb048da38f8954e WHIRLPOOL 6aad523e99565717b567238e216066a10aa9dc6865c5089d07420cf92e0926a1187dafe2cbc8bde72b894aa96c2f2f47ec964c351dcddca6721bf998228c168b
-MISC ChangeLog 2991 SHA256 a9e4cd5ffdedeeb8e025b6c00263719827cbabcf6da777aad4f117a5fd73b330 SHA512 3741be4d827e9372e178ed30785b55f337fd7a79c5f17afb94439b14c97c3c70cf63b96797750f2f660f9ad00b27bf33b335c5ab96d85c542049b21d2efee16d WHIRLPOOL 945e82c12d40f1fd3fe0dd6410ebd99331e884501a3ee152e98e378e41e27967353274c3d2d8bfa2c4fddfa65c02c2e219aa1ecb65ed580fab9c8737b75a99f8
+MISC ChangeLog 3122 SHA256 2d223bff180f356bc9b355fb63266ae48f7c051e120eef85d54c8eae6d29a0f2 SHA512 5cb7bc6a71ca7c2804658935301586c73c050c3a5c9670961b536a607a73817bb7f98d04ea6b64e0ea2ab9767925288b5a3410df9cec6c3dfe9766eb1bf0d7e4 WHIRLPOOL e85211f5fa24f9c7f112ed8ee145893197a610a2e48933e248b3f839542cc630329fba6de2b017d44e8cf67dca4afd6d97f6a45795899084a28f6f60852f1410
 MISC metadata.xml 158 SHA256 cb912d1f997e9e0c5122d4a02de6e3fa5bb4d91fc1eb5a5ca616becca5db2a7a SHA512 9032da465411436fc83b6e6667030e4fc9d0f28e743286af88407d46a331b5ce5f6ffd55d8ac5b49390a964d915af79743aeb0edd10fc9e72e30dc00b40abe3b WHIRLPOOL ed69120b1be86fbda44122a32c1f1bc69fb4ad6f56aede11046cd19d278304f5cc76f60aabf89fea24b3f1246b9c54eca199ddc50c1a93f10b50a5ed6d1d58cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF0EAREIAAYFAlKLvXwACgkQiIP6VqMIqNfcnwD9Gwy4iqYgYMtUZmCStm9YedGa
-N1j8rinAaOY05mbRPuMA+LehoeVdy3fS7QQlN/IDMswBh21Ag9Rm1TBf0JkxGDc=
-=xMsX
+iF4EAREIAAYFAlKLwGwACgkQiIP6VqMIqNfMjQD/bvaQtt9ZlR62GjFqg+GHeaQ/
++8ubtYUfH8ilzTJvsIgA/1mepUrL+vHDXLJNNcnzRuLIpwEw7PAkZLl8R7YlNccP
+=r5cr
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/msgpack/msgpack-0.5.5.ebuild b/dev-ruby/msgpack/msgpack-0.5.5.ebuild
index 75507dbec466..fc012bb1ead0 100644
--- a/dev-ruby/msgpack/msgpack-0.5.5.ebuild
+++ b/dev-ruby/msgpack/msgpack-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.5.5.ebuild,v 1.1 2013/08/19 20:43:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.5.5.ebuild,v 1.2 2013/11/19 19:47:55 graaff Exp $
 
 EAPI=5
 
@@ -23,6 +23,10 @@ IUSE="doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
 each_ruby_prepare() {
 	case "${RUBY}" in
 		*ruby18)