Add patch to fix building with GCC 4.1, thanks to Daniele Gaffuri in bug #125179 for submitting it.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 63 insertions, 15 deletions

diff --git a/net-misc/knemo/ChangeLog b/net-misc/knemo/ChangeLog
index c1162d09a491..fd2adeac7e9e 100644
--- a/net-misc/knemo/ChangeLog
+++ b/net-misc/knemo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/knemo
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/ChangeLog,v 1.16 2005/09/02 03:27:28 metalgod Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/ChangeLog,v 1.17 2006/03/06 11:41:40 flameeyes Exp $
+
+  06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/knemo-0.3.1-gcc41.patch, knemo-0.3.1-r1.ebuild:
+  Add patch to fix building with GCC 4.1, thanks to Daniele Gaffuri in bug
+  #125179 for submitting it.
 
   02 Sep 2005; Luis Medinas <metalgod@gentoo.org> knemo-0.3.1-r1.ebuild:
   Marked Stable on AMD64.
diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest
index 1dda353fe2e7..ee07180de06a 100644
--- a/net-misc/knemo/Manifest
+++ b/net-misc/knemo/Manifest
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fb8178fd61a4affc8f030106d9a44551 ChangeLog 2185
-MD5 4ebb1879e426b275794590ee4b3edbb5 knemo-0.3.1-r1.ebuild 835
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 8e0699d5346144463df50c4caf5c433d ChangeLog 2401
+RMD160 3ab2a7d313b0262f30e978b0d060548b333326a7 ChangeLog 2401
+SHA256 b3570220fd0f026f4a2b176c6f9b2abc0c9c63665a390ce6c704a94d8bbdeafe ChangeLog 2401
 MD5 880f6fce3873cebf4cb5bd3070ab5967 files/digest-knemo-0.3.1-r1 64
+RMD160 d6e2e82bdc9b7c6d1a62ebf15dc95d85723bce86 files/digest-knemo-0.3.1-r1 64
+SHA256 eb163664a0e52d174ac72a66f1fcb51079fe30a7bbff9731470176c267a5bcf3 files/digest-knemo-0.3.1-r1 64
+MD5 8c94121d55cd5d246a4b6d80b4596d84 files/knemo-0.3.1-gcc41.patch 924
+RMD160 9c1769f2150573f72d04cbceff38b8218761fae7 files/knemo-0.3.1-gcc41.patch 924
+SHA256 dd63a33ea62b44e495a8560dcfdae5bca2cb9b94cbc1d3fe50c6a356eb6baf00 files/knemo-0.3.1-gcc41.patch 924
 MD5 e6a9a9aef0881e30022bd77be5ac5d90 files/knemo-0.3.1-linkquality.patch 463
+RMD160 ddab970759bf22d99b51edcb27ccb27e44952adf files/knemo-0.3.1-linkquality.patch 463
+SHA256 4fa9ff6fb42f67af0735a5d5986505d8085dc049208d8340c671893cdfa03145 files/knemo-0.3.1-linkquality.patch 463
+MD5 5e8534c64238ed2bb789735a2a9af764 knemo-0.3.1-r1.ebuild 829
+RMD160 65aa16c19141b4bfe74ee9553c0cee96ab22ae3b knemo-0.3.1-r1.ebuild 829
+SHA256 12595847eb05b1311a80787317d218f5ba3a08c5c4efd2887acc3fed3a174348 knemo-0.3.1-r1.ebuild 829
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDF9QdwUpWvClEHQoRAjk8AKCGT0ZGVLuNk5/qIywlWroXg27a+wCfVcJj
-lGw7p52kds0qofLSys9RN0E=
-=mQeu
+iD8DBQFEDB/gAiZjviIA2XgRAnLWAJ9eurb95WQ5VZKB6sg9UxohbPJaCwCgkuj1
+p4C3u6JoYjPJtfwIq4VytAY=
+=iIF/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/knemo/files/knemo-0.3.1-gcc41.patch b/net-misc/knemo/files/knemo-0.3.1-gcc41.patch
new file mode 100644
index 000000000000..3de3fb40b68e
--- /dev/null
+++ b/net-misc/knemo/files/knemo-0.3.1-gcc41.patch
@@ -0,0 +1,31 @@
+--- knemo-0.3.1/kcm/data.h.orig	2004-09-09 17:10:52.000000000 +0200
++++ knemo-0.3.1/kcm/data.h	2006-03-06 08:08:19.000000000 +0100
+@@ -45,7 +45,7 @@ struct InterfaceCommand
+ 
+ struct InterfaceSettings
+ {
+-    InterfaceSettings::InterfaceSettings()
++    InterfaceSettings()
+       : iconSet( 0 ),
+         numCommands( 0 ),
+         toolTipContent( 2 ),
+--- knemo-0.3.1/knemod/data.h.orig	2004-09-06 16:38:24.000000000 +0200
++++ knemo-0.3.1/knemod/data.h	2006-03-06 08:08:58.000000000 +0100
+@@ -43,7 +43,7 @@ struct GeneralData
+ 
+ struct InterfaceData
+ {
+-    InterfaceData::InterfaceData()
++    InterfaceData()
+       : existing( false ),
+         available( false ),
+         wirelessDevice( false ),
+@@ -98,7 +98,7 @@ struct InterfaceCommand
+ 
+ struct InterfaceSettings
+ {
+-    InterfaceSettings::InterfaceSettings()
++    InterfaceSettings()
+       : iconSet( 0 ),
+         numCommands( 0 ),
+         toolTipContent( 2 ),
diff --git a/net-misc/knemo/knemo-0.3.1-r1.ebuild b/net-misc/knemo/knemo-0.3.1-r1.ebuild
index b23b36cf7196..7772cc8a79a0 100644
--- a/net-misc/knemo/knemo-0.3.1-r1.ebuild
+++ b/net-misc/knemo/knemo-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/knemo-0.3.1-r1.ebuild,v 1.4 2005/09/02 03:27:28 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/knemo-0.3.1-r1.ebuild,v 1.5 2006/03/06 11:41:40 flameeyes Exp $
 
 inherit kde eutils
 
@@ -17,10 +17,9 @@ RDEPEND="kernel_linux? ( sys-apps/net-tools )
 	wifi? ( net-wireless/wireless-tools )"
 need-kde 3.2
 
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/knemo-0.3.1-linkquality.patch
-}
+PATCHES="${FILESDIR}/${P}-linkquality.patch
+	${FILESDIR}/${P}-gcc41.patch"
+
 pkg_postinst() {
 	echo
 	einfo "KNemo is not an executable but an KDED service. Therefore it has to"