3 files changed, 84 insertions, 9 deletions
diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog
index 0a88340403a8..7783c8258c14 100644
--- a/app-emulation/vagrant/ChangeLog
+++ b/app-emulation/vagrant/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2013/07/10 18:59:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.22 2013/07/17 17:39:46 radhermit Exp $
+
+*vagrant-1.2.4 (17 Jul 2013)
+
+  17 Jul 2013; Tim Harder <radhermit@gentoo.org> +vagrant-1.2.4.ebuild:
+  Version bump.
 
 *vagrant-1.2.3 (10 Jul 2013)
 
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index c827d577434d..ad90835a6ff0 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -7,21 +7,23 @@ DIST vagrant-1.0.7.tar.gz 1005940 SHA256 aebbf855420974f8165019786034f12e3392d5a
 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
 DIST vagrant-1.2.3.tar.gz 251550 SHA256 c2f4e565cb6c1b52361d719cfd0955d4d4272f06cba2620454480fd1aa73909b SHA512 361a888a03d2ff33312c5f0a3ce0e7cfb5611fadf912d79ffaaa195a55c7ee47abc4dd342af6afb75611e49d9dea09b980a2d43a043ace42198b1ea98014e401 WHIRLPOOL 078605a6903f67783457addcbd577f90fb02f97cf06908019a7083bfc3eaf109f1d4a98abf2408c38f1ac38035a3c5787beb49951c3c73e3c6a167a94fa08158
+DIST vagrant-1.2.4.tar.gz 253686 SHA256 117b68e5cac3572e439181855124644f5921eca5f97ff1c7222c88d044ff9b73 SHA512 34351a0db0f23e5e602732528e3f1d18054dfebf486915aebef16607eff5e884d7378dc9831fed0609fe0d9d1fb298b488022a297a88131e148ec90b15c72a8a WHIRLPOOL a0190b3d93c840d2c262271edb9bc64ce53ccfd4052695471d42682d70e921abd24067f9cc1c36ff2269f8c3cdc0537f26c36d44dee9fde4d1681db3f3e36035
 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
 EBUILD vagrant-1.2.3.ebuild 1768 SHA256 3c4744277b35d030a8e88589d03eec22d1a5ad001e9f386fc8e74d9b2f49b691 SHA512 e3d782dd8c8a392cded946a49f9b6fc96bccf204363b03201e7dc6b54fb12e39c218aa26f8adde271f3cb3160b9d4d9b1b8bff7885d32053f10e7cd03f55aa57 WHIRLPOOL db5a8638dd061f990a5a44a9ca5303fa60b6a89cc2fd8fc3bf453cc7ebb82ccf7d978aad29b22f0391e0f5b8136242d43203d1ccfb49089ec8ee3363266ab816
-MISC ChangeLog 3094 SHA256 5c24eea5fadbd3f06e27be92e4a523d852ec433f12e71e4aa49668ade8e47b48 SHA512 da13b83ff50bdc1be05293fa9d5b4916aa438d32c74760d657abab4489d05eb52fd780fce226381d0bda8b77efd05dd3e59a17fb968df90873a147a34110e8ce WHIRLPOOL f01af07329bbf96afd56de5509220c854be3dd98ffdc813f4e326fd43e769538d464f1cce91c7d0749e2f2019c944231397340a58df6213d2d9e522fdf1bab22
+EBUILD vagrant-1.2.4.ebuild 1768 SHA256 0fddaf8bedf2924b24ae7fef5416a71a25d8c50130e4d9912fa8ce7ae618622a SHA512 6ad9b0d74d53445a052ef84e5ada5d820228f42ed292f011121ecfa03e456605794c80fe0992f33b07fbe6cc503e98654a0875be8eb57077d3eda09d22a2a2f7 WHIRLPOOL 65c8ca4d3eebb184e9212b0f9fd6c9b932f960998e702c9dbd3061f31dbe5c8fca0d2e4d231bc0793351a001d444a0d00de8bb33f6f9f4a0141df84616dfd400
+MISC ChangeLog 3213 SHA256 cd35b2040dde0b0aa4e04c7e6f4aff78584fa3d9cd5dbbce9d7b5b758fa711a1 SHA512 94723255cb25dc867f94a18c8246ea38d835ae54b7daee4c2c90a2adf614b2c92408dd7b290c19646976d98869f1d84c767b9618df7e6434bb2700d88eef159f WHIRLPOOL 66556577010c297b4e45cc7c5ffb14747c2a9424408f375c2f96340b1b79a6256a8a97944775661faf0ed3e8128200608785e96fb65a1dad39567be2e727b25d
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR3a8RAAoJEEqz6FtPBkyjLaMIAIpBJvIq5BmtGnYE/g+8tJY1
-BjOc4so+SW0pYHEBUvLGu6lIfuZTiuNVmxOEzfTO1qfcCEgXh9/BwB+PAJVT7nUn
-t81yDzQ3aghrWC9BntxUAfOtQB2ptUf7hiZ6yUavvK4l8JziEoJaKNff7tj1tzEj
-jNjxxYN2DgVQTObohgDEiY6C8DO63IszhPIcb6rJr7fbJosDHiHXL9roF7l1DC5H
-GDKnvrUF92h6ypbboJxIjSlxojD7cJn3i7qm0/UKwyMH2X6zBeZvnEN3WhIdhBJZ
-w6AlPrDUM6L5oYhU3Rz4sVBxPtcwRPsa4VXvx10doftXdeVH2y6gRDiwiJv5HZ0=
-=tyUn
+iQEcBAEBCAAGBQJR5tbmAAoJEEqz6FtPBkyjJwYIAK6Ge5iuCz85KqE18vdZ7R/Q
+phHQJEWKj2fozmpcNtW7YkFEaOsmAN7ZBVBB8RB5ONmXLJgUTxRTzyx5g2RpOZLG
+XHQQq3fa4vlPRkK5uXixc1YlN+tp5fya5fixxeXIZnD8ahjCmXw+JoVuGaP+9rtc
+fpd3YvJHh8+kUBkRcVM+Zm8RWJCuZJZvA+t3tAcNGNXyQexfIXTzjqqPeqzyUBsO
+ZK1GUd6Vu5AE55x6ltVZpRhAnZk44sNSiELnkPi2U2iehoFUFDySwCsYl7NNx0Kg
+9F67WNgJ+yD0+Sc97k1bfSSVBA9xZvCpcfMFaHLmKC0y2UpjrY+mmHKbHroFlIE=
+=59iC
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vagrant/vagrant-1.2.4.ebuild b/app-emulation/vagrant/vagrant-1.2.4.ebuild
new file mode 100644
index 000000000000..5eea8cb7656a
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-1.2.4.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.4.ebuild,v 1.1 2013/07/17 17:39: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/~>/>=/' \
+		-e '/json/s/, "< 1.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
+}