Version bump, fix rubygems2 compat (bug #486096, patch by Tiago Macedo).

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

4 files changed, 129 insertions, 10 deletions

diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog
index 76c1e90b0d95..9fef163ca114 100644
--- a/app-emulation/vagrant/ChangeLog
+++ b/app-emulation/vagrant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vagrant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.28 2013/10/03 00:50:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.29 2013/10/18 05:37:46 radhermit Exp $
+
+*vagrant-1.3.5 (18 Oct 2013)
+
+  18 Oct 2013; Tim Harder <radhermit@gentoo.org> +vagrant-1.3.5.ebuild,
+  +files/vagrant-1.3.5-rubygems2.patch:
+  Version bump, fix rubygems2 compat (bug #486096, patch by Tiago Macedo).
 
 *vagrant-1.3.4 (03 Oct 2013)
 
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 6508ffb521a2..48d874eba394 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX vagrant-1.2.1-no-warning.patch 257 SHA256 63e9af972c097ea3b7046350565a7188061348bbdeef73bbc5445974ca2e2249 SHA512 297908474c7da8622b45754a0de71bf584b4488432b4265c0308248f13b00bd1c3bc8f643700400a3028e552673bbbca58ab25ac7900cfcc1b6900dd1c4b8a9f WHIRLPOOL 7ef40c4f6dd22913830a22fcee1eb95aeda029afde03dd2dbbfcd9816f1e9584acd0703d22383913498f8be0c7675473a298b8cc44a87d31e395409de532d515
 AUX vagrant-1.2.2-rvm.patch 284 SHA256 45b8b4ce8c9d7b0b96922da92390c8d23b083534629074abcbf9d8ce2b4f9ecf SHA512 cacb09967bc8a6158fa6ec6f728fed4dc4ad43c64a63d68be867174bb045e75eca67aa2c494e91df7ba78641bc5f69cf147d44f4482333a71d0f6e7208d86226 WHIRLPOOL 682b7a72749dfcee8e93cf994bf0a340b782983befddb89320cf3c3c5de3a9134965350099d00fd67260afd83ca3876194208158d1914d921f351e304bcf5c3c
+AUX vagrant-1.3.5-rubygems2.patch 1422 SHA256 33bd6bcaf7da4c720493d862860cf4b8c03e908227919b6deec56a52cf6da353 SHA512 0976f06b4fc6a119f18bf8e8565fcc91e55eaf2c65a88274e439bfd62c900c30d3a20169019c9636d5655b334946bb37eda1de502bf0d023aa708eacb04d90fe WHIRLPOOL bbf182a4ede108bc3ddd6a443814da0a8027238f4c9a175132225537bdc107e40c3cf946cfb19642f6b4359582c251b2684f60bca3a4cc11fc6476c17353ef0e
 DIST vagrant-1.0.7.tar.gz 1005940 SHA256 aebbf855420974f8165019786034f12e3392d5aee7a982242b0d3c9d4cce891a SHA512 351fd08ce97ea0e7623f216900189ec25417173e92103ff7491cd7be38c3549bb8aaa88fd45ef589ed7c2ee64df48373f37e733bed571cac6c9fba69e374f577 WHIRLPOOL f4914ea81dd560e08415a4a3fa15aa3a138de574f9cf14d8196c8a80e1bcbe2ee0910e253a18cea9c57e2f1dd6f5d002397be228f6463b3b7050ee7262b8fbce
 DIST vagrant-1.2.4.tar.gz 253686 SHA256 117b68e5cac3572e439181855124644f5921eca5f97ff1c7222c88d044ff9b73 SHA512 34351a0db0f23e5e602732528e3f1d18054dfebf486915aebef16607eff5e884d7378dc9831fed0609fe0d9d1fb298b488022a297a88131e148ec90b15c72a8a WHIRLPOOL a0190b3d93c840d2c262271edb9bc64ce53ccfd4052695471d42682d70e921abd24067f9cc1c36ff2269f8c3cdc0537f26c36d44dee9fde4d1681db3f3e36035
 DIST vagrant-1.2.6.tar.gz 257600 SHA256 11deed3af85345008d43e2ca2ebde43e719dcb4477e594f975c6d7a638e24811 SHA512 3826bf3cf702bd6b6557f1493ff90511f0b3c3b14101508349f7569bf5516e48df841fda5cea81daeee4092a0add2df9fcfd3ca495ac81bd8849fcc345621368 WHIRLPOOL 2e8dc2578b619cbb0482a58083a1849aac94973f0c519d8759a5ff80c3d857e226ffe2aca2b2538fb0d1f62f97827cd34f1b2906619f3a8e4b6bc68bef399803
@@ -10,6 +11,7 @@ DIST vagrant-1.2.7.tar.gz 258038 SHA256 8058b0a62789c48cf4cadbfe2fff0cf1827ce595
 DIST vagrant-1.3.1.tar.gz 2182753 SHA256 d11d11347fc0ad37c535d7bb2d18fe30840bc5851882cea7eb72e7343f4ee2d2 SHA512 f7510b658c8895687764c04013c132012c6ffbdc07ad28815edc1b01e0ba6f583fd9a281e100d87c8731a8ea0978651465082fe19831b740b084c49c0b47cf62 WHIRLPOOL c7c113bbe7a92d7575fda749f11c36edb91b7af3cec726dce4dffde93fea91156fdb8dd61619c9a4ea570ceb21b132ab94370ed61e21231cba3bab5762e3297c
 DIST vagrant-1.3.3.tar.gz 2187037 SHA256 e57abf02f729fe46d2f34636723cc7b9965b923cdeda78bc43770a41e476c345 SHA512 8fe1314165389f85c86b1d35e96072077b4a0087ffe07262f4ec413276bb6bf1bfa7010090398fe6e8fa66b26f0f3376b67b44d0f6e4c170722c8a9991bd4ab7 WHIRLPOOL 9003f9d39940dba25ba16ca007db0f13e35bb3f35412d1d26b6666eccb4c559e5633cd18c3f14840c1b5702a2e6d79a877376298176c1b3fd3d5dd604f9f8bb0
 DIST vagrant-1.3.4.tar.gz 2189594 SHA256 b6214477777cee96817574283804a96f0d939c8068f198455d5491ed75fa4f13 SHA512 96c619f507da9765a2bcc5dfebb78cb024c2a7571546cf08efb5db0db537c3d46673d99a5a3ed30dec8da5cf82d57f7bf85484c97f2668df05fe879e7c53a721 WHIRLPOOL 23c215c8e2eb14f4816f9fee8db2028a82f19fe8206f48efc1281cba8b7d0b2ecdad65d11b21bae66bd942b3035d14aa640b0815e86efab5617a75271e867f92
+DIST vagrant-1.3.5.tar.gz 2193976 SHA256 3dea6f39d8e207399e1aa4c0a50343e115af4fd21f23ed974e4031d2d3b82572 SHA512 0bfbc6888cc0ab04210c67cdd6c631fdba6d178fe22f4a74695747ad3a25d8f1cbe00d3191a4009ecbc8b080674d3941bc75464b3ded9b74c6f56d9cad6ecf84 WHIRLPOOL f123de33b4f2df4e4760be45c1091326b8b86013bf1c4d7b5d72efdb6ec66570e769d7a69b630d2d24eaf3c90c2776f51d20dce5850bcb2359afe2555267318b
 EBUILD vagrant-1.0.7.ebuild 1704 SHA256 3deacd44360d14f81b9b7d29e08e1a2ac92a6fb81a0acacc9d643cefc21f5d48 SHA512 6804ba0f106e71df08e743232bf11545eabd4d49de658bf0a94567508fd0ea46aa13c1da868924d7d6db5401307d6fe8fb1a678684aa337ac23f4d4e32c92cf0 WHIRLPOOL 8578e9ab9f269324bb38f87453e5361cd915cacbb75fda357d621f297c503578c07f4cf67aa5d76ff648af05028f0dabc0ae5fa7e5c73972bbba3da7a9cfd13c
 EBUILD vagrant-1.2.4.ebuild 1768 SHA256 0fddaf8bedf2924b24ae7fef5416a71a25d8c50130e4d9912fa8ce7ae618622a SHA512 6ad9b0d74d53445a052ef84e5ada5d820228f42ed292f011121ecfa03e456605794c80fe0992f33b07fbe6cc503e98654a0875be8eb57077d3eda09d22a2a2f7 WHIRLPOOL 65c8ca4d3eebb184e9212b0f9fd6c9b932f960998e702c9dbd3061f31dbe5c8fca0d2e4d231bc0793351a001d444a0d00de8bb33f6f9f4a0141df84616dfd400
 EBUILD vagrant-1.2.6.ebuild 1737 SHA256 aeb57da7d6905625652dd1503ae547fcc2b6175910f99e0cf2ccf2ec5b091893 SHA512 d58f1f68cccd98067f04754db279786bcc45a1df40755d798df966f234a1b3d724fa1edbba72d917339f88c96e8547c4adff2b61ad213ded182ced2e44927c5e WHIRLPOOL 0408a23fa64c8f1b26b992f87cf62afc840a07063133262fd285f72bf45b2cdda3df3bfd61047d5a8ae593dc1212c52003f135bbfc1ed122015ca049e88952e5
@@ -17,16 +19,17 @@ EBUILD vagrant-1.2.7.ebuild 1737 SHA256 a533e48db250ec153699bd17ab309300f86243cf
 EBUILD vagrant-1.3.1.ebuild 1737 SHA256 cdd7af604cb182985402cc31b7a5d3976ccc0f99467a71ed4e2c8aef25421522 SHA512 1aec3af0ebc765430e93910cd72a00fe886fccb25e46247cb02aec64bac7667f3929e70a1eae8580da32c0b2a9ddb0fdf6c2f4045a2475fbefa8b9cfe236cd39 WHIRLPOOL f6cff3955736ea67db9216f6a26171ad4fc2c722c6bf4d1ad353f380827d486653f217b9c3fc30ca3877b03fa5a93166aeb3cc70a8b30bcbfb96651e8e2bef76
 EBUILD vagrant-1.3.3.ebuild 1737 SHA256 a57490b783f3598df068e2b9114fd8d410466bd6c4139aee8586fd7caf88daff SHA512 64e48f0107b687e785c2ff283e4c08e776a601a79313774535e377bdd0eaecf59ca2d6bd9c3f805ad47b01b04e9b06a003c4d6c8da3083cb1b0986cc4372bafd WHIRLPOOL 69b22afa8f60d09b46b006df5cab03e1c029148c145a8293731eff7da22b8d57b3cbf46c1e323cf4bcd2b5ac60db509757d8597e78b54e37e067809b965657b4
 EBUILD vagrant-1.3.4.ebuild 1737 SHA256 10338cf761e4a2650559b2b4b296b11036026226fd9c6b39edce624fcee43a4a SHA512 32104e337def70a0f9bb4cb10ef46b853bea79c5274d6009019ca172cf1680d9a8f1f495ff8d15190b3aed2739cedbf26e31bd67f2f833a00c974555bf839293 WHIRLPOOL 4c219029f3045bc0d23fefca9c226ce7c2f9c08a7a60ce4e2d6fdbbd8079bc49a760bd6ddaf0a9ae64d2566b5594f846221965105bde906827111abcba8d1b7b
-MISC ChangeLog 3972 SHA256 865657ddc6ced58a77b60e2effb86ca1672064ff34a16489203a5918cb7f65d4 SHA512 9dd4a11e4c0234fc0842de16cb7d0e81b6a026c9211fc53f857a071457acf9f89e4dd536e6e16eee41b9cfcb1cf2cd980ff109218ad8bbec1ec3362edfdd6642 WHIRLPOOL cde3e1e70e78a3e1e168fd215fa55ce5eef0238c43e5ca73facb0775cbb6fda912ca53e592a3e2bfeab76f2c108af97151a1d4f790caee3c6d40b44eed6c4591
+EBUILD vagrant-1.3.5.ebuild 1780 SHA256 0d862fc804a618d3b4743805bfe7d94f750de59fbc0552dfa16a53988ed09e08 SHA512 e16c1629980f14fc630e76db5843b9d538fb98196a94a504bf55215aaa7e1b54e5e7ed9f3c04de41c7df200a6a9d57245e5ecfa6b0e0d2dfd7bbbb973aafe6b2 WHIRLPOOL 2dadc02e907c9176636f80329bff9f4dd1055b7e419018f361cf8abe8faf13a29651c21f01c22ca0dd81f8ec2029acf2bb8224fea1ea29e74d788bc6c3e2bd16
+MISC ChangeLog 4190 SHA256 0600a757d4e5ecc0f490e9eae64bcaf92fa870f0a7b409210994e83c7b06b314 SHA512 c9462698549a999221349d92ca476cf12f4a33412432f1c779da775fe85b3036e14c826c4967fe6bf41fb252b7ac3b3c8a33e2871aa55112d07dee48f2657252 WHIRLPOOL 341ccb36ce2d77599305996f15fcf7466f024cd3aa7c1a80e86f1b9adb87bd4b3be690b6ff32605c2d917572da108a5f0769b67241411b5ec72aea9740b51271
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSTL9HAAoJEEqz6FtPBkyjflUH/2b7tR9hWaRUNbDueczce8ZD
-FPMXrIZzKRT9ugRCqilvSYYwy2tBbs90Y1bQf05MDqVBoRatKCli+FMjrLq2bTwR
-OPMnzQXgdVtHeX//7FN/MOUSBEdFv6v+15RUh3GRpV/sVySfdHqeZRM7ZZfUiJoV
-XPKQWvQRGS+eNfwUuHPbecz28EUFYXmr7Uw+31cIGr1K73E+DOS14lFxxRefV/Wl
-toJV4TlgPwjOZX4pIVqMrR5k8x9xro+VWs1WH4hdKFyuq2Vf0s39fdY92lYUTjwO
-7CTx0aS2vCgMv9p4NJsAHWZEKnK6naI2lVELo/kYghLs1DeA9/9GD+6zqh95NVo=
-=wBfQ
+iQEcBAEBCAAGBQJSYMkvAAoJEEqz6FtPBkyjMdUH/1khSTEvYlmWbg9inXxJafEe
++t+gpxIi1xI9J9j99Peyn7z4I3nyXevn3TwnSrf8s11w9/WigEq2LJRB1JOfmk55
+eXbyM7mncc9LDD/ZqO5IMhR8scNJavRb7BbQV/A+ldskDEmPAqa+3DVaa2YR6eIM
+EXdgLqMQAsOxoPb0LplphhLsm1s3yMvKDBDY37t8N7sc7itNaF0Yas3chXyAZz7H
+nRrfTYMob/FYBWpej0L4bOpGiyG+VjYm0UYFRNC1Rc9dMH7/guTysDdi15K7c/Vf
+Wf9y3NKqzsm3dyQvKD566qRXPGq2wr4HDTd/bq09Cmyakc/ivlpUkQVhI3yMkx0=
+=OsQW
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vagrant/files/vagrant-1.3.5-rubygems2.patch b/app-emulation/vagrant/files/vagrant-1.3.5-rubygems2.patch
new file mode 100644
index 000000000000..763fb6fd1088
--- /dev/null
+++ b/app-emulation/vagrant/files/vagrant-1.3.5-rubygems2.patch
@@ -0,0 +1,42 @@
+--- vagrant-1.3.5/plugins/commands/plugin/action/install_gem.rb
++++ vagrant-1.3.5/plugins/commands/plugin/action/install_gem.rb
+@@ -1,6 +1,10 @@
+ require "rubygems"
+ require "rubygems/dependency_installer"
+-require "rubygems/format"
++begin
++  require "rubygems/format"
++rescue LoadError
++  # rubygems 2.0
++end
+ 
+ require "log4r"
+ 
+@@ -26,8 +30,13 @@
+           if plugin_name =~ /\.gem$/
+             # If we're installing from a gem file, determine the name
+             # based on the spec in the file.
+-            pkg = Gem::Format.from_file_by_path(plugin_name)
++            pkg = if defined?(Gem::Format)
++              Gem::Format.from_file_by_path(plugin_name)
++            else
++              Gem::Package.new(plugin_name)
++            end
+             find_plugin_name = pkg.spec.name
++            version = pkg.spec.version
+           end
+ 
+           # Install the gem
+--- vagrant-1.3.5/plugins/commands/plugin/action/prune_gems.rb
++++ vagrant-1.3.5/plugins/commands/plugin/action/prune_gems.rb
+@@ -126,6 +126,10 @@
+ 
+           if prune_specs.length > 0
+             env[:gem_helper].with_environment do
++
++              # due to a bug in rubygems 2.0, we need to load the specifications before removing any
++              Gem::Specification.to_a
++
+               prune_specs.each do |prune_spec|
+                 uninstaller = Gem::Uninstaller.new(prune_spec.name, {
+                   :all         => true,
diff --git a/app-emulation/vagrant/vagrant-1.3.5.ebuild b/app-emulation/vagrant/vagrant-1.3.5.ebuild
new file mode 100644
index 000000000000..72a02d7df56c
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-1.3.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.3.5.ebuild,v 1.1 2013/10/18 05:37:46 radhermit Exp $
+
+EAPI="5"
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="config keys plugins templates"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
+HOMEPAGE="http://vagrantup.com/"
+SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+# Missing ebuild for contest
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	net-misc/curl
+	!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.3.7
+	>=dev-ruby/erubis-2.7.0
+	dev-ruby/i18n:0.6
+	>=dev-ruby/json-1.5.1
+	>=dev-ruby/log4r-1.1.9
+	>=dev-ruby/net-ssh-2.6.6
+	>=dev-ruby/net-scp-1.1.0
+"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? ( dev-ruby/mocha virtual/ruby-minitest )
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/childprocess\|erubis\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+
+	epatch "${FILESDIR}"/${PN}-1.2.1-no-warning.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-rvm.patch
+	epatch "${FILESDIR}"/${P}-rubygems2.patch
+}
+
+pkg_postinst() {
+	if use x64-macos ; then
+		ewarn
+		ewarn "For Mac OS X prefixes, you must install the virtualbox"
+		ewarn "package specifically for OS X which can be found at:"
+		ewarn "https://www.virtualbox.org/wiki/Downloads"
+		ewarn
+	fi
+}