From: Jorge Manuel B. S. Vicetto Date: Sun, 28 Mar 2010 17:24:12 +0000 (+0000) Subject: Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied upstream. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad8fd8d200a1a18efd8b9ccf076281f69ab83a99;p=gentoo.git Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied upstream. Fixes bug 310979 - thanks to Jeff Kowalczyk . Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index f38878f4620e..9c5608add9e1 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.25 2010/03/19 17:23:17 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.26 2010/03/28 17:24:11 jmbsvicetto Exp $ + + 28 Mar 2010; Jorge Manuel B. S. Vicetto + qemu-kvm-9999.ebuild, -files/qemu-kvm-9999-sysconfigdir.patch: + Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied + upstream. + Fixes bug 310979 - thanks to Jeff Kowalczyk . 19 Mar 2010; Thomas Sachau (Tommy[D]) qemu-kvm-0.12.2-r2.ebuild, qemu-kvm-0.12.3.ebuild: diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index bb1b5144ebe5..797242fa3bae 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -1,11 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29 AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff AUX qemu-kvm-0.12.2-virtio-large-iovecs.patch 987 RMD160 b16ae8ffd7a4b2d32c32d0ae56c707958344b3eb SHA1 65cd9b99929e5057d636d9676f5a3435db24695f SHA256 e4ca83f65c4deb16e2c22d728e547012aa6110a00ced92a9590990307ab9f7df -AUX qemu-kvm-9999-sysconfigdir.patch 297 RMD160 7b9d6c404e4e5bea44625b92b1956816519ca7c3 SHA1 bf7c7b7af0997100595e641fd7aee0c5ba9e9b2f SHA256 53c6f861df73e2183f373e464fdfefc55af885dc0b7d1c52d6ad9e853eead92b DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b DIST qemu-kvm-0.12.2.tar.gz 4713699 RMD160 1581fa5ec5dc168de3667a3c28cd56ba0b2e26b8 SHA1 27bb9b55e6539c0dc6b57e08812df76b02544c62 SHA256 82a6291857f67f84da259ee30f6d46699b73e38964ef82fb6c8000386e4baf5a DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2 @@ -13,15 +9,6 @@ EBUILD qemu-kvm-0.11.1-r1.ebuild 5797 RMD160 a3f4f239cd7a6cc9a7debfe6d347e0d9e1f EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c57605877 SHA1 5cb4172354f07be1c0b9199b1aa2d880d5b1ef54 SHA256 7bd18bfac7eaa453b5edacc4111426ceab8a8652b311ad97cb6310a42392f5ed EBUILD qemu-kvm-0.12.2-r2.ebuild 7293 RMD160 bb0b4f3cca10fffecde0bd210cf1bb53c264beb5 SHA1 f7a9a2f98d9c0b1d16cfee33b5520d3e6f62152c SHA256 b9fe14f8ab0ed322008b22fa044c53d22af6be7f43fbcc27f2ece6a4e0c3c3e0 EBUILD qemu-kvm-0.12.3.ebuild 7291 RMD160 6a23cf04d27e8cb4a41586f64ef20ba96a1edd02 SHA1 aa72ec725c4facdcbf6b19880fdfc9114a9ea7c1 SHA256 6b27f2365f1114df96f45e3f5501aa5788a007db3619f55d9d678af69d5a2ed1 -EBUILD qemu-kvm-9999.ebuild 6966 RMD160 ccddfa0584684e8a08a52656aa704afc59ba3da4 SHA1 abf1581414776ab93b44a69989f2502160b0cfbd SHA256 cc6d1bffac166fefe6832f7d465d6e9945df86d5de000a52105a24d44e7c43bb -MISC ChangeLog 5296 RMD160 4694ffa787bd658bf02f532194dc389a2116382a SHA1 356f7871d8ebd8dc29139f3f1febcb4d849c6abc SHA256 443e659bc36fca77a2cfaaf14361b0b0538937081b2b5f007b5a66104c1e39e4 +EBUILD qemu-kvm-9999.ebuild 6920 RMD160 eef5085843cdf6ae4f371b6dd5b2d7e402261771 SHA1 637d69343fce2d2d55cfc3bda7ebac713d906369 SHA256 8011ec51134235d0219e96a45504e7519781eb1d0bb64f553255b656b3fbb3b3 +MISC ChangeLog 5584 RMD160 8e0439d4e2119aff8ace21dd9a6f7dd6eeef5f9f SHA1 c1fd39f28e0027638bae11de852884341ea5b0b5 SHA256 d7a59b82444d751ee42ccb251290d755e16458c98a62c75cb3feed4023d9c003 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iJwEAQECAAYFAkujsxMACgkQG7kqcTWJkGfp5AP+Ot4NMmgHAIS8J7Nu1LPKPVxk -CWssg/iZ14icvBS8RONR8WeGapJOf2lwNZkonwJ2ElF3JNA+uxDUaabDLgNusqk8 -YA75j023UzMeDuA8HE8meSSmw4dYeeFLcw4jZJjutNqaopXqw80Oe98L0/aTSD3O -7evak2iQza64c238DDM= -=SC+1 ------END PGP SIGNATURE----- diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch deleted file mode 100644 index a42a0efb2e16..000000000000 --- a/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure-old 2010-03-07 00:49:33.889297264 -0100 -+++ configure 2010-03-07 00:54:12.681171878 -0100 -@@ -517,7 +517,7 @@ - static="yes" - LDFLAGS="-static $LDFLAGS" - ;; -- --sysconfdir) sysconfdir="$optarg" -+ --sysconfdir=*) sysconfdir="$optarg" - ;; - --disable-sdl) sdl="no" - ;; diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild index c6345286daae..71e7a8fa151c 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-2010 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.5 2010/03/07 03:15:30 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.6 2010/03/28 17:24:11 jmbsvicetto Exp $ EAPI="2" @@ -108,7 +108,6 @@ src_prepare() { sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" - epatch "${FILESDIR}/${P}-sysconfigdir.patch" } src_configure() {