Addmissing patch for mips (lost after qemu-kvm -> qemu migration).

Package-Manager: portage-2.2.0_alpha133_p5/cvs/Linux x86_64

3 files changed, 28 insertions, 15 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 989e0defb63e..4e47fc14a8e7 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.125 2012/10/10 19:29:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.126 2012/10/11 07:40:26 slyfox Exp $
+
+  11 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/qemu-9999-fix-mipsen.patch:
+  Addmissing patch for mips (lost after qemu-kvm -> qemu migration).
 
   10 Oct 2012; Mike Frysinger <vapier@gentoo.org> qemu-1.1.2.ebuild,
   qemu-9999.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 845b853d46e8..0ce50891dc9d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,6 +9,7 @@ AUX qemu-1.0-unmagic-debug.patch 1929 SHA256 dd68fa1abc9e7c9d17bb2407c5a5b80b130
 AUX qemu-1.0-unmagic-xfsctl.patch 654 SHA256 b69f5fac63fdd61a314373359dc20b1bf0d4eb6bc0e66105032d28c107a81090 SHA512 a9f8c20b03dad360b1a1cdfcb30109755319582dad3f2c376084a776e55c437af58c55d682b958b11f378c78aff517accd4d93e5d3907c52a9fdfb2ca214d119 WHIRLPOOL 2aabacaf42a496e9fd1fb492c3a8e515fea719eda596d5713502810a24d189dabb16a0b2f9ef46c484af84d276f5b8eea76e3f1c3c8ccf0c38416cca5ef53cdb
 AUX qemu-1.0.1-siginfo.patch 2268 SHA256 b5d8ddf3469b72ac3c82847c7b35df5f84ab2b0f2924e7cdaacaaae173f69846 SHA512 10d27fe413fc5fb3de941a2b00d6504ce766d6246c481c811263617f2cf88f5dda318ecc78b681f0f84c3e8d954527c84d5c21712c908cbfc89b6d5f4a49e6b9 WHIRLPOOL 591645f4e453126b98f055a96fe06e115d7c8821bc7b2be13e329aeeac61d7694ae4df9c62a7eb5d67e5a78d3ab9defdd01db36a2567d7acfc86c69373bb29db
 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
 AUX qemu-ifdown 478 SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d SHA512 6aeffcd1cd38ce0468fb280d52de402429d8d88b97b215e6e3727bc7f58f63e60a84ed351becc854436fdcd33d00c0e4ee7b1f5f31b225a009e8af6decab0e4d WHIRLPOOL de2be76d26c28bf5dca213106be824836b682e47f9cfbefe51d515fb4ae5a090624bb7050f13a0340a1305925473043ac5316172b33a197359cd7d89d414174c
 AUX qemu-ifup 554 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d SHA512 dd1fab3db7fa6e8b8ce3ef27e09996629c0eea9e3d4f6489523af71f25eb0f801d30614a5e0f191b6977b34d13b588e64a5cec8fcc731e6ff7dbfdebc759f028 WHIRLPOOL fb665f63982a47fe47c5186036524981c848ad22902886bc10425e2ea7d06dafdd9b4fe86027e4d9ae3847d81b0fc9c2d6fe7dcf63e55cd943cd0a63503b7450
 AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3
@@ -24,22 +25,12 @@ EBUILD qemu-1.1.1-r1.ebuild 12073 SHA256 7f408c7425a3e34d31e48a6c886d4a415a970e7
 EBUILD qemu-1.1.2.ebuild 12064 SHA256 5943cf3394891d8fd046f6e8e350af67417ee648c97935fcd44efd3e17d713a4 SHA512 245e913027ab3dda208582f36d35258d3fc0bbb44edf8de13eb31f5e04f289364ae814ee39c12f271fc9d501038838d3377df605044bc4a595a62f6b11fd47fe WHIRLPOOL a5a43d4660bebac1e257d1fed3bcf6aecca53dbba45fb50c77ea1200334cb677d6867be1e05b3a15414f87472332bab2e43a75247ac162894fa475e65fceebdc
 EBUILD qemu-1.2.0.ebuild 6781 SHA256 c3315377ba5fe331fa028bc2e1dc4231b09c9180856732943e5fb3b5534c9445 SHA512 68d1422c70f52461294ac703cb8bb6c6daca0efa41fa994f034d5dfc5a47674774b9e60cc03eefe9f635b750a6b089a3333b95ef3be0792d1648437a14a13017 WHIRLPOOL c6ed1c57c820d77c804f6ff5127aa0e16b3597462c3c0005cb1d8a364ac7f84ff00b641d1e95a1d914e48b8e2a1421b326d3095af56163179afe51548d15d4f2
 EBUILD qemu-9999.ebuild 12834 SHA256 f0e9ef23ebe1b7d16269620237cc12fd6c2158dad5bd001c4c6d3007dc2cbd88 SHA512 ee609002815e041ee022ac3aa738ba7bfb38a40457fc99724c9f155f51a0a2b760f5346ddb42c5da051a375a6206c178f5db197e5c3d4f109f177d0105d1f306 WHIRLPOOL a09d752353ed41e437916525d38a70848c29fe8f7b93b234e71dd84c829967ed3158dba4e6f1c08ae9538d50e2d0107a5d3048986f56db91db477db3a0275e66
-MISC ChangeLog 19214 SHA256 2e8868f9110a8513afcb3b06a428a8b01f066d7f8ecfa6338e2a63aa14e25366 SHA512 02768ae657805837e1166297d4a4aba5265c0670c24e1b4110dc36a53bc78155816ed3495ec5cced8a3225cf952ec64f0c7304c38e4d2cc35d583850f1fb7531 WHIRLPOOL beaf7d2395bf11cd2b611e9a67e66705d648185ad72b22d1fbcac85fb301ef0576591a6da51d969423976d626fc174c2499c76de06c7ba22fff145bac4b57054
+MISC ChangeLog 19375 SHA256 c01f85321fb4ebbba317a66ad094911d0930910df75664c6e252dc73ee1db248 SHA512 33fbc72354af51adfef2a2e8d25c398f9726809af137d728f899e75d9f8b841fceafec43e2de15a71eb9832b164d27ce93f3754407c12076dd6e377bacc26cfd WHIRLPOOL 7550ce8f85a652fe43b762a36094dceb0f9fcf13866b50b1b4489a655c590c45ea53067142806945935eb4520f206a93cdee6f161e6085f4b9c410b0eba6953b
 MISC metadata.xml 2693 SHA256 a8eb669bccb38cedcf4d53432693a429220f6bc9578c5093e0ea2615b42ff8c6 SHA512 f92ccd385c7c4e31494fe4efbebaaa4ccd48d31e339c5401e9c28cf4c28cde2de646afa17cd37c5e50cb545c3b094f57e2f697126219ebe9314c7c53ed65b3be WHIRLPOOL 77161784daf8a85f80780f7ca962023da3285ca5e9890b74f7a293cea1f2a70dcea40f4e0cd27dc3781971303a21b772d75bdd4947ae2f64e4069de1a4256ff4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQdcyaAAoJELEHsLL7fEFWmhwP/1OqY9WXCLA+JDVMA1sUSSiv
-GxkO1Cu5wdvylXuwJmD0hnjtPFEtceommrqRsu9WgFfNoD2Ysq9OBKWc21ftae7k
-oJs4bQUhlA8HHvLRl2IHj5DGnx+jzr/++HAiRY0Dtwfro3CaEkKvHkTytLfuS68F
-DNHqlekooHNgUTd7zrivlXzI+udkiSVE0Y73hnH4R725bGZcQKAMAwLnGmgiNcLP
-yhPhmKCfeRIzMCbQfbJoze4gMTKGJFMftscyJlIB25eU6eSTfgTvwHkTCckryimu
-bFswG7qHDK0Z2JiqbhMa8BzJtoQO9eVeJuvflYxAPSjdfvE+aPMliVgvVELjO+KL
-ezMpYzs3iOpxa8YoLX/hwcXhExyc+/eTxPQLmOwww3iAhod73UfYfI8XBUr+oJl1
-04CZ5DKG1ikqbvmQspKlg8Y9wdfSU83bsamhd+gaJdXlhb4UE+JM83IYaDEDzpt5
-+bh5Odbwof4y5/aCkR2wPT1NzXiTMdHVi3MlOo0pYLv2yAIskEGiu1VEQyp6mJX1
-3L+QX7cFCepTS2Md2EiU6qR5PNBIvX9rL+7EK3a7qkuPb8lgsg2rP/S7K5DRUafK
-fInkA9qn78++ITKPhs4UajQzItuP95ZUlXUPEhgqjvQUh5arxq7hTMiizrp2n2iN
-Wnt5bT5L5vET17oTPmFy
-=p988
+iEYEAREIAAYFAlB2d/AACgkQcaHudmEf86oiQQCeM02sUWh2SDX3+gklG5e9FqQc
+jIwAnR5rP3Jb2I9+F7MNZMLrAGW7ifrM
+=Sdm0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/files/qemu-9999-fix-mipsen.patch b/app-emulation/qemu/files/qemu-9999-fix-mipsen.patch
new file mode 100644
index 000000000000..02a9a22e8aa7
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-9999-fix-mipsen.patch
@@ -0,0 +1,18 @@
+Fixes link failure due to missing piix symbols.
+
+  LINK  mips-softmmu/qemu-system-mips
+hw/mips/../mips_malta.o: In function `mips_malta_init':
+mips_malta.c:(.text+0x2314): undefined reference to `piix4_pm_init'
+collect2: error: ld returned 1 exit status
+diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
+index 29a5d0d..89af0e9 100644
+--- a/hw/mips/Makefile.objs
++++ b/hw/mips/Makefile.objs
+@@ -1,6 +1,7 @@
+ obj-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
+ obj-y += mips_addr.o mips_timer.o mips_int.o
+ obj-y += gt64xxx.o mc146818rtc.o
++obj-y += acpi.o acpi_piix4.o
+ obj-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
+ 
+ obj-y := $(addprefix ../,$(obj-y))