Fix building with sanitized headers.

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index 0ef49af44c09a4e84fde3116518acfc69d546834..5b047966732018e38c97471c4d6ae75362a8406a 100644 (file)
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.29 2006/12/31 02:46:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.30 2006/12/31 12:59:23 vapier Exp $
+
+  31 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/qemu-0.8.2-linux-headers.patch, qemu-softmmu-0.8.2-r1.ebuild:
+  Fix building with sanitized headers.
 
   31 Dec 2006; Luca Barbato <lu_zero@gentoo.org>
   qemu-softmmu-0.8.2-r1.ebuild:

diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index d6854f13fe91b0615179a369483f665b9c5d33cf..9720f3d9db7d2cec5de758d321804797b4f7db8e 100644 (file)
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qemu-0.8.0-gcc4-hacks.patch 4634 RMD160 1d9d3f188c7c94e86794db2aae1336472852cadf SHA1 d193cc7b5793d80ab4540c7e24e6e75a246babb6 SHA256 dad86d110f86f6edc307d0073546ed583d3f4109784ba06afebbd1126dba0f38
 MD5 5c525594aaac2ffa5e676a2b196ffd82 files/qemu-0.8.0-gcc4-hacks.patch 4634
 RMD160 1d9d3f188c7c94e86794db2aae1336472852cadf files/qemu-0.8.0-gcc4-hacks.patch 4634
@@ -6,13 +9,17 @@ AUX qemu-0.8.0-gcc4-opts.patch 1661 RMD160 409b9670b8c910c5fc80cf52c5ec35dad6ae7
 MD5 67e6ae7ea59a24ed2bbc63c6ccdcfee9 files/qemu-0.8.0-gcc4-opts.patch 1661
 RMD160 409b9670b8c910c5fc80cf52c5ec35dad6ae7eee files/qemu-0.8.0-gcc4-opts.patch 1661
 SHA256 bc3f100113007809a247a79464913f9b37bed49e821c41c1defdf08d2fa080dc files/qemu-0.8.0-gcc4-opts.patch 1661
+AUX qemu-0.8.2-linux-headers.patch 309 RMD160 af3fc9b49f2c9a407220329fea440fde2fcce573 SHA1 d4204b0a216e07d9788efd80a39505bb9bc4cf0e SHA256 96bfd1ec6cca6edfbcd19d4f6fde88e30a07535e8e53506788f2dc83cc5221d1
+MD5 11e4f582f85bef53e606a9119ba7191e files/qemu-0.8.2-linux-headers.patch 309
+RMD160 af3fc9b49f2c9a407220329fea440fde2fcce573 files/qemu-0.8.2-linux-headers.patch 309
+SHA256 96bfd1ec6cca6edfbcd19d4f6fde88e30a07535e8e53506788f2dc83cc5221d1 files/qemu-0.8.2-linux-headers.patch 309
 AUX qemu-0.8.2-sparc-fp.patch 591 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b7 SHA1 785541312b7edacd279c81ce6df550e1a4f5839b SHA256 839166847b3b39fa481b49e27110aaf207067cc5acecaf55131d2ec31d92ad59
 MD5 b3e7fd1797acd3ca68ffa4a31750d518 files/qemu-0.8.2-sparc-fp.patch 591
 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b7 files/qemu-0.8.2-sparc-fp.patch 591
 SHA256 839166847b3b39fa481b49e27110aaf207067cc5acecaf55131d2ec31d92ad59 files/qemu-0.8.2-sparc-fp.patch 591
 DIST kqemu-0.7.2.tar.gz 79314 RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 SHA1 39dda2566a9c47bfc5e76c76cf9aa41500d708f3 SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b
 DIST qemu-0.8.0.20060329.tar.bz2 1325034 RMD160 a6ec15e1b08dd6e2dd88d953bfa31e3db1dc212e SHA256 4ccb27692ffaee119728442298da84198d6319de79a18d497d14604e140c3eb0
-DIST qemu-0.8.0.tar.gz 1497965 RMD160 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7 SHA256 de388539ce86971a2cbe8474fca8b6160898c95772e3e6e08a7794d48db32a61
+DIST qemu-0.8.0.tar.gz 1497965 RMD160 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7 SHA1 f7bcf2f0eee9e5207cba265f3c47ae781244628e SHA256 de388539ce86971a2cbe8474fca8b6160898c95772e3e6e08a7794d48db32a61
 DIST qemu-0.8.1.tar.gz 1623264 RMD160 04d163d4792bbea39fc0b1e52af124cdb7e907dc SHA1 72c943c24bed6aa066dcc3012b198c20f04aef30 SHA256 a1f83666f5c05eaee9bfc608a3a5034ad95d0fd3c99937bb399bf9235a6aa0c9
 DIST qemu-0.8.2.tar.gz 1810909 RMD160 715c24997330352aa675cd7279731cec251f833a SHA1 d775239a545e7d0c5b677660a2122df590afde6d SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3
 EBUILD qemu-softmmu-0.8.0.20060329.ebuild 2499 RMD160 cab2a5861d06b483b9a41033c2c988612de6cbc6 SHA1 d9b2955aae4b7b244b09fcad31544f964ec44d53 SHA256 88308504b593b355768b77530027a476fc3ee9c05ca6df00c09d80c8ed6ebc7e
@@ -31,18 +38,18 @@ EBUILD qemu-softmmu-0.8.1.ebuild 2657 RMD160 8cc0ecdd505369b7e83fd258d3ff7b0ec6a
 MD5 2121a62301cd1069aed299801a6cd0e4 qemu-softmmu-0.8.1.ebuild 2657
 RMD160 8cc0ecdd505369b7e83fd258d3ff7b0ec6a5ee10 qemu-softmmu-0.8.1.ebuild 2657
 SHA256 ea3f39de2f13c8dc376299513b0231414fd3da6bd4cd01d4792329efb63420ad qemu-softmmu-0.8.1.ebuild 2657
-EBUILD qemu-softmmu-0.8.2-r1.ebuild 2936 RMD160 44b4256582032a276d5609452fd4f0516cbbc3e3 SHA1 b34dee9cbaf78517f68c6067c479e655523316ed SHA256 6c99379af23f4e1895701983d3d7502fca43ed0f10a1d927057c5d329c394a6d
-MD5 f9c7bd505d04311a70b633c75237234f qemu-softmmu-0.8.2-r1.ebuild 2936
-RMD160 44b4256582032a276d5609452fd4f0516cbbc3e3 qemu-softmmu-0.8.2-r1.ebuild 2936
-SHA256 6c99379af23f4e1895701983d3d7502fca43ed0f10a1d927057c5d329c394a6d qemu-softmmu-0.8.2-r1.ebuild 2936
+EBUILD qemu-softmmu-0.8.2-r1.ebuild 2992 RMD160 972a0a3bae2bd40363c52e6554dd80fc71649efb SHA1 b4376dd50809ee99a0f332454ad0658dee13028c SHA256 1e292f374cf460e1b180b87f02bc2328cecf3f7a2e9fe9f94668196a7a219865
+MD5 bfa8f049625a7c5e652db220cef3effa qemu-softmmu-0.8.2-r1.ebuild 2992
+RMD160 972a0a3bae2bd40363c52e6554dd80fc71649efb qemu-softmmu-0.8.2-r1.ebuild 2992
+SHA256 1e292f374cf460e1b180b87f02bc2328cecf3f7a2e9fe9f94668196a7a219865 qemu-softmmu-0.8.2-r1.ebuild 2992
 EBUILD qemu-softmmu-0.8.2.ebuild 2597 RMD160 6a86334435e427061565a2bcee42db87078c9492 SHA1 c1a33484f03aa31ad187a4224640440460a52152 SHA256 29296edf7db4635e5ee9c192b8ae940a4eced057858794b97f57f459e0c5b3bf
 MD5 9296496f68096da3a9658abb6913ae6d qemu-softmmu-0.8.2.ebuild 2597
 RMD160 6a86334435e427061565a2bcee42db87078c9492 qemu-softmmu-0.8.2.ebuild 2597
 SHA256 29296edf7db4635e5ee9c192b8ae940a4eced057858794b97f57f459e0c5b3bf qemu-softmmu-0.8.2.ebuild 2597
-MISC ChangeLog 5390 RMD160 20ee45cb838b3f9342ae2ede8aa7e3d15b53f6ff SHA1 a61ceba21e4e439ee8555c9832fc7b7b564f8ff0 SHA256 91bd4ec0b560822cec31c4babb20d344ecb1e89c34b4aa806182a9a4855b04b9
-MD5 f5bbcb9b31794c08c7ec4010b19097de ChangeLog 5390
-RMD160 20ee45cb838b3f9342ae2ede8aa7e3d15b53f6ff ChangeLog 5390
-SHA256 91bd4ec0b560822cec31c4babb20d344ecb1e89c34b4aa806182a9a4855b04b9 ChangeLog 5390
+MISC ChangeLog 5550 RMD160 f6172db0e75aa6154ea253fbef95e7a70c37ae7b SHA1 23fc954fa9eccd32c58061081c112cf9b6ecf23f SHA256 9ea478713f6a21529914f69165fe1fd88e974d4915f3a75a25858b1ab1aa3216
+MD5 b7eadc00548cfdc82a0af61bf1970bf9 ChangeLog 5550
+RMD160 f6172db0e75aa6154ea253fbef95e7a70c37ae7b ChangeLog 5550
+SHA256 9ea478713f6a21529914f69165fe1fd88e974d4915f3a75a25858b1ab1aa3216 ChangeLog 5550
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -65,3 +72,10 @@ SHA256 f29c0addbe47b46f7c4ab7d2cb4965bac24abdaa456bc0815d5d07a407f7450b files/di
 MD5 e9b66fd821b0760086e3574d3a90398c files/digest-qemu-softmmu-0.8.2-r1 235
 RMD160 1690afc2131b50cf62fe141bf5b621687fb107e3 files/digest-qemu-softmmu-0.8.2-r1 235
 SHA256 f29c0addbe47b46f7c4ab7d2cb4965bac24abdaa456bc0815d5d07a407f7450b files/digest-qemu-softmmu-0.8.2-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFl7Rw8bi6rjpTunYRAl/4AJ9y5GB1DFJCP2jii1ZvVzU+El4YYQCfdTsW
+PMus5Xs2JGSczQuV5LamKNU=
+=Jdzn
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/qemu-softmmu/files/qemu-0.8.2-linux-headers.patch b/app-emulation/qemu-softmmu/files/qemu-0.8.2-linux-headers.patch
new file mode 100644 (file)
index 0000000..6307f6b
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/qemu-0.8.2-linux-headers.patch
@@ -0,0 +1,12 @@
+don't actually need linux/compiler.h and sanitized headers dont include it
+
+--- qemu-0.8.2/usb-linux.c
++++ qemu-0.8.2/usb-linux.c
+@@ -26,7 +26,6 @@
+ #if defined(__linux__)
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+-#include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ #include <linux/version.h>
+ 

diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
index 04dc1a391d3031c27463fa762e9c9e536baff7d3..0cc518859ca8ed4c8e4a423f5c7135ab4f6a906d 100644 (file)
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.8.2-r1.ebuild,v 1.4 2006/12/31 02:46:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild,v 1.5 2006/12/31 12:59:23 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -40,18 +40,18 @@ set_target_list() {
 
 pkg_setup() {
        if [ "$(gcc-major-version)" == "4" ]; then
-       eerror "qemu requires gcc-3 in order to build and work correctly"
-       eerror "please compile it with gcc-3"
-       die "gcc 4 cannot build qemu"
+               eerror "qemu requires gcc-3 in order to build and work correctly"
+               eerror "please compile it with gcc-3"
+               die "gcc 4 cannot build qemu"
        fi
 }
 
 #RUNTIME_PATH="/emul/gnemul/"
 src_unpack() {
        unpack ${A}
-
-       cd ${S}
-       epatch "${FILESDIR}/qemu-${PV}-sparc-fp.patch"
+       cd "${S}"
+       epatch "${FILESDIR}"/qemu-${PV}-linux-headers.patch
+       epatch "${FILESDIR}"/qemu-${PV}-sparc-fp.patch
        # Alter target makefiles to accept CFLAGS set via flag-o.
        sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
                Makefile Makefile.target tests/Makefile