gcc-3.4 patch, remove gnome-core from DEPEND

Package-Manager: portage-2.0.51.22-r2

4 files changed, 45 insertions, 10 deletions

diff --git a/net-wireless/gtkskan/ChangeLog b/net-wireless/gtkskan/ChangeLog
index efff5a6b0027..2507016b6ca5 100644
--- a/net-wireless/gtkskan/ChangeLog
+++ b/net-wireless/gtkskan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gtkskan
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gtkskan/ChangeLog,v 1.7 2004/07/01 22:41:03 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gtkskan/ChangeLog,v 1.8 2005/09/07 03:12:20 vanquirius Exp $
+
+  07 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/gtkskan-0.2-gcc34.diff, gtkskan-0.2.ebuild:
+  Add patch to allow compilation with gcc-3.4. Remove gnome-core from DEPEND.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gtkskan-0.2.ebuild:
   virtual/glibc -> virtual/libc
diff --git a/net-wireless/gtkskan/Manifest b/net-wireless/gtkskan/Manifest
index f7b6aea0a93d..251860c3d18e 100644
--- a/net-wireless/gtkskan/Manifest
+++ b/net-wireless/gtkskan/Manifest
@@ -1,4 +1,5 @@
-MD5 22b6467feba03c64e6a3b5984c1c3372 gtkskan-0.2.ebuild 1054
-MD5 2ca61715cbbe618f2dacdd48e47b8da6 ChangeLog 924
+MD5 974eb45d05cbc7eca8f31f6abeaa8be4 gtkskan-0.2.ebuild 1104
+MD5 096ef9955a31cf44e63c16b7a59d537d ChangeLog 1108
 MD5 65785d963853ae2361f378ed7b05b9cc metadata.xml 232
+MD5 50a9dacd5768a2d1ae04d21a330e0421 files/gtkskan-0.2-gcc34.diff 925
 MD5 bc08f073f8be6068b8c38da89e420b0b files/digest-gtkskan-0.2 59
diff --git a/net-wireless/gtkskan/files/gtkskan-0.2-gcc34.diff b/net-wireless/gtkskan/files/gtkskan-0.2-gcc34.diff
new file mode 100644
index 000000000000..e80cc6baffd0
--- /dev/null
+++ b/net-wireless/gtkskan/files/gtkskan-0.2-gcc34.diff
@@ -0,0 +1,27 @@
+--- gtkskan-0.2.orig/src/iwcommon.c	2005-09-06 23:43:44.000000000 -0300
++++ gtkskan-0.2/src/iwcommon.c	2005-09-06 23:46:52.000000000 -0300
+@@ -324,7 +324,6 @@
+     case IW_POWER_REPEATER:
+       fprintf(stream, " mode:Repeat multicasts");
+       break;
+-    default:
+     }
+ }
+ 
+--- gtkskan-0.2.orig/src/iwcommon.h	2005-09-06 23:43:44.000000000 -0300
++++ gtkskan-0.2/src/iwcommon.h	2005-09-06 23:54:55.000000000 -0300
+@@ -241,12 +241,12 @@
+ #define IW_POWER_MIN		0x0001	/* Value is a minimum  */
+ #define IW_POWER_MAX		0x0002	/* Value is a maximum */
+ #define IW_POWER_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
+-#endif IW_POWER_MODIFIER
++#endif
+ 
+ #ifndef IW_ENCODE_NOKEY
+ #define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not here */
+ #define IW_ENCODE_MODE		0xF000	/* Modes defined below */
+-#endif IW_ENCODE_NOKEY
++#endif
+ 
+ /****************************** TYPES ******************************/
+ 
diff --git a/net-wireless/gtkskan/gtkskan-0.2.ebuild b/net-wireless/gtkskan/gtkskan-0.2.ebuild
index 5e3c48590f4c..6280938e6d75 100644
--- a/net-wireless/gtkskan/gtkskan-0.2.ebuild
+++ b/net-wireless/gtkskan/gtkskan-0.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gtkskan/gtkskan-0.2.ebuild,v 1.7 2004/07/14 06:29:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gtkskan/gtkskan-0.2.ebuild,v 1.8 2005/09/07 03:12:20 vanquirius Exp $
 
+inherit eutils
 
 DESCRIPTION="GTK+-based ESSID scanner"
 HOMEPAGE="http://wavelan-tools.sf.net"
 SRC_URI="mirror://sourceforge/wavelan-tools/${P}.tgz"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc "
@@ -15,9 +15,12 @@ IUSE="gnome"
 DEPEND="virtual/libc
 	=sys-libs/db-1.85*
 	=x11-libs/gtk+-1.2*
-	gnome? (
-		>=gnome-base/gnome-libs-1.4
-		>=gnome-base/gnome-core-1.4 )"
+	gnome? ( =gnome-base/gnome-libs-1.4* )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc34.diff
+}
 
 src_compile() {
 	local myconf