Fix building with GCC 4.4 wrt #277188.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 53 insertions, 13 deletions

diff --git a/net-p2p/bitstormlite/ChangeLog b/net-p2p/bitstormlite/ChangeLog
index 3d26126d07f2..c6b560b4597b 100644
--- a/net-p2p/bitstormlite/ChangeLog
+++ b/net-p2p/bitstormlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bitstormlite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitstormlite/ChangeLog,v 1.10 2009/02/16 00:05:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitstormlite/ChangeLog,v 1.11 2009/07/25 19:53:52 ssuominen Exp $
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  bitstormlite-0.2p.ebuild, +files/bitstormlite-0.2p-gcc44.patch:
+  Fix building with GCC 4.4 wrt #277188.
 
   16 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/bitstormlite-0.2p-gcc43.patch, bitstormlite-0.2p.ebuild:
diff --git a/net-p2p/bitstormlite/Manifest b/net-p2p/bitstormlite/Manifest
index 9639fe0b5596..bbc4f99d5485 100644
--- a/net-p2p/bitstormlite/Manifest
+++ b/net-p2p/bitstormlite/Manifest
@@ -1,5 +1,6 @@
 AUX bitstormlite-0.2p-gcc43.patch 849 RMD160 95a475398b28a4973bbabe83b479a59beabc1ba8 SHA1 9b220cf12fbae6442f7b76cc280e2296cef91abe SHA256 50ee5e7723deeb5ab248d3d1db771b4ccd0e937f3cd853d20c6f2888a5c0c835
+AUX bitstormlite-0.2p-gcc44.patch 1088 RMD160 dcd926d23d6f8019568c73132185d622b2c61f96 SHA1 d14f3f57566d6e7cf8aae9d2a1f16447307f807d SHA256 6c66134a127c73e417299d4bfe0761987b96b442fb875d11bc0cbe85765f9ddd
 DIST BitStormLite-0.2p.tar.gz 262456 RMD160 4f65c35b549f547fda4ba45967ca03cdd1a653bb SHA1 81ff32687c98a3ecf846fb40d180c468d777f477 SHA256 98ad738805e98fbcae138ea90a4fcff01f200f004bc9a0ca98f238ed13bed40f
-EBUILD bitstormlite-0.2p.ebuild 751 RMD160 ffcc060c222755d836cfa6bb2f525bef61769b10 SHA1 a6fbf077e4139e93dc7a131d2a55e9b6a4f5061a SHA256 59a09220edde44c94bc035890dd96f07970cc9a5e94ce65905bdfce141211bb4
-MISC ChangeLog 1922 RMD160 e5691a8d8bc6882273ee93df4cf48a0c38fe7030 SHA1 1304a2c326855a9af12e7489f643debfbe825cdd SHA256 dcfdf6a865618a5df38cd30086b79156b521431d90aa81dbfae89d01d54a427b
+EBUILD bitstormlite-0.2p.ebuild 778 RMD160 5692ec59d91d3f52320a79cc60e1bd6d99c60cdc SHA1 009ca16d2347915562668885c5b38086fb17b332 SHA256 4dce570199aad9aa2531e9806b89c41616989bba6fcf5ba54157ab52f66f9434
+MISC ChangeLog 2085 RMD160 aec3a134bc4d2ac929f10beb3a78b8618d3c0b83 SHA1 7ddaf4c32af1f77a7d3276c22252e9ef212b63cf SHA256 02884a6471a5f6e5a95660ddd59f9f6edcfa19eca03e1566b269a0f9362a0b6c
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
diff --git a/net-p2p/bitstormlite/bitstormlite-0.2p.ebuild b/net-p2p/bitstormlite/bitstormlite-0.2p.ebuild
index dca9af14a949..471d6913535e 100644
--- a/net-p2p/bitstormlite/bitstormlite-0.2p.ebuild
+++ b/net-p2p/bitstormlite/bitstormlite-0.2p.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitstormlite/bitstormlite-0.2p.ebuild,v 1.3 2009/02/16 00:05:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitstormlite/bitstormlite-0.2p.ebuild,v 1.4 2009/07/25 19:53:52 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A light BitTorrent client based on c++ and gtk+."
@@ -10,19 +11,19 @@ SRC_URI="mirror://sourceforge/bbom/BitStormLite-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+
 RDEPEND="net-misc/curl
-		>=x11-libs/gtk+-2.6"
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
+	>=x11-libs/gtk+-2.6:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
-S="${WORKDIR}/BitStormLite-${PV}"
+S=${WORKDIR}/BitStormLite-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_install() {
diff --git a/net-p2p/bitstormlite/files/bitstormlite-0.2p-gcc44.patch b/net-p2p/bitstormlite/files/bitstormlite-0.2p-gcc44.patch
new file mode 100644
index 000000000000..c392daf4e30e
--- /dev/null
+++ b/net-p2p/bitstormlite/files/bitstormlite-0.2p-gcc44.patch
@@ -0,0 +1,34 @@
+diff -ur BitStormLite-0.2p.orig/src/bdict.h BitStormLite-0.2p/src/bdict.h
+--- BitStormLite-0.2p.orig/src/bdict.h	2007-05-17 16:05:06.000000000 +0300
++++ BitStormLite-0.2p/src/bdict.h	2009-07-25 22:53:28.000000000 +0300
+@@ -26,6 +26,7 @@
+ #ifndef _BDICT_H_
+ #define _BDICT_H_
+ 
++#include <stdio.h>
+ #include <iostream>
+ #include <string>
+ #include <map>
+diff -ur BitStormLite-0.2p.orig/src/BitStorm.h BitStormLite-0.2p/src/BitStorm.h
+--- BitStormLite-0.2p.orig/src/BitStorm.h	2007-05-17 16:06:12.000000000 +0300
++++ BitStormLite-0.2p/src/BitStorm.h	2009-07-25 22:51:46.000000000 +0300
+@@ -25,7 +25,7 @@
+ 
+ #ifndef _BITSTORM_H_
+ #define _BITSTORM_H_
+- 
++ #include <stdint.h>
+  #include <string>
+  #include <list>
+  #include <map>
+diff -ur BitStormLite-0.2p.orig/src/BTTask.h BitStormLite-0.2p/src/BTTask.h
+--- BitStormLite-0.2p.orig/src/BTTask.h	2007-05-17 16:06:52.000000000 +0300
++++ BitStormLite-0.2p/src/BTTask.h	2009-07-25 22:51:57.000000000 +0300
+@@ -26,6 +26,7 @@
+ #ifndef BTTASK_H_
+ #define BTTASK_H_
+ 
++#include <stdint.h>
+ #include <pthread.h>
+ #include <string>
+ #include <list>