Fix gcc-4.3 build failure, bug #255783, fix gcc-4.4 build failure, bug #253143

(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r2 ia64)

9 files changed, 49 insertions, 512 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 719b2fe6e314..b98b320058b7 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.127 2009/01/11 19:12:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.128 2009/01/24 18:36:48 armin76 Exp $
+
+  24 Jan 2009; Raúl Porcel <armin76@gentoo.org> -files/2.1.3-wx-2.8.patch,
+  +files/gcc-4.3.patch, +files/gcc-4.4.patch, -amule-2.1.3.ebuild,
+  -amule-2.1.3-r1.ebuild, -amule-2.2.0_pre20080304.ebuild,
+  amule-2.2.2.ebuild, amule-2.2.3.ebuild:
+  Fix gcc-4.3 build failure, bug #255783, fix gcc-4.4 build failure, bug
+  #253143
 
   11 Jan 2009; Markus Meier <maekke@gentoo.org> amule-2.2.2.ebuild:
   amd64 stable, bug #239533
diff --git a/net-p2p/amule/amule-2.1.3-r1.ebuild b/net-p2p/amule/amule-2.1.3-r1.ebuild
deleted file mode 100644
index 9639e357763e..000000000000
--- a/net-p2p/amule/amule-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3-r1.ebuild,v 1.6 2008/03/13 00:10:00 ranger Exp $
-
-inherit eutils flag-o-matic wxwidgets
-
-MY_P=${PN/m/M}-${PV}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip gtk nls remote stats unicode"
-
-DEPEND="=x11-libs/wxGTK-2.8*
-		>=sys-libs/zlib-1.2.1
-		stats? ( >=media-libs/gd-2.0.26 )
-		geoip? ( dev-libs/geoip )
-		remote? ( >=media-libs/libpng-1.2.0
-		unicode? ( >=media-libs/gd-2.0.26 ) )"
-
-pkg_setup() {
-		if ! use gtk && ! use remote && ! use daemon; then
-				eerror ""
-				eerror "You have to specify at least one of gtk, remote or daemon"
-				eerror "USE flag to build amule."
-				eerror ""
-				die "Invalid USE flag set"
-		fi
-
-		if use stats && ! use gtk; then
-				einfo "Note: You would need both the gtk and stats USE flags"
-				einfo "to compile aMule Statistics GUI."
-				einfo "I will now compile console versions only."
-		fi
-
-		if use stats && ! built_with_use media-libs/gd jpeg; then
-				die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set"
-		fi
-}
-
-pkg_preinst() {
-	if use daemon || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Make it compile against wx-2.8 since upstream won't support 2.6
-	epatch "${FILESDIR}"/${PV}-wx-2.8.patch
-}
-
-src_compile() {
-		local myconf
-
-		WX_GTK_VER="2.8"
-
-		if use gtk; then
-				einfo "wxGTK with gtk support will be used"
-				need-wxwidgets unicode
-		else
-				einfo "wxGTK without X support will be used"
-				need-wxwidgets base
-		fi
-
-		if use gtk ; then
-				use stats && myconf="${myconf}
-					--enable-wxcas
-					--enable-alc"
-				use remote && myconf="${myconf}
-					--enable-amule-gui"
-		else
-				myconf="
-					--disable-monolithic
-					--disable-amule-gui
-					--disable-wxcas
-					--disable-alc"
-		fi
-
-		econf \
-				--with-wx-config=${WX_CONFIG} \
-				--with-wxbase-config=${WX_CONFIG} \
-				--enable-amulecmd \
-				$(use_enable debug) \
-				$(use_enable !debug optimize) \
-				$(use_enable daemon amule-daemon) \
-				$(use_enable geoip) \
-				$(use_enable nls) \
-				$(use_enable remote webserver) \
-				$(use_enable stats cas) \
-				$(use_enable stats alcc) \
-				${myconf} || die
-
-		# we filter ssp until bug #74457 is closed to build on hardened
-		filter-flags -fstack-protector -fstack-protector-all
-
-		emake -j1 || die
-}
-
-src_install() {
-		emake DESTDIR="${D}" install || die
-
-		if use daemon; then
-				newconfd "${FILESDIR}"/amuled.confd amuled
-				newinitd "${FILESDIR}"/amuled.initd amuled
-		fi
-
-		if use remote; then
-				newconfd "${FILESDIR}"/amuleweb.confd amuleweb
-				newinitd "${FILESDIR}"/amuleweb.initd amuleweb
-				make_desktop_entry amulegui "aMule Remote" amule "Network;P2P"
-		fi
-}
diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild
deleted file mode 100644
index ef8af9d29a8d..000000000000
--- a/net-p2p/amule/amule-2.1.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.16 2008/01/15 13:43:48 armin76 Exp $
-
-inherit eutils flag-o-matic wxwidgets
-
-MY_P=${P/m/M}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="daemon debug gtk nls remote stats unicode"
-
-DEPEND="=x11-libs/wxGTK-2.6*
-		>=sys-libs/zlib-1.2.1
-		stats? ( >=media-libs/gd-2.0.26 )
-		remote? ( >=media-libs/libpng-1.2.0
-			unicode? ( >=media-libs/gd-2.0.26 ) )"
-
-pkg_setup() {
-		if ! use gtk && ! use remote && ! use daemon; then
-				eerror ""
-				eerror "You have to specify at least one of gtk, remote or daemon"
-				eerror "USE flag to build amule."
-				eerror ""
-				die "Invalid USE flag set"
-		fi
-
-		if use stats && ! use gtk; then
-				einfo "Note: You would need both the gtk and stats USE flags"
-				einfo "to compile aMule Statistics GUI."
-				einfo "I will now compile console versions only."
-		fi
-
-		if use stats && ! built_with_use media-libs/gd jpeg; then
-				die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set"
-		fi
-}
-
-pkg_preinst() {
-	if use daemon || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_compile() {
-		local myconf
-
-		WX_GTK_VER="2.6"
-
-		if use unicode && use gtk; then
-				einfo "wxGTK with gtk2 and unicode support will be used"
-				need-wxwidgets unicode
-		elif use gtk; then
-				einfo "wxGTK with gtk2 support will be used"
-				need-wxwidgets gtk2
-		elif use unicode; then
-				einfo "wxGTK with unicode and without X support will be used"
-				need-wxwidgets base-unicode
-		else
-				einfo "wxGTK without X support will be used"
-				need-wxwidgets base
-		fi
-
-		if use gtk ; then
-				use stats && myconf="${myconf}
-					--enable-wxcas
-					--enable-alc"
-				use remote && myconf="${myconf}
-					--enable-amule-gui"
-		else
-				myconf="
-					--disable-monolithic
-					--disable-amule-gui
-					--disable-wxcas
-					--disable-alc"
-		fi
-
-		econf \
-				--with-wx-config=${WX_CONFIG} \
-				--with-wxbase-config=${WX_CONFIG} \
-				--enable-amulecmd \
-				$(use_enable debug) \
-				$(use_enable !debug optimize) \
-				$(use_enable daemon amule-daemon) \
-				$(use_enable nls) \
-				$(use_enable remote webserver) \
-				$(use_enable stats cas) \
-				$(use_enable stats alcc) \
-				${myconf} || die
-
-		# we filter ssp until bug #74457 is closed to build on hardened
-		filter-flags -fstack-protector -fstack-protector-all
-
-		emake -j1 || die
-}
-
-src_install() {
-		emake DESTDIR="${D}" install || die
-
-		if use daemon; then
-				newconfd "${FILESDIR}"/amuled.confd amuled
-				newinitd "${FILESDIR}"/amuled.initd amuled
-		fi
-
-		if use remote; then
-				newconfd "${FILESDIR}"/amuleweb.confd amuleweb
-				newinitd "${FILESDIR}"/amuleweb.initd amuleweb
-		fi
-}
diff --git a/net-p2p/amule/amule-2.2.0_pre20080304.ebuild b/net-p2p/amule/amule-2.2.0_pre20080304.ebuild
deleted file mode 100644
index 19f0c95b227e..000000000000
--- a/net-p2p/amule/amule-2.2.0_pre20080304.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080304.ebuild,v 1.7 2008/06/13 10:23:07 armin76 Exp $
-
-inherit eutils flag-o-matic wxwidgets autotools
-
-MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/}
-S="${WORKDIR}/${PN}-cvs"
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip gtk nls remote stats unicode upnp"
-
-DEPEND="=x11-libs/wxGTK-2.8*
-		>=dev-libs/crypto++-5.5.2
-		>=sys-libs/zlib-1.2.1
-		stats? ( >=media-libs/gd-2.0.26 )
-		geoip? ( dev-libs/geoip )
-		upnp? ( net-libs/libupnp )
-		remote? ( >=media-libs/libpng-1.2.0
-		unicode? ( >=media-libs/gd-2.0.26 ) )"
-
-pkg_setup() {
-		if ! use gtk && ! use remote && ! use daemon; then
-				eerror ""
-				eerror "You have to specify at least one of gtk, remote or daemon"
-				eerror "USE flag to build amule."
-				eerror ""
-				die "Invalid USE flag set"
-		fi
-
-		if use stats && ! use gtk; then
-				einfo "Note: You would need both the gtk and stats USE flags"
-				einfo "to compile aMule Statistics GUI."
-				einfo "I will now compile console versions only."
-		fi
-
-		if use stats && ! built_with_use media-libs/gd jpeg; then
-				die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set"
-		fi
-}
-
-pkg_preinst() {
-	if use daemon || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_compile() {
-		local myconf
-
-		WX_GTK_VER="2.8"
-
-		if use gtk; then
-				einfo "wxGTK with gtk support will be used"
-				need-wxwidgets unicode
-		else
-				einfo "wxGTK without X support will be used"
-				need-wxwidgets base
-		fi
-
-		if use gtk ; then
-				use stats && myconf="${myconf}
-					--enable-wxcas
-					--enable-alc"
-				use remote && myconf="${myconf}
-					--enable-amule-gui"
-		else
-				myconf="
-					--disable-monolithic
-					--disable-amule-gui
-					--disable-wxcas
-					--disable-alc"
-		fi
-
-		econf \
-				--with-wx-config=${WX_CONFIG} \
-				--with-wxbase-config=${WX_CONFIG} \
-				--enable-amulecmd \
-				$(use_enable debug) \
-				$(use_enable !debug optimize) \
-				$(use_enable daemon amule-daemon) \
-				$(use_enable geoip) \
-				$(use_enable nls) \
-				$(use_enable remote webserver) \
-				$(use_enable stats cas) \
-				$(use_enable stats alcc) \
-				${myconf} || die
-
-		# we filter ssp until bug #74457 is closed to build on hardened
-		filter-flags -fstack-protector -fstack-protector-all
-
-		emake -j1 || die
-}
-
-src_install() {
-		emake DESTDIR="${D}" install || die
-
-		if use daemon; then
-				newconfd "${FILESDIR}"/amuled.confd amuled
-				newinitd "${FILESDIR}"/amuled.initd amuled
-		fi
-
-		if use remote; then
-				newconfd "${FILESDIR}"/amuleweb.confd amuleweb
-				newinitd "${FILESDIR}"/amuleweb.initd amuleweb
-				make_desktop_entry amulegui "aMule Remote" amule "Network;P2P"
-		fi
-}
diff --git a/net-p2p/amule/amule-2.2.2.ebuild b/net-p2p/amule/amule-2.2.2.ebuild
index e5e4036c00ec..8e3047111c2e 100644
--- a/net-p2p/amule/amule-2.2.2.ebuild
+++ b/net-p2p/amule/amule-2.2.2.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/net-p2p/amule/amule-2.2.2.ebuild,v 1.7 2009/01/11 19:12:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.2.ebuild,v 1.8 2009/01/24 18:36:48 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -52,6 +52,14 @@ pkg_preinst() {
 	fi
 }
 
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/gcc-4.3.patch
+	epatch "${FILESDIR}"/gcc-4.4.patch
+}
+
 src_compile() {
 		local myconf
 
diff --git a/net-p2p/amule/amule-2.2.3.ebuild b/net-p2p/amule/amule-2.2.3.ebuild
index 2ea9ac5acee8..6fb7a67ccb51 100644
--- a/net-p2p/amule/amule-2.2.3.ebuild
+++ b/net-p2p/amule/amule-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.3.ebuild,v 1.1 2008/12/30 11:43:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.3.ebuild,v 1.2 2009/01/24 18:36:48 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -52,6 +52,14 @@ pkg_preinst() {
 	fi
 }
 
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/gcc-4.3.patch
+	epatch "${FILESDIR}"/gcc-4.4.patch
+}
+
 src_compile() {
 		local myconf
 
diff --git a/net-p2p/amule/files/2.1.3-wx-2.8.patch b/net-p2p/amule/files/2.1.3-wx-2.8.patch
deleted file mode 100644
index 8148d35dd726..000000000000
--- a/net-p2p/amule/files/2.1.3-wx-2.8.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
---- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp	2005-12-16 13:09:29.000000000 +0100
-+++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp	2006-12-17 20:20:47.151203000 +0100
-@@ -297,7 +297,7 @@
- 	m_validateButton =
- 	    new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
- 	m_cancelButton =
--	    new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
-+	    new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
- 
- 	m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
- 	m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
-@@ -321,7 +321,6 @@
- EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
- EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
- EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
--EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel )       	// Defined in wxDialog
- EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
- EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
- END_EVENT_TABLE ()
---- aMule/src/utils/wxCas/src/wxcasprefs.h.org	2006-12-17 22:17:39.017417250 +0100
-+++ aMule/src/utils/wxCas/src/wxcasprefs.h	2006-12-17 22:18:17.611829250 +0100
-@@ -101,8 +101,7 @@
- 	    ID_AUTOSTATIMG_COMBO,
- 	    ID_AUTOSTATIMG_BROWSE_BUTTON,
- 	    ID_FTP_UPDATE_CHECK,
--	    ID_VALIDATE_BUTTON,
--	    ID_CANCEL_BUTTON
-+	    ID_VALIDATE_BUTTON
- 	};
- 
- protected:
---- aMule/src/MuleGifCtrl.cpp	2006-02-03 20:14:05.000000000 +0100
-+++ aMule/src/MuleGifCtrl.cpp	2006-11-19 19:35:33.000000000 +0100
-@@ -24,7 +24,6 @@
- 
- #include <wx/mstream.h>
- #include <wx/gifdecod.h>
--#include <wx/window.h>
- #include <wx/dcbuffer.h>
- 
- #include "MuleGifCtrl.h"
-@@ -35,6 +34,50 @@
- 	EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
- END_EVENT_TABLE()
- 
-+#if wxCHECK_VERSION(2, 7, 1)
-+// Wrapper that emulates old wxGIFDecoder API
-+
-+class MuleGIFDecoder : public wxGIFDecoder {
-+public:
-+	MuleGIFDecoder(wxInputStream* stream, bool dummy) {
-+		m_stream = stream;
-+		dummy = dummy; // Unused.
-+		m_nframe = 0;
-+	}
-+	
-+	~MuleGIFDecoder() { /* don't delete the stream! */ }
-+	
-+	wxGIFErrorCode ReadGIF() {
-+		return LoadGIF(*m_stream);
-+	}
-+	
-+	void GoFirstFrame() { m_nframe = 0; }
-+	void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
-+	void GoLastFrame() { m_nframe = GetFrameCount(); }
-+	
-+	void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
-+	
-+	size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
-+	size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
-+	
-+	size_t	GetLeft() { return 0; }
-+	size_t	GetTop() { return 0; }
-+	
-+	long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
-+	
-+private:
-+	uint32_t m_nframe;
-+	wxInputStream* m_stream;
-+};
-+
-+#else
-+class MuleGIFDecoder : public wxGIFDecoder {
-+public:
-+	MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
-+};
-+#endif
-+
-+
- 
- MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
-                           const wxSize& size, long style, const wxValidator& validator,
-@@ -66,7 +109,7 @@
- 	}
- 
-   	wxMemoryInputStream stream(data, size);
--  	m_decoder = new wxGIFDecoder(&stream, TRUE);
-+  	m_decoder = new MuleGIFDecoder(&stream, TRUE);
-   	if ( m_decoder->ReadGIF() != wxGIF_OK ) {
-    		delete m_decoder;
-    		m_decoder = NULL;
-@@ -137,3 +180,4 @@
- 	dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
- }
- 
-+// File_checked_for_headers
---- aMule/src/MuleGifCtrl.h	2006-01-01 06:17:25.000000000 +0100
-+++ aMule/src/MuleGifCtrl.h	2006-11-18 05:01:22.000000000 +0100
-@@ -27,11 +27,10 @@
- 
- #include <wx/control.h>
- #include <wx/timer.h>
--#include <wx/bitmap.h>
- 
- const int GIFTIMERID = 271283;
- 
--class wxGIFDecoder;
-+class MuleGIFDecoder;
- class wxBitmap;
- 
- /**
-@@ -121,7 +120,7 @@
- 	void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
- 
- 	//! A pointer to the current gif-animation.
--	wxGIFDecoder*	m_decoder;
-+	MuleGIFDecoder*	m_decoder;
- 	//! Timer used for the delay between each frame.
- 	wxTimer			m_timer;
- 	//! Current frame.
-@@ -133,3 +132,4 @@
- 
- #endif
- 
-+// File_checked_for_headers
---- aMule-2.1.3/src/MuleTextCtrl.cpp~	2006-12-17 20:55:37.157820250 +0100
-+++ aMule-2.1.3/src/MuleTextCtrl.cpp	2006-12-17 20:56:21.328580750 +0100
-@@ -26,6 +26,7 @@
- #include <wx/menu.h>
- #include <wx/intl.h>
- #include <wx/clipbrd.h>
-+#include <wx/dataobj.h>
- 
- /**
-  * These are the IDs used to identify the different menu-items.
---- amule/src/amule.cpp~	2006-12-17 21:53:26.474639000 +0100
-+++ amule/src/amule.cpp	2006-12-17 21:55:40.307003000 +0100
-@@ -96,6 +96,7 @@
- 		#include <CoreFoundation/CFBundle.h>
- 		#include <wx/mac/corefoundation/cfstring.h>
- 	#endif
-+	#include <wx/msgdlg.h>
- #endif
- 
- 
diff --git a/net-p2p/amule/files/gcc-4.3.patch b/net-p2p/amule/files/gcc-4.3.patch
new file mode 100644
index 000000000000..900279499992
--- /dev/null
+++ b/net-p2p/amule/files/gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- src/libs/common/MuleDebug.h	2008-03-29 16:10:03.000000000 +0000
++++ src/libs/common/MuleDebug.h	2009-01-21 16:36:08.325800564 +0000
+@@ -27,6 +27,7 @@
+ #define MULEDEBUG_H
+ 
+ #include <wx/string.h>
++#include <ctype.h>
+ 
+ /**
+  * Installs an exception handler that can handle CMuleExceptions.
diff --git a/net-p2p/amule/files/gcc-4.4.patch b/net-p2p/amule/files/gcc-4.4.patch
new file mode 100644
index 000000000000..d17d4e1628e4
--- /dev/null
+++ b/net-p2p/amule/files/gcc-4.4.patch
@@ -0,0 +1,12 @@
+--- src/libs/common/Format.cpp~	2008-12-30 09:54:28.079005001 -0500
++++ src/libs/common/Format.cpp	2008-12-30 09:56:35.438006398 -0500
+@@ -23,7 +23,7 @@
+ //
+ 
+ #include "Format.h"
+-
++#include <stdint.h>
+ 
+ //! Known type-modifiers. 
+ enum Modifiers
+