diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-04-18 07:59:50 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-04-18 07:59:50 +0000 |
| commit | 97464a9040f0eced34f959876aa933da2d5c73fa (patch) | |
| tree | f6f86dc89fd4e469e97e8dfed24e7afdaec62aa3 /app-emulation | |
| parent | gnome-extra/zeitgeist-datasources: Add sane fix for bzr icon file collistion,... (diff) | |
| download | gentoo-2-97464a9040f0eced34f959876aa933da2d5c73fa.tar.gz gentoo-2-97464a9040f0eced34f959876aa933da2d5c73fa.tar.bz2 gentoo-2-97464a9040f0eced34f959876aa933da2d5c73fa.zip | |
Revbump and remove old. Patch out official install warning instead of setting environment variable so curl uses system ca-certs by default.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/vagrant/ChangeLog | 9 | ||||
| -rw-r--r-- | app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch | 12 | ||||
| -rw-r--r-- | app-emulation/vagrant/vagrant-1.2.1-r1.ebuild (renamed from app-emulation/vagrant/vagrant-1.2.1.ebuild) | 11 |
3 files changed, 23 insertions, 9 deletions
diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog index 5bc7785f731e..139fe870c40f 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.17 2013/04/18 07:04:53 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.18 2013/04/18 07:59:49 radhermit Exp $ + +*vagrant-1.2.1-r1 (18 Apr 2013) + + 18 Apr 2013; Tim Harder <radhermit@gentoo.org> -vagrant-1.2.1.ebuild, + +vagrant-1.2.1-r1.ebuild, +files/vagrant-1.2.1-no-warning.patch: + Revbump and remove old. Patch out official install warning instead of setting + environment variable so curl uses system ca-certs by default. 18 Apr 2013; Tim Harder <radhermit@gentoo.org> -vagrant-1.0.6.ebuild, -vagrant-1.1.0.ebuild, -vagrant-1.1.5.ebuild: diff --git a/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch b/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch new file mode 100644 index 000000000000..08d1d3568b80 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch @@ -0,0 +1,12 @@ +--- vagrant-1.2.1/bin/vagrant ++++ vagrant-1.2.1/bin/vagrant +@@ -74,9 +74,6 @@ + warned = true + end + end +- +- # If we're not in the installer, warn. +- env.ui.warn(I18n.t("vagrant.general.not_in_installer")) if !warned + end + + begin diff --git a/app-emulation/vagrant/vagrant-1.2.1.ebuild b/app-emulation/vagrant/vagrant-1.2.1-r1.ebuild index bb3673704ec6..1060084317a7 100644 --- a/app-emulation/vagrant/vagrant-1.2.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.2.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.1.ebuild,v 1.1 2013/04/18 07:03:50 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.2.1-r1.ebuild,v 1.1 2013/04/18 07:59:49 radhermit Exp $ EAPI="5" USE_RUBY="ruby19" @@ -10,7 +10,7 @@ RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" RUBY_FAKEGEM_EXTRAINSTALL="config keys plugins templates" RUBY_FAKEGEM_TASK_DOC="" -inherit ruby-fakegem +inherit ruby-fakegem eutils DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox" HOMEPAGE="http://vagrantup.com/" @@ -51,13 +51,8 @@ all_ruby_prepare() { # loosen unslotted dependencies sed -e '/childprocess\|erubis\|log4r\|net-scp\|net-ssh/s/~>/>=/' \ -i ${PN}.gemspec || die -} - -all_ruby_install() { - all_fakegem_install - # suppress official installer warning - sed -i '/^require/a ENV["VAGRANT_INSTALLER_ENV"] = "1"' "${D}"/usr/bin/vagrant || die + epatch "${FILESDIR}"/${P}-no-warning.patch } pkg_postinst() { |