Add patch to fix compilation with gcc-4.1 by Jan Jitse Venselaar <janjitse AT a-eskwadraat DOT nl>; bug #119579

Package-Manager: portage-2.1_pre4-r1

5 files changed, 77 insertions, 13 deletions

diff --git a/net-p2p/valknut/ChangeLog b/net-p2p/valknut/ChangeLog
index 8dbb7e544890..be30ac0543ef 100644
--- a/net-p2p/valknut/ChangeLog
+++ b/net-p2p/valknut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/valknut
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/valknut/ChangeLog,v 1.23 2005/10/04 20:15:21 killerfox Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/valknut/ChangeLog,v 1.24 2006/02/26 05:37:06 halcy0n Exp $
+
+  26 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/valknut-0.3.7-gcc41.patch, valknut-0.3.7.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Jan Jitse Venselaar <janjitse
+  AT a-eskwadraat DOT nl>; bug #119579
 
   04 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> valknut-0.3.5.ebuild:
   Stable on hppa. See bug #88544.
diff --git a/net-p2p/valknut/Manifest b/net-p2p/valknut/Manifest
index 11beb21a4573..fbacdb8c6056 100644
--- a/net-p2p/valknut/Manifest
+++ b/net-p2p/valknut/Manifest
@@ -1,14 +1,55 @@
-MD5 f7d052906545306564b83cdc704ca2af ChangeLog 8307
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 90c21224d4e78b9fe2353375f88bb780 ChangeLog 8528
+RMD160 a54d6820665f13580f1b34abd71c37a2bdd96680 ChangeLog 8528
+SHA256 a19b98586265f22d5ad36b1f8e779ba6af9dadb7522d39a94ec5f94551c26183 ChangeLog 8528
+MD5 2d270feb5ef8ced992337805e3771b46 files/digest-valknut-0.2.20 68
+RMD160 f9e4ff9b2ea13c6b23e8bc41f284c7fa95c17e85 files/digest-valknut-0.2.20 68
+SHA256 f3de127fc728ac4b83189404109446247c42f5f40c659865096e32f0992436f5 files/digest-valknut-0.2.20 68
+MD5 54e62140bd8216c460b863b2f7682ea6 files/digest-valknut-0.2.21 68
+RMD160 0cf8e4b03482dd2e55665164aff5ac8a954eaeb3 files/digest-valknut-0.2.21 68
+SHA256 59de3a277c4f44b66f92c8b11e65215ddb69c6af01f4757e9f034afb2cf519a9 files/digest-valknut-0.2.21 68
+MD5 fbb70cefa4c4fe73d8c32c239bf3c927 files/digest-valknut-0.3.0 68
+RMD160 b868d33c7b2ad3c4367ea75e44daf1da5f818d70 files/digest-valknut-0.3.0 68
+SHA256 622ce6682b2266e6e20cf358c172da04b126fe938ff029806895ea63c7679459 files/digest-valknut-0.3.0 68
+MD5 58f1e6aa0e0048f3a23f2af674d97ea5 files/digest-valknut-0.3.3 67
+RMD160 bcecc3e02d6159ec5a40e6b098c1a9924d81b5e3 files/digest-valknut-0.3.3 67
+SHA256 b2c98929e8e365ea5eb75ecaf3d7d19f8da2b4663a1a4243c31bc8b3492c7ceb files/digest-valknut-0.3.3 67
+MD5 7d34100809db4b0f8ee0b8a6359f71e6 files/digest-valknut-0.3.5 67
+RMD160 094444952a8982e6fffe93905ed244067c50de5d files/digest-valknut-0.3.5 67
+SHA256 ea8a3b2768374dbd8957adbd9b75fafa2024ca94f6d42db6b20a50ea0422a67e files/digest-valknut-0.3.5 67
+MD5 9a13a153a21fc65dd19faddbecf0790b files/digest-valknut-0.3.7 247
+RMD160 53209eb644486ee8f598b74576590a717e77d798 files/digest-valknut-0.3.7 247
+SHA256 f2abcf32646f8ca8c1c9d2a8dc554802c8222355ec20dce371eeb5bfb21288ff files/digest-valknut-0.3.7 247
+MD5 fe12d11745545e0f82cf419dbf3f206c files/valknut-0.3.7-gcc41.patch 326
+RMD160 351ed00ef615ac8701f9724aeff8ff8820e0f037 files/valknut-0.3.7-gcc41.patch 326
+SHA256 044f43df8d0b8f3da5647bc9159187b522d2d4b241817ba98eaac8a21fa63ac5 files/valknut-0.3.7-gcc41.patch 326
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
+SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
 MD5 388aa7fb3e9cd47d097cc10176660a8c valknut-0.2.20.ebuild 827
+RMD160 2d0cf5abc1cf30b5dd058fc991bc6cc52198a157 valknut-0.2.20.ebuild 827
+SHA256 b05653873ac92bed871e7c7fdadab58d7a75b01fe9cd164896c44d2f25dc9883 valknut-0.2.20.ebuild 827
 MD5 a12bd69616f9d18c3306579cb4eb9a2c valknut-0.2.21.ebuild 829
+RMD160 c30693c618ce44b9058a2969f1fe54c58817e1d9 valknut-0.2.21.ebuild 829
+SHA256 fde8547213b37fae0a17de3ff32e660298281eaa8937aba65d755bf90ba1e528 valknut-0.2.21.ebuild 829
 MD5 e23c14264c3e087e7d822d2adb0a1f8f valknut-0.3.0.ebuild 874
+RMD160 e77508c03848d8cf2c8f606a20d7a93ef6587e7e valknut-0.3.0.ebuild 874
+SHA256 74b5fe8f7648a9878cc2963859a6f94af1483a1c5656130278bd4d0f375319cf valknut-0.3.0.ebuild 874
 MD5 40a8c18a29d5a0797cc0ba8b00b1bede valknut-0.3.3.ebuild 851
+RMD160 f79e22d95df8b5705989b988ac76b36ca8d1dc58 valknut-0.3.3.ebuild 851
+SHA256 21dbf404a929d81221c7d6a0ca7f3bd27c487777440235fcd1265df7a91c38bd valknut-0.3.3.ebuild 851
 MD5 ba09f771957bf329c7f667c49e6e7b93 valknut-0.3.5.ebuild 854
-MD5 4ffdea9f588ce9a432af7e63caa5a41e valknut-0.3.7.ebuild 799
-MD5 2d270feb5ef8ced992337805e3771b46 files/digest-valknut-0.2.20 68
-MD5 54e62140bd8216c460b863b2f7682ea6 files/digest-valknut-0.2.21 68
-MD5 fbb70cefa4c4fe73d8c32c239bf3c927 files/digest-valknut-0.3.0 68
-MD5 58f1e6aa0e0048f3a23f2af674d97ea5 files/digest-valknut-0.3.3 67
-MD5 7d34100809db4b0f8ee0b8a6359f71e6 files/digest-valknut-0.3.5 67
-MD5 2eb5e862b379788fea00a4f3228e0eee files/digest-valknut-0.3.7 67
+RMD160 950096ec03f829b955fa6891bbcd267a8567ea77 valknut-0.3.5.ebuild 854
+SHA256 200203f93a2563318df716c51ef8211cef685cca68968291401ba637e9d0512e valknut-0.3.5.ebuild 854
+MD5 fe9481156e5e1f4d702a941db65392f4 valknut-0.3.7.ebuild 876
+RMD160 d88311431899493719f5f3c9ba2e8a1fa3839e54 valknut-0.3.7.ebuild 876
+SHA256 eec052bb09f3be88673cc3f820623c0a8a58e53768524bfbfe83940a89e3fb67 valknut-0.3.7.ebuild 876
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEAT7CCRZPokWLroQRAvddAKCcJ3abOSYuRXqiUisDHEOLtRluIgCfaoEq
+GjAJFg9+VY2oFEXYkEStp18=
+=CfsA
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/valknut/files/digest-valknut-0.3.7 b/net-p2p/valknut/files/digest-valknut-0.3.7
index 34f8f3563fc4..c5e48feefc8d 100644
--- a/net-p2p/valknut/files/digest-valknut-0.3.7
+++ b/net-p2p/valknut/files/digest-valknut-0.3.7
@@ -1 +1,3 @@
 MD5 848f9b3f25af15c3f1837133ac4b9415 valknut-0.3.7.tar.bz2 1080857
+RMD160 029a4deae84afc768f7291e3b48ec183977412c4 valknut-0.3.7.tar.bz2 1080857
+SHA256 5b1d98ba6214073e02b0774f93d209205f8a93310c8750ad574ea184b4567240 valknut-0.3.7.tar.bz2 1080857
diff --git a/net-p2p/valknut/files/valknut-0.3.7-gcc41.patch b/net-p2p/valknut/files/valknut-0.3.7-gcc41.patch
new file mode 100644
index 000000000000..d6540c43a010
--- /dev/null
+++ b/net-p2p/valknut/files/valknut-0.3.7-gcc41.patch
@@ -0,0 +1,11 @@
+--- valknut-0.3.7/valknut/dciconloader.h	2004-08-18 14:23:57.000000000 +0200
++++ valknut-0.3.7/valknut/dciconloader.h.new	2006-01-19 20:01:56.000000000 +0100
+@@ -122,7 +122,7 @@
+ 	
+ private:
+ 	/** */
+-	QPixmap DCIconLoader::LoadPixmap( QString file );
++	QPixmap LoadPixmap( QString file );
+ 
+ 	/** */
+ 	PixmapMap m_PixmapMap;
diff --git a/net-p2p/valknut/valknut-0.3.7.ebuild b/net-p2p/valknut/valknut-0.3.7.ebuild
index fa7c5d007cee..eec745e7b119 100644
--- a/net-p2p/valknut/valknut-0.3.7.ebuild
+++ b/net-p2p/valknut/valknut-0.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/valknut/valknut-0.3.7.ebuild,v 1.6 2005/09/16 04:46:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/valknut/valknut-0.3.7.ebuild,v 1.7 2006/02/26 05:37:06 halcy0n Exp $
 
-inherit kde-functions
+inherit kde-functions eutils
 
 DESCRIPTION="Qt based client for DirectConnect"
 HOMEPAGE="http://dcgui.berlios.de/"
@@ -19,6 +19,11 @@ DEPEND=">=dev-libs/libxml2-2.4.22
 
 need-qt 3
 
+src_unpack () {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 src_compile() {
 	econf \
 		`use_with ssl` \