4 files changed, 13 insertions, 141 deletions
diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog
index b1900484b033..f3ee36781dfe 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.12 2013/01/03 06:09:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.13 2013/03/18 01:39:29 radhermit Exp $
+
+*vagrant-1.0.7 (18 Mar 2013)
+
+  18 Mar 2013; Tim Harder <radhermit@gentoo.org> -vagrant-1.0.3.ebuild,
+  -vagrant-1.0.4.ebuild, -vagrant-1.0.5.ebuild, +vagrant-1.0.7.ebuild:
+  Version bump and remove old.
 
 *vagrant-1.0.6 (03 Jan 2013)
 
diff --git a/app-emulation/vagrant/vagrant-1.0.3.ebuild b/app-emulation/vagrant/vagrant-1.0.3.ebuild
deleted file mode 100644
index 3c241ee6fbbe..000000000000
--- a/app-emulation/vagrant/vagrant-1.0.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.3.ebuild,v 1.2 2012/06/02 21:02:55 radhermit Exp $
-
-EAPI="4"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="config keys templates"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
-HOMEPAGE="http://vagrantup.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-# Missing ebuild for contest
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	~dev-ruby/archive-tar-minitar-0.5.2
-	>=dev-ruby/childprocess-0.3.1
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/i18n-0.6.0
-	>=dev-ruby/json-1.5.1
-	>=dev-ruby/log4r-1.1.9
-	>=dev-ruby/net-scp-1.0.4
-	>=dev-ruby/net-ssh-2.2.2
-"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? ( dev-ruby/mocha virtual/ruby-minitest )
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen unslotted dependencies
-	sed -i -e '/json\|net-ssh/s/~>/>=/' ${PN}.gemspec || die
-
-	# avoid calling git
-	sed -i -e '/git ls-files/d' ${PN}.gemspec || die
-}
-
-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
-}
diff --git a/app-emulation/vagrant/vagrant-1.0.5.ebuild b/app-emulation/vagrant/vagrant-1.0.5.ebuild
deleted file mode 100644
index 15d2d542f1a9..000000000000
--- a/app-emulation/vagrant/vagrant-1.0.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.5.ebuild,v 1.1 2012/09/21 00:14:45 radhermit Exp $
-
-EAPI="4"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="config keys templates"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
-HOMEPAGE="http://vagrantup.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-# Missing ebuild for contest
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/archive-tar-minitar-0.5.2
-	>=dev-ruby/childprocess-0.3.1
-	>=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-scp-1.0.4
-	>=dev-ruby/net-ssh-2.2.2
-"
-
-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 unslotted dependencies
-	sed -i -e '/childprocess\|erubis\|json\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
-		-e '/archive-tar-minitar/s/=/>=/' \
-		${PN}.gemspec || die
-
-	# avoid calling git
-	sed -i '/git ls-files/d' ${PN}.gemspec || die
-}
-
-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
-}
diff --git a/app-emulation/vagrant/vagrant-1.0.4.ebuild b/app-emulation/vagrant/vagrant-1.0.7.ebuild
index bfb44a7615f3..554b07b2186c 100644
--- a/app-emulation/vagrant/vagrant-1.0.4.ebuild
+++ b/app-emulation/vagrant/vagrant-1.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.4.ebuild,v 1.1 2012/09/15 20:51:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.7.ebuild,v 1.1 2013/03/18 01:39:29 radhermit Exp $
 
-EAPI="4"
+EAPI="5"
 USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -14,6 +14,7 @@ inherit ruby-fakegem
 
 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"
@@ -48,12 +49,9 @@ all_ruby_prepare() {
 	rm Gemfile || die
 
 	# loosen unslotted dependencies
-	sed -i -e '/childprocess\|erubis\|json\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
+	sed -e '/childprocess\|erubis\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
 		-e '/archive-tar-minitar/s/=/>=/' \
-		${PN}.gemspec || die
-
-	# avoid calling git
-	sed -i '/git ls-files/d' ${PN}.gemspec || die
+		-i ${PN}.gemspec || die
 }
 
 pkg_postinst() {