Patched to compile with gcc-4.1.

(Portage version: 2.1_rc3-r2)

4 files changed, 435 insertions, 5 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 3f637c378fbd..e981a47fb491 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/kicad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.5 2006/05/27 21:20:30 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.6 2006/06/02 20:50:09 calchan Exp $
+
+  02 Jun 2006; Denis Dupeyron <calchan@gentoo.org>
+  +files/kicad-20060424-gcc41.patch, kicad-20060424.ebuild:
+  Patched to compile with gcc-4.1.
 
   27 May 2006; Denis Dupeyron <calchan@gentoo.org> kicad-20060424.ebuild:
   Fixed linking error in some rare cases. Cosmetic changes.
diff --git a/sci-electronics/kicad/files/digest-kicad-20060424 b/sci-electronics/kicad/files/digest-kicad-20060424
index ab3c8acd3d80..cf0834b54c52 100644
--- a/sci-electronics/kicad/files/digest-kicad-20060424
+++ b/sci-electronics/kicad/files/digest-kicad-20060424
@@ -1,2 +1,6 @@
 MD5 c0073b57e6420934ad8846965f967524 kicad-2006-04-24.tgz 56566245
+RMD160 3efc8be239326a38fbf7f50bede03644c38c553a kicad-2006-04-24.tgz 56566245
+SHA256 bbab5bef39e27009d99f2fce1d79c54397296c9e0b44e7e5d870a8226646b0b5 kicad-2006-04-24.tgz 56566245
 MD5 85c627149f3574e9163e33598c87f537 kicad-20060424.tar.bz2 9579336
+RMD160 e6d601ac85fdcb22fa09cef61333b06e1d18f24e kicad-20060424.tar.bz2 9579336
+SHA256 22e1118925449fe5efc9bb9938e5b49b43d834743e3a5571ed15b34317be0f35 kicad-20060424.tar.bz2 9579336
diff --git a/sci-electronics/kicad/files/kicad-20060424-gcc41.patch b/sci-electronics/kicad/files/kicad-20060424-gcc41.patch
new file mode 100644
index 000000000000..c431f0e4e015
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-20060424-gcc41.patch
@@ -0,0 +1,418 @@
+diff -urN kicad-20060424.orig/3d-viewer/3d_struct.h kicad-20060424/3d-viewer/3d_struct.h
+--- kicad-20060424.orig/3d-viewer/3d_struct.h	2006-03-03 11:03:24.000000000 +0100
++++ kicad-20060424/3d-viewer/3d_struct.h	2006-06-02 20:44:00.000000000 +0200
+@@ -21,7 +21,7 @@
+ public:

+ 	double x, y, z;

+ public:

+-	S3D_Vertex::S3D_Vertex(void);

++	S3D_Vertex(void);

+ };

+ 

+ class S3D_Material: public EDA_BaseStruct		/* openGL "material" data*/

+diff -urN kicad-20060424.orig/3d-viewer/3d_viewer.h kicad-20060424/3d-viewer/3d_viewer.h
+--- kicad-20060424.orig/3d-viewer/3d_viewer.h	2005-12-05 09:47:58.000000000 +0100
++++ kicad-20060424/3d-viewer/3d_viewer.h	2006-06-02 20:44:00.000000000 +0200
+@@ -125,7 +125,7 @@
+ 	

+ 

+ public:

+-WinEDA3D_DrawFrame::WinEDA3D_DrawFrame(WinEDA_BasePcbFrame * parent, WinEDA_App *app_parent,

++	WinEDA3D_DrawFrame(WinEDA_BasePcbFrame * parent, WinEDA_App *app_parent,

+ 	const wxString& title );

+ 

+     void Exit3DFrame(wxCommandEvent& event);

+diff -urN kicad-20060424.orig/cvpcb/makefile.gtk kicad-20060424/cvpcb/makefile.gtk
+--- kicad-20060424.orig/cvpcb/makefile.gtk	2006-06-02 20:43:04.000000000 +0200
++++ kicad-20060424/cvpcb/makefile.gtk	2006-06-02 20:44:32.000000000 +0200
+@@ -1,39 +1,39 @@
+-# File:		makefile
+-
+-# Compiler flags.
+-CC = gcc $(CFLAGS)
+-LD = gcc $(CFLAGS)
+-
+-FINAL = 1
+-
+-# Compiler flags.
+-
+-CPPFLAGS = -Wall $(shell /usr/lib/wx/config/gtk2-unicode-release-2.6 --cxxflags) -DNO_GCC_PRAGMA
+-
+-#LDFLAGS =  -s
+-
+-EDACPPFLAGS = $(CPPFLAGS)
+-
+-include ../libs.linux
+-
+-
+-TARGET = cvpcb
+-
+-all: $(TARGET)
+-
+-include makefile.include
+-
+-CPPFLAGS += $(EXTRACPPFLAGS)
+-EDACPPFLAGS = $(CPPFLAGS)
+-
+-
+-$(TARGET):	$(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LIBVIEWER3D)
+-	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBVIEWER3D)  $(LIBS_WITH_GL) -o $(TARGET)
+-
+-
++# File:		makefile

++

++# Compiler flags.

++CC = gcc $(CFLAGS)

++LD = gcc $(CFLAGS)

++

++FINAL = 1

++

++# Compiler flags.

++

++CPPFLAGS = -Wall $(shell /usr/lib/wx/config/gtk2-unicode-release-2.6 --cxxflags) -DNO_GCC_PRAGMA

++

++#LDFLAGS =  -s

++

++EDACPPFLAGS = $(CPPFLAGS)

++

++include ../libs.linux

++

++

++TARGET = cvpcb

++

++all: $(TARGET)

++

++include makefile.include

++

++CPPFLAGS += $(EXTRACPPFLAGS)

++EDACPPFLAGS = $(CPPFLAGS)

++

++

++$(TARGET):	$(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LIBVIEWER3D)

++	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBVIEWER3D)  $(LIBS_WITH_GL) -lGLU -o $(TARGET)

++

++

+ install:

+-	cp -f $(TARGET) $(KICAD_BIN)
++	cp -f $(TARGET) $(KICAD_BIN)

++

++clean:

++		-erase *.o

+ 

+-clean:
+-		-erase *.o
+-
+diff -urN kicad-20060424.orig/eeschema/libcmp.h kicad-20060424/eeschema/libcmp.h
+--- kicad-20060424.orig/eeschema/libcmp.h	2005-12-05 09:47:54.000000000 +0100
++++ kicad-20060424/eeschema/libcmp.h	2006-06-02 20:44:00.000000000 +0200
+@@ -208,7 +208,7 @@
+ 				wxPoint & pin_pos, int orient,

+ 				int TextInside, bool DrawPinNum, bool DrawPinName,

+ 				int Color, int DrawMode);

+-	void LibDrawPin::PlotPinTexts(wxPoint & pin_pos, int orient,

++	void PlotPinTexts(wxPoint & pin_pos, int orient,

+ 				int TextInside, bool DrawPinNum, bool DrawPinName);

+ };

+ 

+diff -urN kicad-20060424.orig/include/pcbstruct.h kicad-20060424/include/pcbstruct.h
+--- kicad-20060424.orig/include/pcbstruct.h	2006-01-03 12:16:44.000000000 +0100
++++ kicad-20060424/include/pcbstruct.h	2006-06-02 20:44:00.000000000 +0200
+@@ -212,7 +212,7 @@
+ 	EDGE_ZONE * m_CurrentLimitZone;	/* pointeur sur la liste des segments

+ 									de delimitation de la zone en cours de trace */

+ 

+-	BOARD::BOARD(EDA_BaseStruct * StructFather, WinEDA_BasePcbFrame * frame);

++	BOARD(EDA_BaseStruct * StructFather, WinEDA_BasePcbFrame * frame);

+ 	~BOARD(void);

+ 

+ 	/* supprime du chainage la structure Struct */

+@@ -272,8 +272,8 @@
+ 	int m_Angle;				// pour les arcs: "longueur" de l'arc en 1/10 deg

+ 

+ public:

+-	DRAWSEGMENT::DRAWSEGMENT(EDA_BaseStruct * StructFather, DrawStructureType idtype = TYPEDRAWSEGMENT);

+-	DRAWSEGMENT:: ~DRAWSEGMENT(void);

++	DRAWSEGMENT(EDA_BaseStruct * StructFather, DrawStructureType idtype = TYPEDRAWSEGMENT);

++	~DRAWSEGMENT(void);

+ 

+ 	// Read/write data

+ 	bool WriteDrawSegmentDescr(FILE * File);

+@@ -298,9 +298,9 @@
+ class EDGE_ZONE: public DRAWSEGMENT

+ {

+ public:

+-	EDGE_ZONE::EDGE_ZONE(EDA_BaseStruct * StructFather);

+-	EDGE_ZONE::EDGE_ZONE(const EDGE_ZONE & edgezone);

+-	EDGE_ZONE:: ~EDGE_ZONE(void);

++	EDGE_ZONE(EDA_BaseStruct * StructFather);

++	EDGE_ZONE(const EDGE_ZONE & edgezone);

++	~EDGE_ZONE(void);

+ };

+ 

+ 

+@@ -318,8 +318,8 @@
+ 	wxString m_Diag;				/* Associated text (comment) */

+ 

+ public:

+-	MARQUEUR::MARQUEUR(EDA_BaseStruct * StructFather);

+-	MARQUEUR::~MARQUEUR(void);

++	MARQUEUR(EDA_BaseStruct * StructFather);

++	~MARQUEUR(void);

+ 	void UnLink( void );

+ 	void Draw( WinEDA_DrawPanel * panel, wxDC * DC, int DrawMode);

+ };

+diff -urN kicad-20060424.orig/include/wxstruct.h kicad-20060424/include/wxstruct.h
+--- kicad-20060424.orig/include/wxstruct.h	2006-04-19 16:31:12.000000000 +0200
++++ kicad-20060424/include/wxstruct.h	2006-06-02 20:44:00.000000000 +0200
+@@ -416,7 +416,7 @@
+ 	// Chargement de modules

+ 	MODULE * Get_Librairie_Module(wxWindow * winaff, const wxString & library,

+ 					const wxString & ModuleName, bool show_msg_err);

+-	wxString WinEDA_BasePcbFrame::Select_1_Module_From_List(

++	wxString Select_1_Module_From_List(

+ 				wxWindow * active_window, const wxString & Library,

+ 				const wxString & Mask, const wxString &  KeyWord);

+ 	MODULE * Load_Module_From_Library(const wxString & library, wxDC * DC);

+@@ -981,8 +981,7 @@
+ 	bool EditSheet(DrawSheetStruct * Sheet, wxDC * DC);

+ private:

+ 	void StartMoveSheet(DrawSheetStruct* sheet, wxDC * DC);

+-	DrawSheetLabelStruct * WinEDA_SchematicFrame::Create_PinSheet(

+-		DrawSheetStruct * Sheet, wxDC * DC);

++	DrawSheetLabelStruct * Create_PinSheet(DrawSheetStruct * Sheet, wxDC * DC);

+ 	void Edit_PinSheet(DrawSheetLabelStruct * SheetLabel, wxDC * DC);

+ 	void StartMove_PinSheet(DrawSheetLabelStruct * SheetLabel, 	wxDC * DC);

+ 	void Place_PinSheet(DrawSheetLabelStruct * SheetLabel, wxDC * DC);

+diff -urN kicad-20060424.orig/kicad/kicad.h kicad-20060424/kicad/kicad.h
+--- kicad-20060424.orig/kicad/kicad.h	2006-03-20 13:31:36.000000000 +0100
++++ kicad-20060424/kicad/kicad.h	2006-06-02 20:44:00.000000000 +0200
+@@ -78,7 +78,7 @@
+ 	WinEDA_TreePrj * m_TreeProject;
+ 
+ public:
+-	WinEDA_PrjFrame::WinEDA_PrjFrame(WinEDA_MainFrame * parent,
++	WinEDA_PrjFrame(WinEDA_MainFrame * parent,
+ 				const wxPoint & pos, const wxSize & size );
+ 	~WinEDA_PrjFrame(void) {}
+ 	void OnSelect(wxTreeEvent & Event);
+diff -urN kicad-20060424.orig/pcbnew/autorout.h kicad-20060424/pcbnew/autorout.h
+--- kicad-20060424.orig/pcbnew/autorout.h	2006-01-11 07:57:34.000000000 +0100
++++ kicad-20060424/pcbnew/autorout.h	2006-06-02 20:44:00.000000000 +0200
+@@ -138,8 +138,8 @@
+ 	int m_MemSize;

+ 

+ public:

+-	BOARDHEAD::BOARDHEAD(void);

+-	BOARDHEAD::~BOARDHEAD(void);

++	BOARDHEAD(void);

++	~BOARDHEAD(void);

+ 	int InitBoard(void);

+ 	void UnInitBoard(void);

+ 

+diff -urN kicad-20060424.orig/pcbnew/class_cotation.h kicad-20060424/pcbnew/class_cotation.h
+--- kicad-20060424.orig/pcbnew/class_cotation.h	2006-01-03 12:16:50.000000000 +0100
++++ kicad-20060424/pcbnew/class_cotation.h	2006-06-02 20:44:00.000000000 +0200
+@@ -26,8 +26,8 @@
+ 	int FlecheG2_ox, FlecheG2_oy, FlecheG2_fx, FlecheG2_fy;

+ 

+ 	public:

+-	COTATION::COTATION(EDA_BaseStruct * StructFather);

+-	COTATION::~COTATION(void);

++	COTATION(EDA_BaseStruct * StructFather);

++	~COTATION(void);

+ 

+ 	bool ReadCotationDescr(FILE * File, int * LineNum);

+ 	bool WriteCotationDescr(FILE * File);

+diff -urN kicad-20060424.orig/pcbnew/class_equipot.h kicad-20060424/pcbnew/class_equipot.h
+--- kicad-20060424.orig/pcbnew/class_equipot.h	2005-02-02 08:45:24.000000000 +0100
++++ kicad-20060424/pcbnew/class_equipot.h	2006-06-02 20:44:00.000000000 +0200
+@@ -22,8 +22,8 @@
+ 	CHEVELU * m_RatsnestStart;	// pointeur sur debut de liste ratsnests du net

+ 	CHEVELU * m_RatsnestEnd;	// pointeur sur fin de liste ratsnests du net

+ 

+-	EQUIPOT::EQUIPOT(EDA_BaseStruct * StructFather);

+-	EQUIPOT::~EQUIPOT(void);

++	EQUIPOT(EDA_BaseStruct * StructFather);

++	~EQUIPOT(void);

+ 

+ 	/* Effacement memoire de la structure */

+ 	void UnLink( void );

+diff -urN kicad-20060424.orig/pcbnew/class_mire.h kicad-20060424/pcbnew/class_mire.h
+--- kicad-20060424.orig/pcbnew/class_mire.h	2005-06-07 09:51:48.000000000 +0200
++++ kicad-20060424/pcbnew/class_mire.h	2006-06-02 20:44:00.000000000 +0200
+@@ -17,8 +17,8 @@
+ 	int m_Size;

+ 

+ 	public:

+-	MIREPCB::MIREPCB(EDA_BaseStruct * StructFather);

+-	MIREPCB::~MIREPCB(void);

++	MIREPCB(EDA_BaseStruct * StructFather);

++	~MIREPCB(void);

+ 

+ 	bool WriteMirePcbDescr(FILE * File);

+ 	bool ReadMirePcbDescr(FILE * File, int * LineNum);

+diff -urN kicad-20060424.orig/pcbnew/class_module.h kicad-20060424/pcbnew/class_module.h
+--- kicad-20060424.orig/pcbnew/class_module.h	2005-12-14 11:18:06.000000000 +0100
++++ kicad-20060424/pcbnew/class_module.h	2006-06-02 20:44:00.000000000 +0200
+@@ -67,9 +67,9 @@
+ 	wxString m_KeyWord;		// Liste des mots cles relatifs au module

+ 

+ public:

+-	MODULE::MODULE(BOARD * parent);

+-	MODULE::MODULE(MODULE * module);

+-	MODULE::~MODULE(void);

++	MODULE(BOARD * parent);

++	MODULE(MODULE * module);

++	~MODULE(void);

+ 

+ 	void Copy(MODULE * Module);	// Copy structure

+ 	MODULE * Next(void) { return (MODULE *) Pnext; }

+diff -urN kicad-20060424.orig/pcbnew/class_pcb_text.h kicad-20060424/pcbnew/class_pcb_text.h
+--- kicad-20060424.orig/pcbnew/class_pcb_text.h	2005-06-07 09:51:48.000000000 +0200
++++ kicad-20060424/pcbnew/class_pcb_text.h	2006-06-02 20:44:00.000000000 +0200
+@@ -9,9 +9,9 @@
+ class TEXTE_PCB: public EDA_BaseStruct, public EDA_TextStruct

+ {

+ public:

+-	TEXTE_PCB::TEXTE_PCB(EDA_BaseStruct * parent);

+-	TEXTE_PCB::TEXTE_PCB(TEXTE_PCB * textepcb);

+-	TEXTE_PCB::~TEXTE_PCB(void);

++	TEXTE_PCB(EDA_BaseStruct * parent);

++	TEXTE_PCB(TEXTE_PCB * textepcb);

++	~TEXTE_PCB(void);

+ 

+ 	/* supprime du chainage la structure Struct */

+ 	void UnLink( void );

+diff -urN kicad-20060424.orig/pcbnew/class_text_mod.h kicad-20060424/pcbnew/class_text_mod.h
+--- kicad-20060424.orig/pcbnew/class_text_mod.h	2005-12-05 09:47:58.000000000 +0100
++++ kicad-20060424/pcbnew/class_text_mod.h	2006-06-02 20:44:00.000000000 +0200
+@@ -24,8 +24,8 @@
+ 	wxString m_Text;

+ 

+ 	public:

+-	TEXTE_MODULE::TEXTE_MODULE(MODULE * parent, int text_type = TEXT_is_DIVERS );

+-	TEXTE_MODULE::~TEXTE_MODULE(void);

++	TEXTE_MODULE(MODULE * parent, int text_type = TEXT_is_DIVERS );

++	~TEXTE_MODULE(void);

+ 

+ 	/* supprime du chainage la structure Struct */

+ 	void UnLink( void );

+diff -urN kicad-20060424.orig/pcbnew/class_track.h kicad-20060424/pcbnew/class_track.h
+--- kicad-20060424.orig/pcbnew/class_track.h	2006-01-27 16:55:04.000000000 +0100
++++ kicad-20060424/pcbnew/class_track.h	2006-06-02 20:44:00.000000000 +0200
+@@ -32,8 +32,8 @@
+ 	int m_Param;					// Auxiliary variable ( used in some computations )

+ 

+ public:

+-	TRACK::TRACK(EDA_BaseStruct * StructFather, DrawStructureType idtype = TYPETRACK);

+-	TRACK::TRACK(const TRACK & track);

++	TRACK(EDA_BaseStruct * StructFather, DrawStructureType idtype = TYPETRACK);

++	TRACK(const TRACK & track);

+ 

+ 	TRACK * Next(void);	// Retourne le chainage avant

+ 	TRACK * Back(void)	// Retourne le chainage avant

+@@ -76,13 +76,13 @@
+ class SEGZONE: public TRACK

+ {

+ public:

+-	SEGZONE::SEGZONE(EDA_BaseStruct * StructFather);

++	SEGZONE(EDA_BaseStruct * StructFather);

+ };

+ 

+ class SEGVIA: public TRACK

+ {

+ public:

+-	SEGVIA::SEGVIA(EDA_BaseStruct * StructFather);

++	SEGVIA(EDA_BaseStruct * StructFather);

+ 	bool IsViaOnLayer(int layer);

+ 	void SetLayerPair(int top_layer, int bottom_layer);

+ 	void ReturnLayerPair(int * top_layer, int * bottom_layer);

+diff -urN kicad-20060424.orig/pcbnew/makefile.gtk kicad-20060424/pcbnew/makefile.gtk
+--- kicad-20060424.orig/pcbnew/makefile.gtk	2006-06-02 20:43:04.000000000 +0200
++++ kicad-20060424/pcbnew/makefile.gtk	2006-06-02 20:45:06.000000000 +0200
+@@ -1,38 +1,38 @@
+-## Makefile for PCBNEW et wxGTK
+-CC = gcc $(CFLAGS)
+-LD = gcc $(CFLAGS)
+-
+-# Compiler flags.
+-
+-CPPFLAGS = -Wall $(shell /usr/lib/wx/config/gtk2-unicode-release-2.6 --cxxflags) -DNO_GCC_PRAGMA
+-
+-#LDFLAGS = -s
+-
+-include ../libs.linux
+-
+-TARGET = pcbnew
+-
+-all: $(TARGET)
+-
+-include makefile.include
+-
+-CPPFLAGS += $(EXTRACPPFLAGS)
+-EDACPPFLAGS = $(CPPFLAGS)
+-
+-
+-
+-$(TARGET): $(OBJECTS) makefile.gtk  makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux
+-		$(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\
++## Makefile for PCBNEW et wxGTK

++CC = gcc $(CFLAGS)

++LD = gcc $(CFLAGS)

++

++# Compiler flags.

++

++CPPFLAGS = -Wall $(shell /usr/lib/wx/config/gtk2-unicode-release-2.6 --cxxflags) -DNO_GCC_PRAGMA

++

++#LDFLAGS = -s

++

++include ../libs.linux

++

++TARGET = pcbnew

++

++all: $(TARGET)

++

++include makefile.include

++

++CPPFLAGS += $(EXTRACPPFLAGS)

++EDACPPFLAGS = $(CPPFLAGS)

++

++

++

++$(TARGET): $(OBJECTS) makefile.gtk  makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux

++		$(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -lGLU \

+ 		-o $(TARGET)

+ 		

+ 		

+-install:
+-		cp $(TARGET) $(KICAD_BIN)
+-
+-
+-clean:
+-		-erase *.o
+-		-erase *.map
+-
+-
+-
++install:

++		cp $(TARGET) $(KICAD_BIN)

++

++

++clean:

++		-erase *.o

++		-erase *.map

++

++

++

+diff -urN kicad-20060424.orig/pcbnew/track.cpp kicad-20060424/pcbnew/track.cpp
+--- kicad-20060424.orig/pcbnew/track.cpp	2006-04-19 16:31:18.000000000 +0200
++++ kicad-20060424/pcbnew/track.cpp	2006-06-02 20:44:00.000000000 +0200
+@@ -17,7 +17,7 @@
+ 	TRACK * RefTrack;

+ 

+ public:

+-	TSTSEGM::TSTSEGM(TRACK * Father)

++	TSTSEGM(TRACK * Father)

+ 		{

+ 		Pback = Pnext = NULL;

+ 		RefTrack = Father;

diff --git a/sci-electronics/kicad/kicad-20060424.ebuild b/sci-electronics/kicad/kicad-20060424.ebuild
index 8a37971992b2..c736fd22a47c 100644
--- a/sci-electronics/kicad/kicad-20060424.ebuild
+++ b/sci-electronics/kicad/kicad-20060424.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/sci-electronics/kicad/kicad-20060424.ebuild,v 1.2 2006/05/27 21:20:30 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20060424.ebuild,v 1.3 2006/06/02 20:50:09 calchan Exp $
 
 inherit eutils wxwidgets
 
@@ -33,16 +33,20 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
+	cd ${S}
 
 	sed -i \
 		-e "s:\`wx-config:\$(shell wx-config:" \
 		-e "s:flags\`:flags) -DNO_GCC_PRAGMA:" \
-		${S}/*/makefile.* \
+		*/makefile.* \
 		|| die "sed failed"
 
 	# Use the chosen wx-config executable
-	sed -i -e "s:wx-config:${WX_CONFIG}:" ${S}/libs.* || die "sed failed"
-	sed -i -e "s:wx-config:${WX_CONFIG}:" ${S}/*/makefile.* || die "sed failed"
+	sed -i -e "s:wx-config:${WX_CONFIG}:" libs.* || die "sed failed"
+	sed -i -e "s:wx-config:${WX_CONFIG}:" */makefile.* || die "sed failed"
+
+	# Patch to compile with gcc-4.1
+	epatch ${FILESDIR}/${P}-gcc41.patch || die "epatch failed"
 }
 
 src_compile() {