Apply patch from upstream to fix build with gcc-4.7, bug #412371, use use-deps, bug #408635

Package-Manager: portage-2.1.10.53/cvs/Linux ia64

4 files changed, 40 insertions, 10 deletions

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/Manifest b/net-p2p/amule/Manifest
index 3189e8e7b391..32eab349a53f 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.3.1-gcc47.patch 777 RMD160 d0f6a5e3c19f84a68393551445e634b7019c2e77 SHA1 a18ffcaa5cd7d1b9196d4c230f43e644dce4c7ed SHA256 fcd1372ffefd6af9ee9ac96391d7549a2f77f62debd47bf3fc8da82a378f926e
 AUX amule-2.2.6-fallocate.diff 687 RMD160 f2dba9f74d356a4cfde95dfa7f33c7b818eabde9 SHA1 9f633a83027e9b9bf8e35389c4dafe568f954065 SHA256 a6d6755f1ecd6af4527df4826a363ed2518155021df395f08074ce0c4998ad41
 AUX amule-2.2.6-gcc45.patch 893 RMD160 31f6055550c3eca052250346ddd32a5f7d234364 SHA1 78546fe5393f56b181c29dbdc1918aab3212fc33 SHA256 6aa83a2f1533eadb75b7089cde8a51408cada9389c74e3880d3135cfddb483a1
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
@@ -10,13 +11,13 @@ AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f
 DIST aMule-2.2.6.tar.bz2 4722143 RMD160 9483eb1907803d3a6ac375c4d85a7b0cbd895daa SHA1 369bb950897c3f1f59fc1190ac7034113ac253d0 SHA256 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
 DIST aMule-2.3.1.tar.bz2 4565232 RMD160 7bc5ceea196f9ba0aa0687a694cc82354a0210fc SHA1 25bcef92b06cb34849afaf052e2cd66b4a8454c2 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
 EBUILD amule-2.2.6.ebuild 2597 RMD160 a0bf122674496f8f7b3b2943a5cf11b5f9ed9c32 SHA1 e3c1c0fb15cf40c7d44e344c57f8875ff1f46e45 SHA256 08be9938317cead4f9979be9cd6337bf0edf2c216a20ba4014a82b9cc46bf98e
-EBUILD amule-2.3.1.ebuild 2359 RMD160 6482fe42ba60c01a9ca0b1d27cced26326e94b13 SHA1 bda7e9f090f7742650e8b8561cf82027430fc0e0 SHA256 79c8c4bec324da13f8a60f595d45313b6f27e560b55b663d27e130fc6f75c516
-MISC ChangeLog 22517 RMD160 737cb260dd703e6020170f1c202138e3a7eca5dc SHA1 3aea74c0e8a4f79403ccd2886ca93ef757db7d26 SHA256 006d1efafaabcc81793412392acfe685618c8a9edfd441bf7af13bf7c6a261a6
+EBUILD amule-2.3.1.ebuild 2466 RMD160 d4355d838a6dda54b8d47a3a758d0229043a6a67 SHA1 fae5a6a264a9b0b7155a550730dfe5f5329885ed SHA256 1b3e777f8423276ee5ceaad261845a0f267ac0acb23a82c100e2826dd6fa79b5
+MISC ChangeLog 22715 RMD160 0ad1773d07469450392fe0a953af8089cb7a3bbc SHA1 74dbc32763296c6c0c77e4acaa663ecb55eccf5a SHA256 17bbefbb4f842b37f7cf2d2575f716a4e2d86347336944d7cd3d8b313887dca3
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk89OjEACgkQVWmRsqeSphPyKgCfTaKvJjv9t4L48No28EXWea3/
-jAcAniZ0v7/PxVsXORzpmudJWHkV7WZ2
-=pElX
+iEYEARECAAYFAk+URtwACgkQuQc30/atMkCZ7gCfZpLM+tD0Y90oCxRm7/rUVaNn
+vqcAoIGocjFLwCle8IdURHzTOHoHg8/c
+=ENpH
 -----END PGP SIGNATURE-----
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