Update the 9999 ebuild to match the latest changes.

Package-Manager: portage-2.1.10.30/cvs/Linux x86_64

diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index fce60cac15714b74fd55c265b29af0d70a51ccb4..9d4e298e8150f43fa42df8e26e76fbb8f6cb9855 100644 (file)
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -13,6 +13,6 @@ EBUILD qemu-kvm-0.13.0-r2.ebuild 7933 RMD160 92674548b241a1e698820ab892e145ea9cf
 EBUILD qemu-kvm-0.14.1-r2.ebuild 9076 RMD160 d7908f6fea339053255bfb48ca6d8791cb3eddf3 SHA1 92447e143a350dd3ea61ab1f319b22f5232816c9 SHA256 6788162edaf0d6cfe01b2e9eb3350f594a5eb6a70c6f3c1aaeadffe212028435
 EBUILD qemu-kvm-0.15.0.ebuild 9361 RMD160 4fb9ab6cd94421de02bfc81d3f96fa79e76b0b7d SHA1 8bdd1e842a184e924a67c940cbf6f4c2c0794c7d SHA256 eed0d1461ad637a22d08286dad8b24c553ae5ae1d83f25205fdc0b5c35cc1904
 EBUILD qemu-kvm-0.15.1.ebuild 9454 RMD160 2ab542d941aa4deb88750c5564b97d63f534ec76 SHA1 bead1307b70a5cdfd1b97cbfd84cb7c88f5a4abb SHA256 b6fdd5c363e959cc02e6d9b2f064cf969fccb0741d6379e8bc2829ba586d5d92
-EBUILD qemu-kvm-9999.ebuild 9335 RMD160 1e0891fd4d84f587fe4b0b068a17ed0f14b56081 SHA1 777f3840dd5b1c6b033f951c8c6f32d7dfaaef8e SHA256 4a3b1a6a8ba3c7a1d165f73473fa8914c47f589659d473b0c246d5691958cdc5
+EBUILD qemu-kvm-9999.ebuild 9453 RMD160 b219db06b98a5594168a3ce971655c0065f03d63 SHA1 9e001a05104778f5d283382c7b8802153a3acb18 SHA256 4d31525d6ee695744014e0397b708899688592642f3e907bff9282362903eb4a
 MISC ChangeLog 15172 RMD160 b860ed3040c31c7f9e744b725d8c688e49ab518a SHA1 ad1fe315bfa4167d752beccc88b82e591a5a034d SHA256 46836e576080a433f6510757b8144dee5abac4807343cc4978847b20fcc5256a
 MISC metadata.xml 1790 RMD160 4179a5fe624d3c2ab55ed90d65c473ce644a943e SHA1 bdcfb49dd78aaefdcb8b5c7b92bd7829890df132 SHA256 68ab30c94b1fe8b5e681e936369a9fe39f2b657015c3e1e7e05145026a427ac2

diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 0b052abc1e5853884a0f84c2751967ccc4ff8ccf..4c9615a1e37768ef9f09abe67dad83971176882e 100644 (file)
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2011 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.21 2011/10/21 03:13:05 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.22 2011/10/21 17:01:50 cardoe Exp $
 
-#BACKPORTS=2
+#BACKPORTS=1
 
 EAPI="3"
 
 if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-       EGIT_REPO_URI="git://github.com/avikivity/kvm.git"
        GIT_ECLASS="git-2"
 fi
 
@@ -19,8 +18,10 @@ if [[ ${PV} = *9999* ]]; then
        KEYWORDS=""
 else
        SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
-       ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
-       KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+       ${BACKPORTS:+
+               http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
+               http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -60,13 +61,12 @@ RESTRICT="test"
 RDEPEND="
        !app-emulation/kqemu
        !app-emulation/qemu
-       !app-emulation/qemu-softmmu
        !app-emulation/qemu-user
-       !app-emulation/qemu-kvm-spice
        >=dev-libs/glib-2.0
        sys-apps/pciutils
        >=sys-apps/util-linux-2.16.0
        sys-libs/zlib
+       sys-apps/seabios
        aio? ( dev-libs/libaio )
        alsa? ( >=media-libs/alsa-lib-1.0.13 )
        bluetooth? ( net-wireless/bluez )
@@ -266,6 +266,11 @@ src_install() {
        dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
        newdoc pc-bios/README README.pc-bios || die
        dohtml qemu-doc.html qemu-tech.html || die
+
+       # Remove SeaBIOS since we're using the SeaBIOS packaged one
+       rm "${D}/usr/share/qemu/bios.bin"
+       insinto /usr/share/qemu
+       dosym ../seabios/bios.bin
 }
 
 pkg_postinst() {