From 922efd83b8f0839be7c38f49509db7ce13be2042 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Mon, 21 Nov 2011 18:11:11 +0000 Subject: [PATCH] [app-emulation/qemu-kvm] Sync 0.15.1-r1 and 9999 ebuilds. Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64 --- app-emulation/qemu-kvm/ChangeLog | 6 +++- app-emulation/qemu-kvm/Manifest | 32 +++++++++---------- .../qemu-kvm/qemu-kvm-0.15.1-r1.ebuild | 5 ++- app-emulation/qemu-kvm/qemu-kvm-9999.ebuild | 21 +++++++----- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index d1d43e542256..47076f81d013 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,10 @@ # 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.75 2011/11/16 04:29:30 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.76 2011/11/21 18:11:11 jmbsvicetto Exp $ + + 21 Nov 2011; Jorge Manuel B. S. Vicetto + qemu-kvm-0.15.1-r1.ebuild, qemu-kvm-9999.ebuild: + [app-emulation/qemu-kvm] Sync 0.15.1-r1 and 9999 ebuilds 16 Nov 2011; Jorge Manuel B. S. Vicetto ChangeLog: [app-emulation/qemu-kvm-9999] Revert to the old kernel.org repository. diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 2252d77031a8..ddc11cd23a6b 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -15,24 +15,24 @@ 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-r1.ebuild 9703 RMD160 16349a5c8cc3656272c9bd694791dd89c6e2cf21 SHA1 382518226a612797695f07fa9cd93a42efbb1da7 SHA256 7adfdc3b5a20e6cf90c23ec08510c1a16e3ad97c3357fee353a1e3179958bbc5 -EBUILD qemu-kvm-9999.ebuild 9458 RMD160 eb1c3f3cb24561dd98bcc52ccf8d17bab104ef1c SHA1 9fc4d090a78e4d154e5fd6dcdd22f09fed41a24b SHA256 054b998b2edfd9f7ea02f92d308ae1ee6b2e89581f0262ef82ccef0d5e74c047 -MISC ChangeLog 16314 RMD160 5a2661c3a4f610817e07849ba8d97b0e95b98a32 SHA1 cea248d2a461aacdd135842a5c0da3fd8a9ce7d0 SHA256 fc47c27c4ed9248e8afa1914949ab45a54c501e8f4d4f92e310a851b110ba378 +EBUILD qemu-kvm-0.15.1-r1.ebuild 9655 RMD160 44eb1b5331a39d08ae4adfc3c54872d804d49b58 SHA1 bd921b5ec8836100033b53f2cbee3fa0531008cb SHA256 8963e8ae2cca1998cddb3aef5babd19ca174d0168408f1a89bbda775edb62d73 +EBUILD qemu-kvm-9999.ebuild 9651 RMD160 0c360fcb8d56fd9d48e9c5bf4d99b5056db895e0 SHA1 f73f07900ea3b3e830c91de17f912f29adde8c7e SHA256 5bfc5f549bd77c5a22ceb677419b2eb854eb964276179955b7d5f59f9da3a850 +MISC ChangeLog 16492 RMD160 983f27afacd411275ec9c4258d1960fb1670784d SHA1 c3c6e6edcf306aaab3bd630a7666a2d0cedc8e6e SHA256 cf523567e885680424cccbd710c3025c3163e48d0da551c02a208a267c6fc5bb MISC metadata.xml 1790 RMD160 4179a5fe624d3c2ab55ed90d65c473ce644a943e SHA1 bdcfb49dd78aaefdcb8b5c7b92bd7829890df132 SHA256 68ab30c94b1fe8b5e681e936369a9fe39f2b657015c3e1e7e05145026a427ac2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOwzv6AAoJEC8ZTXQF1qEPRgkP/RbVc4fDpOWXNHiUrE41ougp -L4NaVuiUIZ0ZuQrWC9nQiK5P4qyuGZDvj+9TIn0sm0xcQSIUF9FtfWz0tWkVtLwd -HsEIy4eLy0DvMfiWxNTT4YRwOaVBvo40o0xqd9sqUItYNhOV17uKL18gjjtRdJEq -jatLpfLbOg55kZhHMMawiK+wm8gQY8Iaht41Ogy4Mt+RuimDXc6O8Wrk/HqeXIe4 -UFpN4405VszJSeDL5agtnCytsrg4gRja8BO6HyLG5swQNE5d5hpqt6+/hcO2u6Lw -YagpVA3bFNglOwVMLWJCH50pkWx5km+yW58m2hpxrLDdeAw27QGXZ5dQtlLOZTiN -ozmswxXjrjJoTBpJMcraEp1xyHq81y4IgJsDMgd7XVRayHoWRM/8C0Ay1VHRj20b -6jo+uTh59HzEbIRYEq4/a7m3Nzdk6EqvojMT6JBqmtBSwzmipHVHnFRto9Js8M8/ -kzlEFiN0ZmPKlYtmV/YQAiGJCHjtrWD8a5ebY3ydsqLqT8UKVXOeVTWiUW/9EY+d -hFDxtzeiAYMTn19pVihFT9goA8RlQ2R/ykbeVC7lsnGYXbaYU9LhROAOMxKf6gCF -Ds7nIpOWKmuS9LssGozQEl3GCCXWTQxLc+Ym9hGzOZ+LaybJZN4WU48tABl/cbOU -ACDwWAE8GFOsFfKTwfOP -=5TMV +iQIcBAEBAgAGBQJOypQVAAoJEC8ZTXQF1qEPY4oQAJZ0pI6C+glKQHKKLWr6zVMi +qtTSBFUhbSZq3CkFqHHxMsHkfEU87xqIXA7/c/bXckxSDDAzkaZCy4qISSi3hqVI +BfYfBZPnQudPInRBLlLpNOOxFvGitA7wlMIoxThkdv3lD2EOWt2AZnRfdYtLkl2F +lYua7lm20YOdeB5jaUtIqGz+wlPcOsG6i4Yx6+Saa7lip/QPrEOLAle2wjTP2MnV +Vy0NlCqo/XP3x7AONNkeprvB+yIcd3POcb7eF6xEM9C3lgmxp7TuLLsQkQy0HFEb +kqiLOcuo3vP97+b3WS4KhTSn0z6T8q1AQSenwyBMGa2/Cx+P+MjcUN/1JfBrylA6 +kxx0eD7KL+F15F8Bmt7Z178BCS6Eyp3oFNyyFbR9EHXPLhwdtN278jJKYUILhAIr +s+/yFFfiYqj6KNLIg+tX7IGO+jtEQihNDxow1KZ7KXJJ8yKpklkqVk8vFH9lGjPj +kIKH7CoIL2IoYYKq/5/a/eMRmF24gJrKxrweWnRWf8k0JVEBBE55FLDsK4m2AMcY +mkGaWqQvfYXZKefK51m9fpnal3P8qoAOyPcZKyFbHKKUvpNrzn3qju7gMutOx9dc +ML4Q+zF4mr4ko7aeu1i7HV+0t5br2Yl+3qohCFvF0hghkE5iOr+z3DKOBb0zRYFv +bqMwxoa4HScQBnx4it8S +=R3Tb -----END PGP SIGNATURE----- diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild index 58f0105ab8a7..0a8190a8aed2 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.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-0.15.1-r1.ebuild,v 1.1 2011/10/25 17:08:01 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.2 2011/11/21 18:11:11 jmbsvicetto Exp $ #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" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" GIT_ECLASS="git-2" fi diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild index bb5fd5bbc9bf..a97a4c27bf46 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-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.24 2011/11/16 04:27:26 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.25 2011/11/21 18:11:11 jmbsvicetto Exp $ #BACKPORTS=1 @@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then GIT_ECLASS="git-2" fi -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib +inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python if [[ ${PV} = *9999* ]]; then SRC_URI="" @@ -21,7 +21,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" @@ -66,7 +66,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 ) @@ -129,6 +130,8 @@ pkg_setup() { fi fi + python_set_active_version 2 + enewgroup kvm } @@ -267,10 +270,12 @@ 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" + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + fi } pkg_postinst() { -- 2.26.2