Fix bug #261664, thanks to pva for doing all the work

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

4 files changed, 37 insertions, 10 deletions

diff --git a/app-emulation/kqemu/ChangeLog b/app-emulation/kqemu/ChangeLog
index d72ab551c1e9..3e0c4ebd4043 100644
--- a/app-emulation/kqemu/ChangeLog
+++ b/app-emulation/kqemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/kqemu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.24 2009/03/06 22:18:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.25 2009/03/09 09:01:57 lu_zero Exp $
+
+  09 Mar 2009; Luca Barbato <lu_zero@gentoo.org>
+  +files/kqemu-1.4.0_pre1-missing-sched-header.patch,
+  kqemu-1.4.0_pre1.ebuild:
+  Fix bug #261664, thanks to pva for doing all the work
 
 *kqemu-1.4.0_pre1 (06 Mar 2009)
 
diff --git a/app-emulation/kqemu/Manifest b/app-emulation/kqemu/Manifest
index 37053e510011..42d3cd4e462e 100644
--- a/app-emulation/kqemu/Manifest
+++ b/app-emulation/kqemu/Manifest
@@ -1,5 +1,6 @@
 AUX kqemu-1.3.0_pre11-sched_h.patch 329 RMD160 2199965106d45c2f7b9a39b9274c051f72d418e1 SHA1 4150f3ae845612a78de27d74b8f66cd0943268e7 SHA256 e40434e2bcd8be18dfa29fc4a8a59c29c5c3287d2d93000eb05e75c0d962ab2e
 AUX kqemu-1.3.0_pre5-fix_module_parm.patch 686 RMD160 974dd24dfb1405043bc20ab218d42443e6a6cf3c SHA1 d05ed564696bdf0db9c587ee8364fd8033e9b750 SHA256 47166817cfcfa7dbf3293703f25b39ad6da9fb403754b929e949278f42529915
+AUX kqemu-1.4.0_pre1-missing-sched-header.patch 273 RMD160 852fa423ab789ce7aa4d08a137227cdea9d5e0df SHA1 d6603c85992e2201938b310b4247446c1dc61e9c SHA256 38bd6054c952d2fc088c12262852129252af8065c8df446d7b8ae157ccf78a93
 DIST kqemu-0.7.2.tar.gz 79314 RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 SHA1 39dda2566a9c47bfc5e76c76cf9aa41500d708f3 SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b
 DIST kqemu-1.3.0pre11.tar.gz 161478 RMD160 3d42d2e6f3ae94362c5a29c462f7fb839687a563 SHA1 780d48b99715e6b2671864ad5050f1c9506fcb71 SHA256 541aef5797e5c6c6a76e354c17c6513ca21fe3372ec79493a32f7e51ba785b0f
 DIST kqemu-1.3.0pre5.tar.gz 189395 RMD160 cc54ac38791f543feb91285292ecf7ca333d9918 SHA1 2f607c7b1909b751e74b1ad3196f41127ebc43f7 SHA256 2f2983393a4e007741685ef4e889fc91fe7619a038fc43998d414e441f5813a7
@@ -12,6 +13,6 @@ EBUILD kqemu-1.3.0_pre11.ebuild 1794 RMD160 2ac5ff4bfae6051f04bb69feff2fa66cc14d
 EBUILD kqemu-1.3.0_pre5.ebuild 1749 RMD160 d057f5b53d79b223ecb8f08ab26ce4daf9724974 SHA1 f844b26e1dde62e5bd60e2de51e50c4ac4cf2d0d SHA256 21817506c76bd0148cf1b7382c190803d9b7b2be7759272027161835ea02be14
 EBUILD kqemu-1.3.0_pre7.ebuild 1782 RMD160 1df2e6992fbaa898ab84270ffecef2cafb14fb9c SHA1 359903d2db64b2475188bdbf3ffe7de0a9bacc4f SHA256 ea40e108c536b508f625c9931deea33f2159fe52690bf9f442d36757304bfe51
 EBUILD kqemu-1.3.0_pre9.ebuild 2034 RMD160 148accd1e8bf8f7ab040e6e97bdfa95091b9f300 SHA1 2605cb6444e8f4b10faf1cde4843e2b8555728ac SHA256 a9c0feed8020d4753d32fbe1d8140468439e273ec3c01bf20f23598a6bc9fb77
-EBUILD kqemu-1.4.0_pre1.ebuild 1822 RMD160 1bdd290710248f46084cd52cf7cdb0060c79a1a1 SHA1 6882cc9e4ee7e6127a28f7711fc94c0cc4c3e473 SHA256 43d48a9e8ce294526e931a79eebead2e4399748f69d88653b4c25349b3a68991
-MISC ChangeLog 3648 RMD160 c420e8fba6fd62475917a76d8fc1d068fa3b64e2 SHA1 065b82197a97a18a320a61fc4fe2639ba6b17282 SHA256 da4429610bc573887deb035f5db4bd8a833f5d2f29fd77af089ab50537d944b5
+EBUILD kqemu-1.4.0_pre1.ebuild 2103 RMD160 1370913e836e697c4ea89e1d48a4c3047d894761 SHA1 d1afc6b9d1f9d1b09eb3cf3fff565a4731498075 SHA256 963508e9d6d2d4a51c7a65895e57cde42f154cc8fcdf1bf897bf169a519a7e47
+MISC ChangeLog 3835 RMD160 827bef9eb17cd7cb259396ceff86abbc8ae9b224 SHA1 ed5065cbdffcbf76e719af5b35190e36921e1826 SHA256 12096e0c29fd6974ad59f84d47f3a6c3e699039b9692071fdb97f8a5aa95fcda
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
diff --git a/app-emulation/kqemu/files/kqemu-1.4.0_pre1-missing-sched-header.patch b/app-emulation/kqemu/files/kqemu-1.4.0_pre1-missing-sched-header.patch
new file mode 100644
index 000000000000..6df868590c83
--- /dev/null
+++ b/app-emulation/kqemu/files/kqemu-1.4.0_pre1-missing-sched-header.patch
@@ -0,0 +1,12 @@
+=== modified file 'kqemu-linux.c'
+--- kqemu-linux.c	2009-03-08 10:40:57 +0000
++++ kqemu-linux.c	2009-03-08 10:40:58 +0000
+@@ -30,6 +30,7 @@
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
+ #include <asm/io.h>
++#include <linux/sched.h>
+ 
+ #include "kqemu-kernel.h"
+ 
+
diff --git a/app-emulation/kqemu/kqemu-1.4.0_pre1.ebuild b/app-emulation/kqemu/kqemu-1.4.0_pre1.ebuild
index 4d7421306c82..11c32dd4a34c 100644
--- a/app-emulation/kqemu/kqemu-1.4.0_pre1.ebuild
+++ b/app-emulation/kqemu/kqemu-1.4.0_pre1.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/kqemu/kqemu-1.4.0_pre1.ebuild,v 1.1 2009/03/06 22:18:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.4.0_pre1.ebuild,v 1.2 2009/03/09 09:01:57 lu_zero Exp $
 
 inherit eutils flag-o-matic linux-mod toolchain-funcs
 
@@ -17,7 +17,7 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
-S="${WORKDIR}/$MY_P"
+S="${WORKDIR}/${MY_P}"
 
 DEPEND=""
 RDEPEND=""
@@ -31,6 +31,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' kqemu-linux.c
+	sed -e 's:-Werror::' -i common/Makefile #260876
+	sed -e '/^CC/d;/^HOST_CC/d;' \
+		-e 's/\(^MON_CC=\).*/\1$(CC)/' \
+		-e "s/\(^MON_LD=\).*/\1$(tc-getLD)/" \
+		-e 's/^\(TOOLS_CFLAGS.*\)/\1 $(CFLAGS)/' \
+		-e 's/^\(MON_CFLAGS.*\)/\1 $(CFLAGS)/' \
+		-e 's/^\(KERNEL_CFLAGS.*\)/\1 $(CFLAGS)/' \
+		-e 's/^CFLAGS=\(.*\)/CFLAGS+=\1/' \
+		-i common/Makefile
+	epatch "${FILESDIR}/${P}-missing-sched-header.patch"
 }
 
 src_compile() {
@@ -41,6 +51,10 @@ src_compile() {
 	filter-flags -fpie -fstack-protector
 
 	./configure --kernel-path="${KV_DIR}" \
+				--cc="$(tc-getCC)" \
+				--host-cc="$(tc-getBUILD_CC)" \
+				--extra-cflags="${CFLAGS}" \
+				--extra-ldflags="${LDFLAGS}" \
 		|| die "could not configure"
 
 	make
@@ -67,9 +81,4 @@ pkg_postinst() {
 	enewgroup qemu
 	elog "Make sure you have the kernel module loaded before running qemu"
 	elog "and your user is in the 'qemu' group"
-	case ${CHOST} in
-		*-darwin*) elog "Just run 'niutil -appendprop / /groups/qemu users <USER>'";;
-		*-freebsd*|*-dragonfly*) elog "Just run 'pw groupmod qemu -m <USER>'";;
-		*) elog "Just run 'gpasswd -a <USER> qemu', then have <USER> re-login.";;
-	esac
 }