From f11e3d6753230239e90bf69ca857d86e4b593f0f Mon Sep 17 00:00:00 2001
From: Raúl Porcel <armin76@gentoo.org>
Date: Sun, 22 Apr 2012 17:58:47 +0000
Subject: Apply patch from upstream to fix build with gcc-4.7, bug #412371, use
 use-deps, bug #408635

(Portage version: 2.1.10.53/cvs/Linux ia64)
---
 net-p2p/amule/ChangeLog               |  7 ++++++-
 net-p2p/amule/amule-2.3.1.ebuild      | 11 +++++++----
 net-p2p/amule/files/2.3.1-gcc47.patch | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 net-p2p/amule/files/2.3.1-gcc47.patch

(limited to 'net-p2p/amule')

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 0695d924a02b..d4b8955e9452 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/amule
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.160 2012/02/16 17:17:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.161 2012/04/22 17:58:46 armin76 Exp $
+
+  22 Apr 2012; Raúl Porcel <armin76@gentoo.org> +files/2.3.1-gcc47.patch,
+  amule-2.3.1.ebuild:
+  Apply patch from upstream to fix build with gcc-4.7, bug #412371, use
+  use-deps, bug #408635
 
   16 Feb 2012; Jeroen Roovers <jer@gentoo.org> amule-2.2.6.ebuild,
   amule-2.3.1.ebuild:
diff --git a/net-p2p/amule/amule-2.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
index 17060abfb1df..675423eca8e8 100644
--- a/net-p2p/amule/amule-2.3.1.ebuild
+++ b/net-p2p/amule/amule-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.3 2012/02/16 17:17:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.4 2012/04/22 17:58:46 armin76 Exp $
 
 EAPI="2"
 
@@ -18,14 +18,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="daemon debug geoip nls remote stats unicode upnp +X"
 
-DEPEND=">=x11-libs/wxGTK-2.8.12
-	>=dev-libs/crypto++-5
+DEPEND=">=dev-libs/crypto++-5
 	>=sys-libs/zlib-1.2.1
 	stats? ( >=media-libs/gd-2.0.26[jpeg] )
 	geoip? ( dev-libs/geoip )
 	upnp? ( >=net-libs/libupnp-1.6.6 )
 	remote? ( >=media-libs/libpng-1.2.0
-	unicode? ( >=media-libs/gd-2.0.26 ) )"
+	unicode? ( >=media-libs/gd-2.0.26 ) )
+	X? ( >=x11-libs/wxGTK-2.8.12[X] )
+	!X? ( >=x11-libs/wxGTK-2.8.12 )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -45,6 +46,8 @@ pkg_preinst() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.2.6-fallocate.diff
+	# Bug 412371
+	epatch "${FILESDIR}"/${PN}-2.3.1-gcc47.patch
 }
 
 src_configure() {
diff --git a/net-p2p/amule/files/2.3.1-gcc47.patch b/net-p2p/amule/files/2.3.1-gcc47.patch
new file mode 100644
index 000000000000..e776dda3240e
--- /dev/null
+++ b/net-p2p/amule/files/2.3.1-gcc47.patch
@@ -0,0 +1,21 @@
+# http://code.google.com/p/amule/source/detail?r=10772
+diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
+--- aMule-2.3.1.orig//src/ObservableQueue.h	2012-04-22 19:40:05.560084120 +0200
++++ aMule-2.3.1/src/ObservableQueue.h	2012-04-22 19:40:32.479085322 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
\ No newline at end of file
-- 
cgit v1.2.3-65-gdbad