diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2012-11-21 20:02:59 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2012-11-21 20:02:59 +0000 |
| commit | 39556e89bd50345fbe373f3c1713e298768db9fc (patch) | |
| tree | 1892f675629988a024510ea603f501596512bbfe /app-emulation/qemu | |
| parent | Version bump (diff) | |
| download | historical-39556e89bd50345fbe373f3c1713e298768db9fc.tar.gz historical-39556e89bd50345fbe373f3c1713e298768db9fc.tar.bz2 historical-39556e89bd50345fbe373f3c1713e298768db9fc.zip | |
For 1.3 we're switching to qemu from qemu-kvm which is now merged fully into qemu so adjust the 9999 live ebuild to do that.
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/qemu/Manifest | 14 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 13 |
3 files changed, 11 insertions, 22 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index 3a196273024e..6c92a261721b 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.143 2012/11/05 06:42:53 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.144 2012/11/21 20:02:53 cardoe Exp $ + + 21 Nov 2012; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild: + For 1.3 we're switching to qemu from qemu-kvm which is now merged fully into + qemu so adjust the 9999 live ebuild to do that. 05 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild: Once againt readd or32 target (OpenRISC). Added nore binaries to RWX exempt diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 358f5013542b..7f14ca9c26b0 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920 AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861 AUX qemu-9999-fix-mipsen.patch 684 SHA256 e4e9695c091d3b8ffc1afb24c3d59fc61bb08bdb3e25b7be5a36d0b327ba4b55 SHA512 25c3b6ce6140cca2ed76ca75d623730c78873f8e5b53d9f80362df376effd7755b41420d55ec19dd652b47f2c6aea01e2cae9dc75952a4ffae871841ba27142c WHIRLPOOL 99d2e15c00d24db9fd7765290efaa6f69bb42f828227e3b5bfe68027b25ddae173c9cdf49b8d84facd8372d911e32a8bd0ed2aa6bdbb083c67d467d93bd29f67 @@ -15,13 +12,6 @@ EBUILD qemu-1.1.1-r1.ebuild 12038 SHA256 cc999b6e14a8e5784629368ea590f1b6df26a6c EBUILD qemu-1.1.2-r1.ebuild 12020 SHA256 f23b27ef99899afd0c1f52e01e88838c0a6e5094caf32697f2bf92b7025b0a38 SHA512 e48c819173642952c5b8ec7be3da6ce40ba98a7b2451cd3c4ca39d9afc4d797481fe11951c2fd5712a05cad29bf85006061eb6bd731aa710cccfdd852a05a3b2 WHIRLPOOL 06719448a2780b323d5fee612c521a8f43823bc8f957e2a2b9c6338539b8669bfca477037178432ebcd0782ea2fdc25b22babd66e83a851e242fa5848134c8e2 EBUILD qemu-1.1.2-r2.ebuild 12066 SHA256 a0c2027cc9757e8141309a2e7a92943403f93061a6664b1923e66e8c576ebbd6 SHA512 a4c5279c9dff3d72e81300dd85edf4458314cdc3fbeb509ead781494d72bcd2a9c350ef1394c052b1a7fbc09a58be5f75478e1dc24ab5ef6b93fdfdb2234849e WHIRLPOOL 0ba2ec000c1159b900d76c4c9d064a81eff804e54bd50e22db6a4c08e746796662d946a5608aaecb952bf097c765d13f1ffb0d7a086b88549fc73bf9600d47dc EBUILD qemu-1.2.0.ebuild 12659 SHA256 66a321b5c0d43af7f455121f47b00be658e77c913063ebd40f1bdf14729fda5d SHA512 6d3efb7434e2120994060acef8f768fc2b1c3f87ee0038149490a66931e5c9ed82974a0e682b8e69a300fa63b73fa06871f012cab7e17ac9e4d69827626b7d3b WHIRLPOOL 2a28b3b8ee363ab1e34eb5f4939bd294a8bec4068702b1fe018128147ef89af55eec845b729c20bff830b4f4547fffc33ff418c3839ec315abe7f375fbc8f06b -EBUILD qemu-9999.ebuild 12804 SHA256 019d6770fb785a75a3e5a1abf2602cc8f1273ea5603adbb3c646cecaf7b2eef0 SHA512 20e9eb4ffa2bafe11e0c625a5b6d148dc6a8f4c14bf6ff3b15b704f1fad510d0086f51d49ccf370edd3b2135ae500c3eb1a344b29c048df9a7111b372d759137 WHIRLPOOL 872949ea7cb9b5127879594aa07eb107498fa7f9fea1656eeecb386b254915447adbcd89c1c1f4d5738f501a95c92626b23c2dd48671079e2eaf9bad21d3a9fe -MISC ChangeLog 22533 SHA256 9ea2ff7c59c2296dff8229307e0c1628b058618d727ca3130aa3d85fb587a13f SHA512 aeb4ba1f490b0f730278b3d18a418e05eae3ec27ead562dc68cf37b04c415641b5883af5e38224612fedfb6bb8f8cf1671dc8f3a5f9ebdb92d9bc1e0ae624967 WHIRLPOOL bf367a075544b819a83dc9682573ff0e9fef15f10d391408f291f7980469ae13dcaa2c0f4100761037d528b27a6341c8fa0ff227f7f7ebea34856050e0bbc0e6 +EBUILD qemu-9999.ebuild 12718 SHA256 3849282f5740159d45192379d6f47bc9b436a8d05565ceec30fddb706520f1ad SHA512 9d74c2fb8e4e6902a306a6774441df962fd082a601e5932265077f94ff7d86f88626e48462f101861ec7c4be5961a0c599ee69eea8df6e9ed83300e2abb5866e WHIRLPOOL 3eb9f3d157aa8d4e69a9ba07e4d3794584c7478df0c35a0f113eb9b52063ee05b8284b7c073dd7f621e2eb745b1584932a6c59872d7d18a27238c018e165a50b +MISC ChangeLog 22731 SHA256 a4576b1b15955a86195dece7070671c7a1c22838b3bbb59135c14e9a5d9f8d4f SHA512 f5f7904922303e4c9a500b9867fbbd671a0eaa25e59953bd824b729628f9b34e9ad2961e32e81598cb2d53ab0c5b4c53b36d9541d2032009c4f692cafbc33bc1 WHIRLPOOL 891cdbcf8a72cea4de95f2723a380ac21b8a3df74b38e50449e8b4aa596037953c3b6562ddba7e9df28ce5adea558c2c72f9a94251bea75faa951cabbdf243e4 MISC metadata.xml 2859 SHA256 c61c0d19fbe1bda2ac76f4024b12208b5ee39ac429db3b1ca70beb33ca1c866b SHA512 a8cf8f30dc2e7bbb4c55d579b0d4631ccbcd68bf666abfeb3e0b771eb0eebab9bc580f69e2e666ee8bb9450aa4866f389e02a37141fbe4c12294174a69de176d WHIRLPOOL f3fe55114664e07ee002f8cb97093114ca3228bdc1a030d435e8aef1c338ddf4f979f1fa13fed35052b9ecc2416098a622324796a41f4153d72adb67d1b67c1a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlCXX+wACgkQcaHudmEf86p+lwCcD9KAOEVRZcRanx0TcfxkH/tK -OGMAn3H3baBuiF0AyVTpLjSKYmyJronu -=cYRy ------END PGP SIGNATURE----- diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 85552e2b3859..62bfea69fd49 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,25 +1,22 @@ # Copyright 1999-2012 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.32 2012/11/05 06:42:53 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.33 2012/11/21 20:02:53 cardoe Exp $ EAPI="4" -MY_PN="qemu-kvm" -MY_P=${MY_PN}-${PV} - PYTHON_DEPEND="2" inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user #BACKPORTS=6cee76f0 if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" + EGIT_REPO_URI="git://git.qemu.org/qemu.git" inherit git-2 SRC_URI="" KEYWORDS="" else - SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz + SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2 ${BACKPORTS:+ - http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}" + http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" fi @@ -103,8 +100,6 @@ DEPEND="${RDEPEND} kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( ${LIB_DEPEND} )" -S="${WORKDIR}/${MY_P}" - STRIP_MASK="/usr/share/qemu/palcode-clipper" QA_PREBUILT=" |