summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-07-22 04:35:00 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-07-22 04:35:00 +0000
commit6113d3c45abf744897e3191e661968e4ebbc0d5d (patch)
treeb3f86f080d7a2bfa070d77e844b61883927a9824 /app-emulation
parentAdd initial version (diff)
downloadhistorical-6113d3c45abf744897e3191e661968e4ebbc0d5d.tar.gz
historical-6113d3c45abf744897e3191e661968e4ebbc0d5d.tar.bz2
historical-6113d3c45abf744897e3191e661968e4ebbc0d5d.zip
Use packaged sgabios instead of what QEMU ships with.
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/qemu-kvm/ChangeLog5
-rw-r--r--app-emulation/qemu-kvm/Manifest4
-rw-r--r--app-emulation/qemu-kvm/qemu-kvm-9999.ebuild13
3 files changed, 14 insertions, 8 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 5a70ab41f361..c26744eb4d3a 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.140 2012/07/22 03:57:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.141 2012/07/22 04:35:00 cardoe Exp $
+
+ 22 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+ Use packaged sgabios instead of what QEMU ships with.
21 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.1-r1.ebuild,
qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 338e6c169b6e..beef93318101 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -23,6 +23,6 @@ EBUILD qemu-kvm-1.0.1-r1.ebuild 12205 SHA256 2d0937b952b3ef20d9e906341abed691199
EBUILD qemu-kvm-1.0.1.ebuild 11479 SHA256 6da24cfe70e532037576f6893e894686e9af15dd517bfcdb28e2dbc921a3832b SHA512 7b20463967947dc5398c45a5c9cdafb4a489f7acbf921c537f0b7286e07fa687f6f19e47713161c52cc43a9d4d003e706cee5aef2f0ece8bc6a768082cb15390 WHIRLPOOL 3d845dab92364b97545f996adbf7af1b64abd5e1c90c1aacd0d35dab038ea3d024ea086b14a26352f72df1dc290c750f3087a100a5405ddc7bd0f2888f1c58c6
EBUILD qemu-kvm-1.1.0.ebuild 11791 SHA256 e83a0136e4f26a4a87738b735af0fa015ef76984a0368497bfdf2b52eede7748 SHA512 cd61e516de7db70f3d696ab38554729af5e4dcf6c5003de5441ffb30d22a1c5d72bd05478e1297bdf4d25c17a43cedba28899dda19807cae884533d1ac399ba7 WHIRLPOOL 03fb278a398c0c2b08f8b5bf93781b08b64d5b6cfc1affdfdecc506d55acd7c15072f1c34196f1a3be40bd9fdbb34607f6329fa50eb0cadf54084483b99f1db3
EBUILD qemu-kvm-1.1.1-r1.ebuild 11610 SHA256 170a51c9b2b9c22d8bcf7196cd7521d3bb1cd69e0ff4190881202cb42b7b2721 SHA512 5c8fd1969847fbe81ccb282621600b67bd105cd3900d235c066beab08f2a6e946477800964337967d96106ab3ff94aa0a4eb6e6833f4d7ff0793b49ab6c820b2 WHIRLPOOL df51c49438b98705ea5183db97a563b9084b6aa89402d834460cb206ce21747a7abebffd17b2f3bbce448b2f232875aef17fd266f6647c6a01c223cb786cba61
-EBUILD qemu-kvm-9999.ebuild 11692 SHA256 8faec7ebf2ac75437fe6583c2f7f2be9e940699061e2ad6b417232afb213815c SHA512 367477fe9645ea73a11f6109655593c433cfccaca39417f33739ea4a6e3b77f4a97a907ffd63652bca7d8a406bbaa8d71dcdb591ad9b507ba04d727b4527729c WHIRLPOOL 9b881ff22de08618910d103c3dbd0a8a48fb10cdefe3594c2987c2b4678b81ee4e3d4d982c6b75808999ae30aeadd514afe8b15fe99f5ac2759abc5e86d9907f
-MISC ChangeLog 27711 SHA256 0fc5aef7d89aaae0fc1f18f1f7a25627687b8078bd7d8f7e03140bd87be3800f SHA512 b53637c728fbcd847cff97dc03900232f265f7ffa44eabce8683d357ca9c93e9f56ede0bbceb0d521e171761aa0faee62a8d9e41913cdab4b898d3c38d7d5f78 WHIRLPOOL 68fca9a15153abce26b62e73006aef3e955f2f968c147050ef33b3c761bf858b045637d0d858545ece5450ec99ca35d85f4c9a33a587c3133a1f50117fadfec8
+EBUILD qemu-kvm-9999.ebuild 11803 SHA256 9ae8061a59cbc5bd17373c262d7284a21c3031b5e728941f53ea652646758407 SHA512 7478cd009a1a4e66fd83d3e72eb87553c8e6a3eae56fc51e6146cffdbc0332613fa2a47c0546199358f3578120dd6335036c907219dc67adb2923ddc220c2fd4 WHIRLPOOL 3bc566644c577bf5ef113df1bea7cefe54efed4d06949432bced8ee982d9cfb70efb52fcaa3767d469471980c1c7b2fb4e89a9b79c5864bd173a7267eedff31a
+MISC ChangeLog 27840 SHA256 e778474c7ce1ac6e67a29dd8a38e713877bb2d529d3d5ffb1475d238d2fb072b SHA512 3a13f00ee05776cdf750d8a9b61298473d9585cb537e251bc1b74c18648e1c6c5a98b98989308971d48d17bc6b7a75c4d760986a43d61d551a418540093d77f8 WHIRLPOOL 0365ce6367825044053f08631c790ff33310ca3e4f34fe85531c01d48b1a76c7c207cfbd38a16281e84860ceb0e0a5b7e004ddcf883ae4739b0d343eb8b0f835
MISC metadata.xml 2416 SHA256 1613b0e695f6cdd5c21b0b6e5f470adc250b261a8a40bfb3c7f246d3f590acf9 SHA512 e6906e146aded4f9e182fc8da99a578800b91287f5d5446c53d08ae764304c2ca02002098f61032f547873f808554cac2d4b29115ce0dcea36df41e9e6667ec8 WHIRLPOOL da9ff6660bb89b3b4077bfb52f18098eb7392ac0e1af05028950c9843c03be6f6a0765ec9577e6a0d8f36fd6b130828c52f31a0d020034531a944dca516009e3
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 26fac0f0fc42..a34aa441a468 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.47 2012/07/22 03:57:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.48 2012/07/22 04:35:00 cardoe Exp $
EAPI="4"
@@ -62,11 +62,10 @@ RDEPEND="
>=dev-libs/glib-2.0
media-libs/libpng
sys-apps/pciutils
+ >=sys-apps/seabios-1.7.0
+ sys-apps/sgabios
+ sys-apps/vgabios
virtual/jpeg
- amd64? ( >=sys-apps/seabios-1.7.0
- sys-apps/vgabios )
- x86? ( >=sys-apps/seabios-1.7.0
- sys-apps/vgabios )
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
@@ -346,6 +345,10 @@ src_install() {
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
}
pkg_postinst() {