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

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r2 ia64

10 files changed, 54 insertions, 531 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/Manifest b/net-p2p/amule/Manifest
index 84558ae3c78a..7929e14f9830 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 2.1.3-wx-2.8.patch 4943 RMD160 38b154b4755db86cc00c5f46d36ee30f26014cac SHA1 bd048f7b88ff4c19841f606d03c5a9750e6e6945 SHA256 c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a
 AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f
 AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f7830950db758c1d961e1edb51e8b067cfb50c SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1
-DIST aMule-2.1.3.tar.bz2 3248530 RMD160 fcc345000e5ad0a221d1e96d0d514f3be36428c3 SHA1 dd47deb38e7a5b823550b85150f5a814c597b273 SHA256 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
+AUX gcc-4.3.patch 295 RMD160 35b9e3ea142b8397c55dc8fdb1e211133795af3c SHA1 3ce00cc3a22bf7ebeb84201e4ea90bff3ef4623d SHA256 328c44b4e21a46c8aa91b89e5bf762831979af952f5ee8caa94f54094c55db19
+AUX gcc-4.4.patch 250 RMD160 8c22b77f97ee22947f530a153cbfc394ab13b3fc SHA1 0c5658bb98f9e90068db6fc58f44a69a48d95e25 SHA256 f17da6498d69b4339594674dcf3090a0d615d265613d586e364874be57fe80eb
 DIST aMule-2.2.2.tar.bz2 4669549 RMD160 544e36feeab9ee4c6b4e07502b716565cc6a44a3 SHA1 d8214597c370ef74f695962905d3034307961370 SHA256 1b969dd9c2c65bdd5dc5ec67cd623291d0d072b18a68d7e893cae117e61e377b
 DIST aMule-2.2.3.tar.bz2 4666001 RMD160 695bd2ce932c1bf3c3b5a89a554da75aeddb21ec SHA1 3e74ec481475b2c8b0decf1c01bfb7e94999d6a6 SHA256 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
-DIST aMule-CVS-20080304.tar.bz2 4027066 RMD160 b937956d6bc16a825e9a4c4533c3c7d3f0c2d163 SHA1 75a40c8fa0f6087477ac21113a5fbf93293c8a55 SHA256 a8db3a4a5969741056b2ba1fd04aec9b34b0da8f9934b27bfd46d9d74fe2b875
-EBUILD amule-2.1.3-r1.ebuild 3055 RMD160 a8b3effdc140b8293219808f603d4166a165510d SHA1 ecf37cc6e80b0ea84de955b78c8053be1621e38c SHA256 0b160f0d2b3515a1b9b5021130d19c53b2a319fbe3837ac43e9182b56c925f5e
-EBUILD amule-2.1.3.ebuild 3013 RMD160 0435e512f6b69ae8e47cf697fa26e0101553ad9f SHA1 421e60db1e7e7041df32437b00ae8b1c4a84cc16 SHA256 e680653b5c7925ae07d8f3282927f9f97831db5a081b8eb1445a4efccd7158ef
-EBUILD amule-2.2.0_pre20080304.ebuild 3009 RMD160 ef6948614d8cff4bb54688945ea7cbe397b68f63 SHA1 aad79a6430947dde41f1ef6a10d753c4f267fb0c SHA256 231d83718b865e149e5dfded6d9a95a70792d95c26166a6ebc8f4cda522c191e
-EBUILD amule-2.2.2.ebuild 2903 RMD160 e4f15f9824ac93db4291d687559931934fbc126f SHA1 d8a42a17376c196d1058f1d9856f4d8f815a584c SHA256 26498ec4fcf75a52775847dfa3296426e06712953ecba32fb455137cc6de400d
-EBUILD amule-2.2.3.ebuild 2910 RMD160 09560fcd64d91f4eb7457aafb720487e09e88a47 SHA1 ff9004cf243841fb50f53ed5e5b3819f259b046f SHA256 eebe24aa0070ca0d7324d2aecace4cac98ad81c62ae7c1a0974ad1ab67dfff51
-MISC ChangeLog 18497 RMD160 364d77dfb487a8c8dcf06e779dfe198defeb2112 SHA1 65f7a67aafe5116c815fec2428275d361f207e30 SHA256 9fd3606f94759c856b79f08b64e675c11f5fa366032f922bca0e70160cb7c216
+EBUILD amule-2.2.2.ebuild 3020 RMD160 21cc6bbbe604abc8905a1b7077a4d1e303a13492 SHA1 a0ec8dfafa49a3eb92b0ac0e9d37d37b3dd3ba6d SHA256 c58068da4488065596f4a5855b1e8827bd528461df70cb2af1705fb615a6fac5
+EBUILD amule-2.2.3.ebuild 3026 RMD160 ca935342760f34ad9ca77c6a379e704602ae931c SHA1 4d56ebf26eeea970c04f4ac6dc3e42c355d6bdb7 SHA256 8715cfca50ba2dacacea70e5569939fddd0a724d4737085701693ac553759de3
+MISC ChangeLog 18826 RMD160 0109ee3bf1b0e2f1889dc0a81ab2f1dc2691790d SHA1 bc3bd833b8108087c0a4f04835fe7b8f2213fa48 SHA256 baa8305ad6a3704bb6cb2ef2b8e9a48e58cdd592eff94c972958e7e6f9bbf874
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklqRMEACgkQkKaRLQcq0GKrKgCfe3UPQfX79rPea27Et5RMWdwK
-2lwAn1vFuDPdgrNQmaqZxZwYCQeb8LD0
-=VRHx
------END PGP SIGNATURE-----
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
+