Revbump and remove old. Patch out official install warning instead of setting environment variable so curl uses system ca-certs by default.

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

4 files changed, 33 insertions, 18 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/Manifest b/app-emulation/vagrant/Manifest
index 5bad473b3d66..323856b0738b 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vagrant-1.2.1-no-warning.patch 257 SHA256 63e9af972c097ea3b7046350565a7188061348bbdeef73bbc5445974ca2e2249 SHA512 297908474c7da8622b45754a0de71bf584b4488432b4265c0308248f13b00bd1c3bc8f643700400a3028e552673bbbca58ab25ac7900cfcc1b6900dd1c4b8a9f WHIRLPOOL 7ef40c4f6dd22913830a22fcee1eb95aeda029afde03dd2dbbfcd9816f1e9584acd0703d22383913498f8be0c7675473a298b8cc44a87d31e395409de532d515
 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
 EBUILD vagrant-1.0.7.ebuild 1704 SHA256 3deacd44360d14f81b9b7d29e08e1a2ac92a6fb81a0acacc9d643cefc21f5d48 SHA512 6804ba0f106e71df08e743232bf11545eabd4d49de658bf0a94567508fd0ea46aa13c1da868924d7d6db5401307d6fe8fb1a678684aa337ac23f4d4e32c92cf0 WHIRLPOOL 8578e9ab9f269324bb38f87453e5361cd915cacbb75fda357d621f297c503578c07f4cf67aa5d76ff648af05028f0dabc0ae5fa7e5c73972bbba3da7a9cfd13c
-EBUILD vagrant-1.2.1.ebuild 1816 SHA256 ea5c1018ecd8bc21a8b1dedfb94ffe9d495b784ff574ccd9135a6859145cce89 SHA512 473fdecb8e2383ef50144b73c6e745341261cfee12866a169f3006ec34c5d67643b6d375735a057cdda31e04b6a4bfcdaf5f6a1d80fd6ab5fefe764a810f1f39 WHIRLPOOL e14eee02d5bcfb3fc6dc2c653b75c42cdfba5c31ba9a81f98f9f2f444bc1fecac365d167cda4c06ff570d2c5db35b7bcc4d42740d3d98f4679b53f36f0e2cd2a
-MISC ChangeLog 2277 SHA256 7a363c82a29b92d3e1bfea748cae32fc4ec7694450eb1079b94ba48c6d77edc2 SHA512 5accf51b31c86e8b160516d1c0a6565efd3b84a733402c7266fb1ce8a32dfe44f33f222b9352a549af4743fd2b8cc922acb4c57319b7ca8256d0526b77a3ddc3 WHIRLPOOL 3242830a8f933dcbcfb4c22e503cf601c29d41fe3cbd44ea7c21079b0f0342e16b597a2dd6883462f5cc318965f8ddc33dcdbd82276dbc51b795a08acbc82359
+EBUILD vagrant-1.2.1-r1.ebuild 1699 SHA256 65e1bb8a85e0fa42c3a978ca85a7738a9293811f1a6268af49880a9fb3edd2af SHA512 49605c4307808bf8e31d3f89ccdf42c435f49a680bbb7ac53c969c9e7dd797b75c1eb5f72da57837d65a1b6f9072cddd7471cbec031e40ba99646b0d8c24e301 WHIRLPOOL fc11dc00cda1ff17d142580f11806d7deabf0c9bc3e733486cb2fe09f88c8f272c25ce34d2ca70e5c0fe10b1df0f494f6e5bd25b039dcfa97fdacb67d064162c
+MISC ChangeLog 2594 SHA256 8f383d26dd29c9b052683fa7a2cbb21180d93940af61c593eea3cb467b4ca524 SHA512 dc80f8c92e1b23dca5924b4b08795404f8642ca25794a076b8dc564c98b52334d394c802e82941c48c5679f63e4281a96b98376b8d2aa5f4cfacc0321da49d20 WHIRLPOOL 29d8177ac009e2160d496920c52c3c4f05add2450bbad9a4bcd701eb495bc7b48f6b0ca93bf0639594a59af12bca4e94c21b660631decbd2bbfc8d629993843b
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRb5sWAAoJEEqz6FtPBkyj4iwIAIVEzKdk81T+1FIvaKisFbR3
-JrthRkkDxQLldYVmk9DVKDUBTnvFPKPjTmWPB8uOSPUzs0rs3W5/OXpuubgT/Q/H
-zKuXuMbPt/dm4ZXcfUV8W+ty6Zps18slaXNeOFomwUphjbx6GbfbD2+f3b29fUpA
-LQ16HiA9AuEQvD69OmWWq0TP32fPzZtINrjP7PPX/HdA5RMNmGEJK4kbo4ksq6UD
-FApic9IHEs9K/LpkPQq5AE4yF3dO7/Xh8au9Xvtna27dxTr0zy891mbyPbp7Xy4g
-M5JG0BfXeH+ZPVC8nTjC+BTxZADZCVXF1sHFFpK7SbX2AcM8BR+rK5cz5ycwajY=
-=CVEb
+iQEcBAEBCAAGBQJRb6f6AAoJEEqz6FtPBkyj848IAJQQMdDeCcXauTSQuWnO2gyp
+UwBDkqHrgBUHQ1XRfn8HwKRHbwzr3Sti2KlLmEDfruxzhO1+ZG07jhsljr9B6KYu
+DIPmkpDxrO1Z8j7joL/2gSf6o2eDeKpLUDfYCu0e8mpq0Q6PaNHSNIlbaWh086Y9
+RDdV/GelFAluO5l+VkyMN9TMi5/Hit5L01lSlob683I6QhAp//JvPGpNL1057CQy
+0sQKQR8H1I6f04ep4w4896HD2BreuavPG7p9aj8jOrxSXMrf+FjcrLtsEp5VFDcH
+xqXkgxyF0a+i0SJp49QnOQGYKw2SoQR0YUUiJNZKQBfL6/LKbpScXhomY0GV37E=
+=NIaR
 -----END PGP SIGNATURE-----
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() {