Drop kvm warning as it has been ~1 year now since the changes landed.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 21 insertions, 33 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 7205808d67f7..780f413b078c 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.327 2015/05/13 23:30:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.328 2015/05/14 02:19:40 vapier Exp $
+
+  14 May 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+  Drop kvm warning as it has been ~1 year now since the changes landed.
 
   13 May 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml,
   qemu-9999.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 8031320b68de..45adc96a1bc2 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -25,23 +25,23 @@ EBUILD qemu-2.2.1-r2.ebuild 18523 SHA256 dd5a054d2ae53130fd11f350f14f0dea8e7f704
 EBUILD qemu-2.2.1.ebuild 18336 SHA256 010e31805cae369a4fda875a9b6db9cf57ded71a594a3d62fc9a8dc28e35bdc1 SHA512 b068a1256a37864237c29f9e3e17d2a5f384bb58630ca968a307878f09d0022a95a5417dae9013cdfdc10ea13940c84fed42048a9d298c6180bab0545aa5cec4 WHIRLPOOL b448e8d41815c094519ca68315fd441d633e43dd038800a95d5c81a644532d698fb91fef977cb95016729213964cdd420e035ac317981ddbe1164d10cbf264ff
 EBUILD qemu-2.3.0-r1.ebuild 18694 SHA256 faf21e265f1ace75836545cfda5f57b0c501c788f8185bd5b81e53f56ce065e4 SHA512 4a245103b8ac18a14e8f2ada4d6febd58eb0ad136893014f7dd80c484c8e7825998dbeababce8cbcc3bfbe97f9595339d60a890db456039678ebdb5b87d04d7a WHIRLPOOL d689046acff58cab7c4b538995328202abb3911b0e6d19c90f9c1e74f78bda8bc7563af42f911130cd4821fe12fa426cfe8bc3488e1387c96159a732ec482372
 EBUILD qemu-2.3.0.ebuild 18636 SHA256 17c7366438759cd8b8ef94b776cafa7acd01c5a0761076dbe6c5a85f0630e936 SHA512 e05902dcda21544bead03815cfc6455f15db4c70af79aa909fd6fc3478a1afab51141489303970a6e86ef705098f02791249d66ed7f795f52d7f41ba85b6da73 WHIRLPOOL 9573b22b3d6b729ee9438d8b682b6edb712680d570318dc6f5f74f60e309873c9cc1932fbff268b1af6389354bad74f1a1c554958d9a769b77833c5f1c6abfa4
-EBUILD qemu-9999.ebuild 18826 SHA256 b720ff3abccf5afcbd51c97ae0f42f511db746d3e5cc9be5bfaf66a034c58980 SHA512 0556b9aa641c09d6bccf72b2c5cd1f67602536f7680c40595ade837454a35b4cad1c2bf1a1d84ffada65e93ec03d6328258ca373988ae1cd5779c059624f629a WHIRLPOOL 3553f10f667eff662bf25a41dcf808c4e33c4c46e2edf7c07d2300d107cb758433ff083bab32a644d5039e2fd613c8771ec392134c418d6dfabe96bd2e080b81
-MISC ChangeLog 54036 SHA256 97a694bdabf3a6ac4549ad02e1a882a2dc1916f3a7bf0985457d0184ace43a07 SHA512 eb42c0d87dd95a045f665ef337eb3aae8bd5b02c30f031367d19be448709d1df2573eb7c789d388a7ab24c633b0e16cf8ca1b9930d888e83520285ac1649d281 WHIRLPOOL 25aa0f29ecfeecb992da60ad2bef3e07fbb47402668b6c7782d80e9ccf373ed2527a751b13c0992030a6b9a03fe0df9be669c942ee1e6dd3a933a94231f677a2
+EBUILD qemu-9999.ebuild 18164 SHA256 99555133bc829a6324929570fff8d1857a0b44401716cecd7e7a3cf5d63c229b SHA512 28b5d28fbc4f290ed362e551c46915f886d5ea291fcefbf0f7e2e128390a88a1aa07f568be2a7155feb058d6096e0d33baeaafa331e66701cd26409cad95b8a4 WHIRLPOOL d01b1d4c25662e56d74b565f446345f6b7986a128dedc4297a875216bf9a36dd02ad0085db7b2fb48097f57b42c722d9cf55849eb8ae0e51d131d06c699bb776
+MISC ChangeLog 54177 SHA256 e290062fcdadb02cbdd7e0ea9a9394ec2d105218c0c727560289267f3a8bb118 SHA512 99dbd4bcf3f90f2f0b36412d5f448e40a649386e2cc35e36aecda73d2afa1d07c7e04a4d007d1736b063066781dcb9f7394ab422652678363896ce093f4099f1 WHIRLPOOL d6c914429e0828bb2c1f69c7373ff4472bdfe801209cc2643e5ae98e27c9d9be719770cfd0ba9a06b7a695b38c23187aa2527cddfa6a12b06b5ac710ade53729
 MISC metadata.xml 3704 SHA256 5f01bddb7b0970283ad9c5cbf57c2d192ba55dcb2192aaf12cc8a2aff62309ef SHA512 a77d546ce4685cc34cf82cbbede8afba4e7a174f1e3bcbd17c4ce9c2cf0dde013de84d41ae3f7da8f4014478f1cf4d006ad26d4998d96695e22becd7504ee550 WHIRLPOOL 85b9fd9de987a8179e13a9fb11c07a14b3d6728b72272d81c55d1a3fb20311e9fe1c73dfc490a817c67bb0d4b728479bc0ca9b03bb29f5cf0d5df6c92b2fba6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVU96wAAoJEPGu1DbS6WIAKWkP/Rc7JcedqGTfZLvrJ0rDdtGP
-0mmKHGo5IBTz2SWdtEv4um0k72irsp6Vx6ZYCv9YPuhO2xSlHtkZWC4W0oPA7ckb
-aKqV8qKzY2iiPO0SdpcYJxCCy4+2+dj9Rrj6jv3bZcH6OhJdPJikC0LcNHdKu7To
-a5nr/lqXEKTiGeQY4WtSKmU9grCw7d+5rZOoeM14QPMJ+avozG/SxSvHrnOuuHN/
-kRz+4rgOTn1fpDpjmwYrf6jVJMrksHSOTfxQu62Aebdz5kTmrOEWqKoTWLJDPEc6
-Xxo44kT6J3qLOGuL17AtPBywYq1SAJZxemWCbEZ4zWi26T9H6eSo/JDJDUG2EJki
-7pTpNfVIHOpoPw0tVvPcniPqDYIhqhiBCSByUWgo3r7eEuhjdCSyKe2GlO5+oD6Y
-GzkgfsNRZ2d/Ze9gUpQ724kiWSr5LSHndKJgGxCUlPO6pOS7tG9M4XDBCRxvpmHO
-xzh8YjC39OMCpjqL0Yxz+P7rr3nzOTtAC2oM9o62bsvqjY6J5fQ0O81VHtNeXvQk
-zWAAgCZxFlZizwYHob/pV2XXL3AFhsZoaUPw9MMxLxiL7tl8IHJtuv/RTcvvs1jG
-HpTYB8hdAkFRPNDYetyaV79E7DeCYVYgd23fmxs4+veM8kg43VqcPKR0Fro2DwdG
-3kiRpOmReZZJFO4R5mu+
-=zVgG
+iQIcBAEBCAAGBQJVVAY9AAoJEPGu1DbS6WIAzfsP/RokLBjwcZJXaKYuvbazN9n4
+2nCBUVH3nAzlpe5Q8w4A86zfmXG+5SR4pF+kOBAQJEXphv3b4yNWO1Lmktztfgwp
+o8ykVVS3bP48W4LpSVQZI5ogcfqT0oEebwklj+tkbg4LWWCIIckRMHa3WRErMRt/
+e6MB9GdtQXO8yQPMpem69yKiGooYGXUJlnWBlcj7Ai84MSpmtrMJ8QxJocPioerg
+5t8ss9nYTpfMi4Oo2MNDvafpYF8t88u1qOn/4NlAnUBEY72mQ9/xmd/evWjZiK0A
+v+g41zylI5/MWQI/QWEIYwsHk3bIbrRtbiCVBCRDTVpJuLKzsGKwvsMfMbU7XAKL
+5GUouCsspsCiZDUkdypblxt9no97gs6zCkQQxcT8YA0h4n6ont8uCzMkyAFt9Cmz
+mlYXRnX1uQbs3fvr52qB+U3HX35EY3TEyOk7VZb6z4lzPOrHTn0q7lJYzcczCRds
+gB3K0igjqP1euwjwkpH8J4T60FIS2CnUOuWcEZrtRm90VQp/OLv9CjmMqBWhlMzS
+5xU6AOHwcynU/LhC5Z2jw/T+7i8JnKsP9xwSWw5a3ObQwtbZK6+CsZL3fM9LqUEF
+ERjYCMZ1mL6PgyIHDS+iigVX7C0A+/SKVxD6b4dRFg6whWTQhhtUzqB+HcCvvBpB
+s3liGEnjIWljWVcGq/yE
+=TPo5
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 619c1636b043..9855c6d66bff 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.98 2015/05/13 23:30:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.99 2015/05/14 02:19:40 vapier Exp $
 
 EAPI=5
 
@@ -566,21 +566,6 @@ src_install() {
 pkg_postinst() {
 	if qemu_support_kvm; then
 		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states has been removed starting with the 1.6.2 release"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-
-		if use x86 || use amd64; then
-			ewarn
-			ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
-			ewarn "installed.  In order to use kvm acceleration, pass the flag"
-			ewarn "-enable-kvm when running your system target."
-		fi
 	fi
 
 	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
@@ -599,7 +584,7 @@ pkg_info() {
 	echo "  $(best_version app-emulation/spice-protocol)"
 	echo "  $(best_version sys-firmware/ipxe)"
 	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
+	if has_version 'sys-firmware/seabios[binary]'; then
 		echo "    USE=binary"
 	else
 		echo "    USE=''"