Only depend on sys-apps/seabios on x86 & amd64 since it will only compile there....

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

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 0d77333956a279bf48882ec78bdec4080ec295e9..1f771011aa01e439619261f61bf4a90a0662f592 100644 (file)
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.71 2011/10/22 22:56:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.72 2011/10/22 23:00:17 cardoe Exp $
+
+  22 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
+  Only depend on sys-apps/seabios on x86 & amd64 since it will only compile
+  there. Use the shipping binary for ppc & ppc64 so we can re-support those
+  arches. I'll have to figure out a permenant solution for this.
 
   22 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
   inherit python eclass so that we can set the active version to 2.x since

diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 0e5ae1e4177d725fa3b2b9bb4588fdcb7959edc8..6327ced3d0a4703f9ee15a8b143659a7a79cc31f 100644 (file)
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -12,7 +12,7 @@ DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d333
 EBUILD qemu-kvm-0.13.0-r2.ebuild 7933 RMD160 92674548b241a1e698820ab892e145ea9cf10c11 SHA1 d2ab36fb81a4d63a1726ffec53eb83f35a986e0b SHA256 794d92dbcbef069f140051091a17853ddabe11baa1b55bc76bfc7319e7ece635
 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 9544 RMD160 b882fa14212cf4f79f042db3d22c493ec9a70f93 SHA1 8f74808da07541ad252c962b6afc958fa79a36c2 SHA256 b5a3a9a9dbe36475e27ffdab82fd88efb944ca4c52f0519f672ab8254b89ee50
+EBUILD qemu-kvm-0.15.1.ebuild 9701 RMD160 e63bf78b0b5f4f80227ae10198724666dda5536d SHA1 d2a004f38ebbcb128656adbef35817914f1f3227 SHA256 e2ce5b2a6d1353b76e35453a31893959c616098355bf640c186e7931d01cb492
 EBUILD qemu-kvm-9999.ebuild 9511 RMD160 bd1871e74d3610dfb0d69624f465e876bd16f867 SHA1 1e273287433af96cdde37ef57e532b4cc8e105dc SHA256 8a788421f677ba50a5e9d648a411560e3c8478802add04315470133b73803056
-MISC ChangeLog 15584 RMD160 4ee76d62ae1d2bf00d529f2f6443fe9fabc12eb1 SHA1 bfd22fb3a759030919692722e4bb7c7ac1bcec7c SHA256 230d6da13c1b61dc5ef58c171268bd5b0d4238dee7e09746fec1443fe8e27c36
+MISC ChangeLog 15876 RMD160 89c0e54c9b07210cfb3097ddc97980b71f429fab SHA1 85401cb05d428dc67c0923f6ac2304735c710d33 SHA256 311cbe7cec70958b78e2d8465d69029a8852ec2caab14e28ed31da51cd83e8ec
 MISC metadata.xml 1790 RMD160 4179a5fe624d3c2ab55ed90d65c473ce644a943e SHA1 bdcfb49dd78aaefdcb8b5c7b92bd7829890df132 SHA256 68ab30c94b1fe8b5e681e936369a9fe39f2b657015c3e1e7e05145026a427ac2

diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
index 7f0ca9502539d124fc9084edab2bc417055a108e..0c187b38f684137c770c70682594ef49f681380d 100644 (file)
--- a/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # 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-0.15.1.ebuild,v 1.3 2011/10/22 22:56:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.4 2011/10/22 23:00:17 cardoe Exp $
 
 #BACKPORTS=1
 
@@ -22,7 +22,7 @@ else
        ${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"
+       KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -67,7 +67,8 @@ RDEPEND="
        sys-apps/pciutils
        >=sys-apps/util-linux-2.16.0
        sys-libs/zlib
-       sys-apps/seabios
+       amd64? ( sys-apps/seabios )
+       x86? ( sys-apps/seabios )
        aio? ( dev-libs/libaio )
        alsa? ( >=media-libs/alsa-lib-1.0.13 )
        bluetooth? ( net-wireless/bluez )
@@ -270,10 +271,13 @@ src_install() {
        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
+       # FIXME: Need to come up with a solution for non-x86 based systems
+       if use x86 || use amd64; then
+               # 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
+       fi
 }
 
 pkg_postinst() {