Revision bump. Fix rvm issue (bug #474476 by Benedikt Böhm) and loosen json dep (bug #476080 by Simon Kohlmeyer).

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

4 files changed, 99 insertions, 10 deletions

diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog
index 29ea8dfe8dd7..8201219d0ed7 100644
--- a/app-emulation/vagrant/ChangeLog
+++ b/app-emulation/vagrant/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2013/04/24 05:34:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.20 2013/07/08 00:01:28 radhermit Exp $
+
+*vagrant-1.2.2-r1 (08 Jul 2013)
+
+  08 Jul 2013; Tim Harder <radhermit@gentoo.org> +vagrant-1.2.2-r1.ebuild,
+  +files/vagrant-1.2.2-rvm.patch:
+  Revision bump. Fix rvm issue (bug #474476 by Benedikt Böhm) and loosen json
+  dep (bug #476080 by Simon Kohlmeyer).
 
 *vagrant-1.2.2 (24 Apr 2013)
 
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index aba1acc019a8..723f421e25c1 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -2,22 +2,24 @@
 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
 DIST vagrant-1.0.7.tar.gz 1005940 SHA256 aebbf855420974f8165019786034f12e3392d5aee7a982242b0d3c9d4cce891a SHA512 351fd08ce97ea0e7623f216900189ec25417173e92103ff7491cd7be38c3549bb8aaa88fd45ef589ed7c2ee64df48373f37e733bed571cac6c9fba69e374f577 WHIRLPOOL f4914ea81dd560e08415a4a3fa15aa3a138de574f9cf14d8196c8a80e1bcbe2ee0910e253a18cea9c57e2f1dd6f5d002397be228f6463b3b7050ee7262b8fbce
 DIST vagrant-1.2.1.tar.gz 246803 SHA256 7e319e22226ae0857611682619b84531e1810ac66f93c12fa5e168cb46ccf4b9 SHA512 56cddca196ef62090d6c3e8667cb1acda56cc95363419689ccf3b428ca564dabe6958a957e76b2f411dee41ffeadcc348b5184776c63ac37f8c7ffa67556c8c0 WHIRLPOOL abf22fce7030584e85243e064f4b426b405684962f679dcba17e777017b8b0d95f2d4dfe7cd79435be509223936db585cc1e72982f772ac24e2dd065fb5f620c
 DIST vagrant-1.2.2.tar.gz 248415 SHA256 a87382691606e7035c6aad53b1c53d83c040c5746fde880a9b57b6e2e93e0bf8 SHA512 d0d4a48bfdb595ca6f573a9e2ba9d364173b5ec43f6df86ad2912b5d8e091e262d00320275a23fb9d5459933e3f03142abac5900782211e765ebfbdc782dfc6f WHIRLPOOL 5de67904371b1671c6457a456cef76d1f3007f169aab952baf2682e6940ea287c2a70093c5199af6cc3c7494bc1477f3fc5e55dfae04e7fdaa3b181adc249f61
 EBUILD vagrant-1.0.7.ebuild 1704 SHA256 3deacd44360d14f81b9b7d29e08e1a2ac92a6fb81a0acacc9d643cefc21f5d48 SHA512 6804ba0f106e71df08e743232bf11545eabd4d49de658bf0a94567508fd0ea46aa13c1da868924d7d6db5401307d6fe8fb1a678684aa337ac23f4d4e32c92cf0 WHIRLPOOL 8578e9ab9f269324bb38f87453e5361cd915cacbb75fda357d621f297c503578c07f4cf67aa5d76ff648af05028f0dabc0ae5fa7e5c73972bbba3da7a9cfd13c
 EBUILD vagrant-1.2.1-r1.ebuild 1699 SHA256 65e1bb8a85e0fa42c3a978ca85a7738a9293811f1a6268af49880a9fb3edd2af SHA512 49605c4307808bf8e31d3f89ccdf42c435f49a680bbb7ac53c969c9e7dd797b75c1eb5f72da57837d65a1b6f9072cddd7471cbec031e40ba99646b0d8c24e301 WHIRLPOOL fc11dc00cda1ff17d142580f11806d7deabf0c9bc3e733486cb2fe09f88c8f272c25ce34d2ca70e5c0fe10b1df0f494f6e5bd25b039dcfa97fdacb67d064162c
+EBUILD vagrant-1.2.2-r1.ebuild 1764 SHA256 66515da89553be74f2c4275137a5c63de076eb78995c220deeb108297898c421 SHA512 5132999a308d163cf41b66f4c96412a2809d9c6a01b4b57a2bbc6e51564459824ff2f69e6d15ab52a02af32437c7107732071d909034f9ca5ce662800f0e4759 WHIRLPOOL 54faa1a45570a50d1e835a500ba54277a19d36ae315003abf793ccd0ccadc7b172199e598fb513c96d4301cd21da68eb313751e89cee0499094faa681cdb4cf9
 EBUILD vagrant-1.2.2.ebuild 1703 SHA256 ef053634440696af922355b524a46751b8115738e58f7eac7dd7d3a8a5195700 SHA512 b95de902c90f1714076ad038f68cb03a55b19ab1e9e42cf63b0bd535193b92c69d13e84d7b3010be662944c641d9070c5abf588fb5eecb095c207df84170535f WHIRLPOOL 80e2c71cdcceec68dcad2b3306b90e3e59349e01582004f5af834f416a2b416dd4aef7f12aaff4baa3ed85e8037094a1ca053d6a54525703aeff70732bb34e1e
-MISC ChangeLog 2713 SHA256 ec80bbbbe98faaf42f381b76630cd62c2389b024c62d7734a603ab3176584887 SHA512 4bafb75d98fcf33e95d50451c2c1689e8e3d9fcad772225fb87706826bbf450bc7d5b4d8d5f946c5b7019975ec6528f68b642b894e811d2193b88b59c365e109 WHIRLPOOL a1e3a77d13baada7b5f0cff155eac72c36800a3c45f3242e6e64a2cd8437c49b140040723f135eb5c3f459811e5b6eebb10b66f91c4fd71dc1da95c89737d951
+MISC ChangeLog 2975 SHA256 59dd8c22342f27ef7cb9667cdf0af2728a8202c5b296f9f42a060d1bcbd556dc SHA512 2d1afdf783b7ef1c9e6cd7fb1c615fd42ebc98ad5e25ca356cc270839bc42338b82ce7440ae66c9c2200b2a0a256cc316dac52aaa9d1a316fecb3a2c908e4185 WHIRLPOOL b8c620ddb253c836835f100490d457ebffd624d6dcfc2bf4e336d205fae6badc07ef1c3e6b959249ff1f3e1b815da5484bf1a47a36452552129c5bb01d131210
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRd277AAoJEEqz6FtPBkyj2xsIALn5+JY62Z2GAJr0uSDO++Ef
-zye0i3C/tUNAQjRnldAv93TTWeOHEzEWMKkTKbw86XSrFkKoQlMchcIibBsYTdok
-zevBod2cTf3N1gmppP2yqj5l7FjA3/hxXaZdCDHz3jaDxoU6LVxMe5noxzzuJvpy
-RVgA38OwYLCZ2d48Qv7uau2qcgyPrEwf2YZvwbFfSVzSJlqaoIoI4G3ojgky/5Xm
-s/mRrLolWOejNpDe/0b64mTKicSFXFwc5LKfmmkJ34HJyQlIlpaL0V2gP+dA+mLt
-dOnkG1BbrWIWpEFco64jVEJsx+51TTr0+N420FbyBSYCnRFoXMl66833spjlyQs=
-=Xa/m
+iQEcBAEBCAAGBQJR2gFdAAoJEEqz6FtPBkyjCMcH/2Oq4BH6eYEOOHmSjobTi4Zs
+NJV/POrLOmsMOST2YRUWvxdlJSTlw8ouDAg3jUOcKLJSh/weAzWdU5UCtxUUmUcU
+5VS6LJHisQ7azamXtTyUN2kMFidapZKkgyv1icyp+z/Goxc0TAtl0pOHvlMQLfEx
+hgwuMI6LVqyTG6+R3LhyC7pbEVYZwKM9JcqzRH0jFLFCcV6Hp9Vs5CcU+RuyNPTt
+VDAkWQR/K2UGWKTsYrRDKdlEBCo9OBOkVYsRAWwVwMcKQZyncjccJY0oCtFXhlJd
+ti/+kqS8ZiK9Qa9xHI8lFLXpQYnA2KHS5/ndXvoc3iKRR+dlFWvusu4J8oSwBKc=
+=Jv34
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch b/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch
new file mode 100644
index 000000000000..99265a26bfbf
--- /dev/null
+++ b/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch
@@ -0,0 +1,12 @@
+--- vagrant-1.2.2/bin/vagrant
++++ vagrant-1.2.2/bin/vagrant
+@@ -5,6 +5,9 @@
+ # initializing which have historically resulted in stack traces.
+ Signal.trap("INT") { exit 1 }
+ 
++ENV.delete('GEM_HOME')
++ENV.delete('GEM_PATH')
++
+ require 'log4r'
+ require 'vagrant'
+ require 'vagrant/cli'
diff --git a/app-emulation/vagrant/vagrant-1.2.2-r1.ebuild b/app-emulation/vagrant/vagrant-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..3e8027e4ceb1
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-1.2.2-r1.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.2.2-r1.ebuild,v 1.1 2013/07/08 00:01:28 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/~>/>=/' \
+		-e '/json/s/, "< 1.8.0"//' \
+		-i ${PN}.gemspec || die
+
+	epatch "${FILESDIR}"/${PN}-1.2.1-no-warning.patch
+	epatch "${FILESDIR}"/${P}-rvm.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
+}