gcc 4.1 fixes thanks to Nicolas Boichat <nicolas@boichat.ch> in bug 131676

Package-Manager: portage-2.1_pre10-r4

4 files changed, 31 insertions, 15 deletions

diff --git a/app-emulation/kqemu/ChangeLog b/app-emulation/kqemu/ChangeLog
index db2d9bef5921..84b2d5b638dc 100644
--- a/app-emulation/kqemu/ChangeLog
+++ b/app-emulation/kqemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/kqemu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.10 2006/05/07 20:28:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.11 2006/05/08 20:48:24 genstef Exp $
+
+  08 May 2006; Stefan Schweizer <genstef@gentoo.org> kqemu-0.7.2.ebuild,
+  kqemu-1.3.0_pre7.ebuild:
+  gcc 4.1 fixes thanks to Nicolas Boichat <nicolas@boichat.ch> in bug 131676
 
   07 May 2006; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
   New version
diff --git a/app-emulation/kqemu/Manifest b/app-emulation/kqemu/Manifest
index dbde6da0fd6c..2d336457e7b2 100644
--- a/app-emulation/kqemu/Manifest
+++ b/app-emulation/kqemu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kqemu-1.3.0_pre5-fix_module_parm.patch 686 RMD160 974dd24dfb1405043bc20ab218d42443e6a6cf3c SHA1 d05ed564696bdf0db9c587ee8364fd8033e9b750 SHA256 47166817cfcfa7dbf3293703f25b39ad6da9fb403754b929e949278f42529915 size 686
 MD5 bd6fecaea94c6bdf922a4661ba2f0cd3 files/kqemu-1.3.0_pre5-fix_module_parm.patch 686
 RMD160 974dd24dfb1405043bc20ab218d42443e6a6cf3c files/kqemu-1.3.0_pre5-fix_module_parm.patch 686
@@ -6,22 +9,22 @@ DIST kqemu-0.7.2.tar.gz 79314 RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 SH
 DIST kqemu-1.3.0pre5.tar.gz 189395 RMD160 cc54ac38791f543feb91285292ecf7ca333d9918 SHA256 2f2983393a4e007741685ef4e889fc91fe7619a038fc43998d414e441f5813a7 size 189395
 DIST kqemu-1.3.0pre7.tar.gz 189920 RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead size 189920
 DIST qemu-0.7.2.tar.gz 1341993 RMD160 1d2dcc8f43ff4b4b9aa045c64e38c9a10140b13e SHA256 a4982e991ebca255d53f0738d203afb9355d9d16aa1a89835a080fa5d6ba4766 size 1341993
-EBUILD kqemu-0.7.2.ebuild 2551 RMD160 b6d1b950db9e50a899fee31fa79cfa2827f81836 SHA1 c542f92f668b4e593cf576a343bef8a30a209780 SHA256 7be540831fdd7231ff2203886314f8c830951d026010bbab257503f9c5146420 size 2551
-MD5 88b02b9404d83aec1fc4659afc2063ce kqemu-0.7.2.ebuild 2551
-RMD160 b6d1b950db9e50a899fee31fa79cfa2827f81836 kqemu-0.7.2.ebuild 2551
-SHA256 7be540831fdd7231ff2203886314f8c830951d026010bbab257503f9c5146420 kqemu-0.7.2.ebuild 2551
+EBUILD kqemu-0.7.2.ebuild 2632 RMD160 7610f9ee2c0b5b74b43d98c5a27c31c2dcb58c6e SHA1 3b4c927d9975b8b7bc6460be9bce0e09e7f3bc90 SHA256 c127c5dff050b182fcdfe4e0a012ac4931c27a833101324f170fd08bb9980a57 size 2632
+MD5 d7e4251e2520d595b86f568a1b3c0c5b kqemu-0.7.2.ebuild 2632
+RMD160 7610f9ee2c0b5b74b43d98c5a27c31c2dcb58c6e kqemu-0.7.2.ebuild 2632
+SHA256 c127c5dff050b182fcdfe4e0a012ac4931c27a833101324f170fd08bb9980a57 kqemu-0.7.2.ebuild 2632
 EBUILD kqemu-1.3.0_pre5.ebuild 1753 RMD160 23053aca1be8e345c4e6e7410aac6b5e677554de SHA1 a36ff29c17abd664ba7cbeaace6f444027780a1f SHA256 1a579c018ed8c989579f199093047b3de8c5d0db90039b8762975858bca77f2e size 1753
 MD5 7ef613ce96719902d7ef414dd7fdfc1e kqemu-1.3.0_pre5.ebuild 1753
 RMD160 23053aca1be8e345c4e6e7410aac6b5e677554de kqemu-1.3.0_pre5.ebuild 1753
 SHA256 1a579c018ed8c989579f199093047b3de8c5d0db90039b8762975858bca77f2e kqemu-1.3.0_pre5.ebuild 1753
-EBUILD kqemu-1.3.0_pre7.ebuild 1704 RMD160 919136495e850d76d2107f6873e255f8ef0435e8 SHA1 a25480183b83aa9d71a3c570e78c4f18692c156a SHA256 f7ec75207ba38853a29a64c82c86f6fe6821ccb948d1e0e8ba1823549adfb9bf size 1704
-MD5 697dd60935acce2fda17c110e874a3b0 kqemu-1.3.0_pre7.ebuild 1704
-RMD160 919136495e850d76d2107f6873e255f8ef0435e8 kqemu-1.3.0_pre7.ebuild 1704
-SHA256 f7ec75207ba38853a29a64c82c86f6fe6821ccb948d1e0e8ba1823549adfb9bf kqemu-1.3.0_pre7.ebuild 1704
-MISC ChangeLog 1608 RMD160 32a0df0f2239f5813e0a3ec13da700cc59736529 SHA1 9f4697636174b3ef2babc1dedc08b6d410be7af8 SHA256 5fa5aac4ee433b6055dc30e3e46ba0488006d2c5730df9ec4a528a5f7c06c0eb size 1608
-MD5 766ae0aac35689bb762a37ad88eda1b4 ChangeLog 1608
-RMD160 32a0df0f2239f5813e0a3ec13da700cc59736529 ChangeLog 1608
-SHA256 5fa5aac4ee433b6055dc30e3e46ba0488006d2c5730df9ec4a528a5f7c06c0eb ChangeLog 1608
+EBUILD kqemu-1.3.0_pre7.ebuild 1785 RMD160 5e6e1e78479633d152a7b30c88ed752aed36237e SHA1 8679cf5a918f82de936acd1dbd55ec4c1d67032e SHA256 4c255be1b85efbade367900e3496685b1d1c4d26ee0d847610a38201f330fad7 size 1785
+MD5 851e30f9ea008cca68a6d484c7066e03 kqemu-1.3.0_pre7.ebuild 1785
+RMD160 5e6e1e78479633d152a7b30c88ed752aed36237e kqemu-1.3.0_pre7.ebuild 1785
+SHA256 4c255be1b85efbade367900e3496685b1d1c4d26ee0d847610a38201f330fad7 kqemu-1.3.0_pre7.ebuild 1785
+MISC ChangeLog 1786 RMD160 a650edd6815d32a886b47b9355eb2c15ddff3380 SHA1 96656b12591bf7d88cc28f76b21977c197dc2d2d SHA256 b305c2594927cdb0aade8fb3f8d78e496240c884f1b203f5fd3b79db06ebebf3 size 1786
+MD5 fac0c7b6677f87525ddfe0939025c755 ChangeLog 1786
+RMD160 a650edd6815d32a886b47b9355eb2c15ddff3380 ChangeLog 1786
+SHA256 b305c2594927cdb0aade8fb3f8d78e496240c884f1b203f5fd3b79db06ebebf3 ChangeLog 1786
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b size 223
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -35,3 +38,10 @@ SHA256 a913a4cd4bbb763c5ad0597d20d04b44704f4388d9e43925fd80b3c91be863c2 files/di
 MD5 4665e6998c0434fc3c14e7d62e262a9d files/digest-kqemu-1.3.0_pre7 247
 RMD160 b9bbf0dfa02df97bf0fb80091b1aa40c8cb06347 files/digest-kqemu-1.3.0_pre7 247
 SHA256 22e6cdceb2dfe13833178041b4998ceffeb10dcba8629f7afd2835d91556e53d files/digest-kqemu-1.3.0_pre7 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEX65tNJowsmZ/PzARAu8iAKCJkLiElB5i7+HEHdyw3GVmJU02LgCg1i2+
+B7agzX/3rHHPt/+UYpZDyxk=
+=iglj
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/kqemu/kqemu-0.7.2.ebuild b/app-emulation/kqemu/kqemu-0.7.2.ebuild
index 06814d35aaf6..a8174ca576c5 100644
--- a/app-emulation/kqemu/kqemu-0.7.2.ebuild
+++ b/app-emulation/kqemu/kqemu-0.7.2.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/kqemu/kqemu-0.7.2.ebuild,v 1.5 2006/04/19 21:54:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-0.7.2.ebuild,v 1.6 2006/05/08 20:48:24 genstef Exp $
 
 inherit eutils flag-o-matic linux-mod toolchain-funcs
 
@@ -35,6 +35,7 @@ src_unpack() {
 
 	mv ${WORKDIR}/kqemu ${S}
 	cd ${S}/kqemu
+	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' kqemu-linux.c
 	sed -i -e 's:#ifndef PAGE_KERNEL_EXEC:#if 1:' ${S}/kqemu/kqemu-linux.c
 	# The class_simple interfaces were removed in 2.6.13-rc1, leaving only
 	# GPL symbols behind, which this module can't use.  Until there's a fix
diff --git a/app-emulation/kqemu/kqemu-1.3.0_pre7.ebuild b/app-emulation/kqemu/kqemu-1.3.0_pre7.ebuild
index c23e3091ed31..816cd9d2d707 100644
--- a/app-emulation/kqemu/kqemu-1.3.0_pre7.ebuild
+++ b/app-emulation/kqemu/kqemu-1.3.0_pre7.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/kqemu/kqemu-1.3.0_pre7.ebuild,v 1.1 2006/05/07 20:28:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.3.0_pre7.ebuild,v 1.2 2006/05/08 20:48:24 genstef Exp $
 
 inherit eutils flag-o-matic linux-mod toolchain-funcs
 
@@ -34,6 +34,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' kqemu-linux.c
 }
 
 src_compile() {