Fix in_asm debugging, thanks to Mark Karpeles <mark@hell.ne.jp>

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

4 files changed, 42 insertions, 4 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index 8d26d7abccc9..ebd064a6d623 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.65 2009/03/27 21:39:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.66 2009/04/24 10:59:50 lu_zero Exp $
+
+  24 Apr 2009; Luca Barbato <lu_zero@gentoo.org>
+  +files/qemu-softmmu-0.10.1-nopl-fix.patch, qemu-softmmu-0.10.1.ebuild:
+  Fix in_asm debugging, thanks to Mark Karpeles <mark@hell.ne.jp>
 
   27 Mar 2009; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
   qemu-softmmu-0.10.1.ebuild:
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index 9e0a871d1581..25c291cc7510 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,5 +1,6 @@
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
 AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
+AUX qemu-softmmu-0.10.1-nopl-fix.patch 1118 RMD160 849e4b88ca7985dc3faae0a225181205043f0265 SHA1 70cf0727a7cbdd79243ae6768f34c07c6e9c5aec SHA256 24656137f1f38aed2c2661ebd20d9a6d86eaf9768c3e239b971f01418b396028
 AUX qemu-softmmu-0.9.0-block-qcow2.patch 346 RMD160 d9c11c082fce158e5fbdaceb5e87a327877de58c SHA1 976bd2727f8bdbad999ea2c23112dcbe550bbf4c SHA256 bfea37a8fc718bcee6f31df02c3095094c58d3ace952a7e7789784d6b3471c5a
 AUX qemu-softmmu-0.9.0-ide-cd.patch 1764 RMD160 5d19bd67c74734c4e66f67dc136adb6f08fa418f SHA1 152fd0403c0644c275ac4aee539139ee5bffd262 SHA256 1f0d9d52e3ead71f0f250902993d1a7d3fb9c88be23870f5559a1596c42bdaf5
 AUX qemu-softmmu-0.9.1-CVE-2008-0928.patch 9346 RMD160 79e4dbf7643d7057da4a74350833c907342fba1e SHA1 2ec9c89e6a995db97aa03cdab490fc0e5cef650c SHA256 ca040bdb401e6cdfe4f009e6874d25853103965370b19756724127b0fd4df559
@@ -10,12 +11,12 @@ DIST qemu-0.10.1.tar.gz 3658024 RMD160 f1dcd14a6981180b40b3048769bf861ac86fa0b3
 DIST qemu-0.9.0.tar.gz 1901741 RMD160 4296542b6da18a6ac93d20787330d3c1c2ac0a19 SHA1 1e57e48a06eb8729913d92601000466eecef06cb SHA256 491facf9335654967ee53d8fb3540a274bfcbdcc225506bd38c4ee8e9ab405c1
 DIST qemu-0.9.1.tar.gz 2804104 RMD160 ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5 SHA1 630ea20b5989f0df00128de7f7be661c573ed041 SHA256 4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
 EBUILD qemu-softmmu-0.10.0.ebuild 3030 RMD160 793bb3412a5a5f2f1ccd77e66efad1acd5ee25b0 SHA1 7217891921c09486d490d9f4929585596a12b1a8 SHA256 5c5e028bf24d2d45c926a5bb94a9f7a803b98e3ad1debe6163e365d59c6c4905
-EBUILD qemu-softmmu-0.10.1.ebuild 3206 RMD160 e36a513e2d5dbe79fde121f09eaa0c43fd411aa4 SHA1 03fda51effddf89d1fe58b70afb55f0680a490ad SHA256 a460488251dc9f25038552453d98e78034f35c7e31f138a6e0f16ce3e7419deb
+EBUILD qemu-softmmu-0.10.1.ebuild 3248 RMD160 efbf1f51968ad51235df94c791d94b073fe5d1d1 SHA1 7d667f27c885cf06006e5ce0cef095e87f79bad4 SHA256 859fb6ae098928dc0277576ac3fb55a0e979e5c3345215dad79ac33974c3f0ba
 EBUILD qemu-softmmu-0.9.0-r1.ebuild 3175 RMD160 8a7d2bc7dd359671e5350537da075fc169168b60 SHA1 681d7c1f8ff28c30a4e9135e1e54d4075cd8fe7b SHA256 a381f8a2e983e6e6266657adab2cc59605bb3efc416dec4b7f901a51e0666412
 EBUILD qemu-softmmu-0.9.0.ebuild 3129 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 SHA1 7493550b324f11ee72aa5ca994cdd207eb383c6f SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c
 EBUILD qemu-softmmu-0.9.1-r1.ebuild 2896 RMD160 4e5761b2f708d974b2026a006efb1cf9d23486da SHA1 426134eaa5e212c2e45ac36cbb87676a42371ae0 SHA256 261458bbcef7d5dc13dabad1cfddfd6656d8b57fd10e34011f88db6ed07ab502
 EBUILD qemu-softmmu-0.9.1-r2.ebuild 3445 RMD160 fff1fc780161c0b38bc4eb9dd12c05db5082ceb5 SHA1 263f864e0c73aecd80443009f9f8a82cc9c194a0 SHA256 b891d2a46654663015db4d9ad0bc0dfa7ff8c45d6a76e350004e036df9f020c0
 EBUILD qemu-softmmu-0.9.1-r3.ebuild 3497 RMD160 307e4ffb5529ef7fcae85143bc24b1215ef397ad SHA1 fed449d32e6d30cf4cca64a0dabc7f97ecc5f8ab SHA256 3dec7492e786102a0e766cde65fcb3f54c84e8bcdef03042fb82eca2ac0550e7
 EBUILD qemu-softmmu-0.9.1.ebuild 2824 RMD160 b264432c59a2c5a30c7ae4d5467574cbc9552b02 SHA1 48b5d381eea4ddfa2422ec5f5cd8487c3e9cdd97 SHA256 a390898d852e421e0921782da93974ba0d20a9f65879e875da0afda2ea7efb05
-MISC ChangeLog 10976 RMD160 8b9423057928162385e5286305bee510818f82ac SHA1 f9345acddb229d17ae583abf0294b4c52ded49a8 SHA256 4335580f102971ecf163e83ee2a57df1b20b60604fa7f1b9215620162032d181
+MISC ChangeLog 11165 RMD160 d9ecd6b092023f62af194acb73ca228ac3ee87fb SHA1 990e3a115402b76342bbc10d21fe31f103109de8 SHA256 b59b5833360a324d889496726655933378b09860f212fb5242b18c59b818f27d
 MISC metadata.xml 882 RMD160 259583b24a6eec2cbcca323e754f677041d44d54 SHA1 690460cdb502fd47b51eb1d51938d1c7629f7918 SHA256 8584426258959783d4da117036fa1d773b91b8f90d6a3c1ee7d065446e3d91f8
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.10.1-nopl-fix.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.10.1-nopl-fix.patch
new file mode 100644
index 000000000000..bdef0efc3516
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.10.1-nopl-fix.patch
@@ -0,0 +1,32 @@
+--- i386-dis.c	2009-03-22 00:05:48.000000000 +0100
++++ i386-dis_new.c	2009-04-21 08:31:08.000000000 +0200
+@@ -784,13 +784,13 @@
+   { "movhpX",		EX, XM, SIMD_Fixup, 'l' },
+   /* 18 */
+   { GRP14 },
+-  { "(bad)",		XX, XX, XX },
+-  { "(bad)",		XX, XX, XX },
+-  { "(bad)",		XX, XX, XX },
+-  { "(bad)",		XX, XX, XX },
+-  { "(bad)",		XX, XX, XX },
+-  { "(bad)",		XX, XX, XX },
+-  { "(bad)",		XX, XX, XX },
++  { "nopQ",		Ev, XX, XX },
++  { "nopQ",		Ev, XX, XX },
++  { "nopQ",		Ev, XX, XX },
++  { "nopQ",		Ev, XX, XX },
++  { "nopQ",		Ev, XX, XX },
++  { "nopQ",		Ev, XX, XX },
++  { "nopQ",		Ev, XX, XX },
+   /* 20 */
+   { "movL",		Rm, Cm, XX },
+   { "movL",		Rm, Dm, XX },
+@@ -1072,7 +1072,7 @@
+   /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */
+   /*       -------------------------------        */
+   /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
+-  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */
++  /* 10 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 1f */
+   /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
+   /* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */
+   /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
index e6a214b23792..6d05235d4415 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild,v 1.3 2009/03/27 21:39:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild,v 1.4 2009/04/24 10:59:50 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -55,6 +55,7 @@ src_unpack() {
 	# avoid strip
 	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \
 		Makefile Makefile.target */Makefile
+	epatch "${FILESDIR}/${P}-nopl-fix.patch"
 }
 
 src_compile() {