Loosen net-ssh dep (bug #500466) and move to ruby20.

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

3 files changed, 84 insertions, 9 deletions

diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog
index 188875f66df4..e565daf77604 100644
--- a/app-emulation/vagrant/ChangeLog
+++ b/app-emulation/vagrant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vagrant
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.35 2014/01/22 07:20:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.36 2014/02/06 06:09:01 radhermit Exp $
+
+*vagrant-1.4.3-r2 (06 Feb 2014)
+
+  06 Feb 2014; Tim Harder <radhermit@gentoo.org> +vagrant-1.4.3-r2.ebuild:
+  Loosen net-ssh dep (bug #500466) and move to ruby20.
 
   22 Jan 2014; Tim Harder <radhermit@gentoo.org> -vagrant-1.4.1.ebuild,
   -vagrant-1.4.3.ebuild:
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 2ff277cc895e..a45103bf5da5 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -7,16 +7,17 @@ DIST vagrant-1.0.7.tar.gz 1005940 SHA256 aebbf855420974f8165019786034f12e3392d5a
 DIST vagrant-1.4.3.tar.gz 2391973 SHA256 09ccc0d87999a3c133b9ef52a5cff58402745ee64af6080b2a5d304eb06c9c58 SHA512 93fd1cfa263004cadbf670fac4dc318db9719d2a86afe188857cbc97c1317e6ef2387be498ef9278ca95cdda6bd41400426e3bf52448eb59c31877c9fd0624e4 WHIRLPOOL e581e8488e0b1e75bcdd75f4572b89f9c23338e422d3acb57b1d5d513d9357ec0b061371d926ad0bb1087bf890e70422d4e3527dfd518329ba910f42f0733673
 EBUILD vagrant-1.0.7.ebuild 1704 SHA256 3deacd44360d14f81b9b7d29e08e1a2ac92a6fb81a0acacc9d643cefc21f5d48 SHA512 6804ba0f106e71df08e743232bf11545eabd4d49de658bf0a94567508fd0ea46aa13c1da868924d7d6db5401307d6fe8fb1a678684aa337ac23f4d4e32c92cf0 WHIRLPOOL 8578e9ab9f269324bb38f87453e5361cd915cacbb75fda357d621f297c503578c07f4cf67aa5d76ff648af05028f0dabc0ae5fa7e5c73972bbba3da7a9cfd13c
 EBUILD vagrant-1.4.3-r1.ebuild 1761 SHA256 f8f216a952c58379ca15b3cc170163a065799592f5c7924a82241230a6626dc5 SHA512 4380a204099dd37eb11f80daaf351aa350bd86c98fa5f36647c5cfc96168585d0bb4ffeb1f1bb373e2d434443958ef4c17111a567dd2bbaa32e56a607549b9ef WHIRLPOOL b8db6342767e1f08582e1a08a2db1a1afb81ab450a19735d18c718171009e4d69d2e0463985107439c13bc5568db7360416b2f98860c7ef768f80ac2e5c699f1
-MISC ChangeLog 5113 SHA256 1b1d946927950d2fdced80791bbfc0e87835e9c223d1c9267386b34df8b6c144 SHA512 ad083ceb06619de5750e338f82015b7f504290eb145171646b4809436c791c9a1fc4f3dddaeabbff8e2102897ecd8cf0b00b0dcf717339fa40e50fc139c268c8 WHIRLPOOL a014b3afcba1bdcb4c9d0819d7e8977c7f4ef0ca156980797e04a75010526e0bd2311c6738d9e0d6791f90bf502800ec1ea8772965be3342af9d41f63bfc085d
+EBUILD vagrant-1.4.3-r2.ebuild 1781 SHA256 8113c0ead1cbe14fe9804384db1bd1b2a24247ef9e7e0c4c1155be1d956bc33b SHA512 30ffc587648288487ae9c72f8a662d0368240f67c349d1ad8510dcd2cd471a9d629ece72e75bc5bdbb4ca9e5e1eac5b357d85e7ef599ac79815c8ac8bb75aee8 WHIRLPOOL f55dca7d2cbf2d5f0a3c039fe4b3bc4a081cb4ffd5e6f9b9253b994e08fabb327abd0f75aded8f53e4f55003a497048b00f6e794dd7f9ecb60eab54e90dcd06c
+MISC ChangeLog 5277 SHA256 89a385ecc0d3a8aabdd35b55186797e278dbe52c8428726f438f6b1c43c2f9b7 SHA512 a54a5cc35ce7f0c5161c4cdd02914660624d1453eddd0f03b1c01d1afee11cfb16e232fbd1494ed50580d15adb7fd3f7e5158509e90dafbf656147796953e3a4 WHIRLPOOL d61df81ea98037ebcd1fca646f0ad309c43e6827c756d3407fd467f290a2c59dc28cb272f24eac058e2c8d858b64a94738bfdd27e3d076bf8af4963f395e4169
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS33E9AAoJEEqz6FtPBkyjNy0H/jwfefyogJ6pLq+Zz8PJlsqH
-iAu+N6qxkw/c9rnJwRe3agwJJlDRT8BvU0a6y1jEzO7OrClZS70cVPknCa+iqswL
-K61UHBHTFV71vSZhLMciNxuEUgFiEoydJSmxrTO5kjbrzSgq1Mpt1KwCYG/0HH9G
-iZ/NYpYYuyGCigZAJL2Ftv48qZY9+tBCIJHCNr464sEPDbp3L24VplD6SNeU9a0J
-EHdTrHrxLP/wxzRAaWE/x8XFOuqyZQ7OzxiiTM8t70W5wnv3SfoyZdhmzgJE8DY3
-fp/m+X+TiyhlKgPTbOKftuj6f7FVCItXsFWy2PPoaBEKXN/Gw5wHBuYJhUjILbo=
-=J+KF
+iQEcBAEBCAAGBQJS8ycAAAoJEEqz6FtPBkyjTEsH/2TjEM2YB7UFoazHzKSLtdCQ
+IpzErtwv7IkhyMrACqWlGPHwRA98mVhAI3ae9GRNYZTgY1vT70q+8kJOZf+DkEHs
+tUSGc/cYFytMSlkjP9gjecdRxQGcoAOBJ+ixtgUSjyj4XF0k65iH6vhGK3O3nK75
+qUbFsUr+e3930fMY1lpoMCgcv81vOHBSJSc9/dkUbT8Dnh17b7H5AW3laKRORlKq
+18ZC8MyER4S7DuL8eKttXTkC8iLidhymd5MMoRXdVW9AeeTAZsLdtsxoqK7zBdPu
+Tfyh8QtfYjKBU9Wy9IB/cAWYdLLi0yqDskmXCaXWqDPH5SaAazY6/dWig8Dress=
+=K7BT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vagrant/vagrant-1.4.3-r2.ebuild b/app-emulation/vagrant/vagrant-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..8bb7b75f137d
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-1.4.3-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.4.3-r2.ebuild,v 1.1 2014/02/06 06:09:01 radhermit Exp $
+
+EAPI="5"
+USE_RUBY="ruby20"
+
+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 ~x64-macos"
+IUSE="test"
+
+# Missing ebuild for contest
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	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/s/~>/>=/' \
+		-e '/net-ssh/s:, "< 2.8.0"::' \
+		-i ${PN}.gemspec || die
+
+	epatch "${FILESDIR}"/${PN}-1.2.1-no-warning.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-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
+}