Fix for gcc-4.3, bug #228755.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25.8 i686

4 files changed, 151 insertions, 6 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index 7b6ce2f655d5..6c020816d123 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/barry
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.4 2007/12/20 17:15:20 gregkh Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.5 2008/07/27 11:36:31 loki_val Exp $
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/barry-0.11-gcc43.patch, barry-0.11.ebuild:
+  Fix for gcc-4.3, bug #228755.
 
 *barry-0.11 (20 Dec 2007)
 
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index f7914da0c539..eeb2f06b2a14 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,10 +1,11 @@
+AUX barry-0.11-gcc43.patch 4051 RMD160 d91911fcdca98386287f671556ad5d219f4d84e0 SHA1 5d12719571951cd5d4e80b954b2b8f33330aaaec SHA256 4157a85c140e33d98bc42be05fbbf7819adab2bd0a8714fe76d99d57f048f3b3
 DIST barry-0.10.tar.bz2 867343 RMD160 240947aa1cd89bb824e019574a9979fb97578b10 SHA1 f49d31195952abdf5586270755b841fbaa8ae9e0 SHA256 77e42ea5ab6046b6fa71b0152f90379c2327fc4bf076dc4765edd5dcb15cbf67
 DIST barry-0.11.tar.bz2 867296 RMD160 bde6fd7d63159afaa6c99ddcc1d362263240f988 SHA1 6820e9fbe450883a3d3d56539bbc46c6d6ddfa08 SHA256 ee0febf16239e1aa61656c9d508907717c5b8d5eb62416de608fce92574c06ee
 DIST barry-0.8.tar.bz2 706649 RMD160 06e049aedbafe03d45c7b1f9a73e4e8b7bff43b2 SHA1 5acbbfa0c0e353a64a521c6355568e5a4b2c29a9 SHA256 2617ee4b194f8421111c06d19a9af86eca2ce09b2213d922f39268ff342e004f
 DIST barry-0.9.tar.bz2 861414 RMD160 fda9f55f56560c2c353d043ce1d740fcf58a0687 SHA1 67ef3edd92e1b812afd2e60a93703d40b8e700f4 SHA256 f80dcb0773be05a750dea3d03406eda3702146e5d38559f034e1aa033416aa5d
 EBUILD barry-0.10.ebuild 773 RMD160 e7ca2ff8c6d226c9c523119fa7cf25077573c7c0 SHA1 6df6a0275ed82a16e68d26800bf80f5d02b5b550 SHA256 1dd6c9b85060e34dc651427c9f997c7b29c425dcae1561e959323f4d636338a4
-EBUILD barry-0.11.ebuild 775 RMD160 a45c4a4b552432afa2cc461a38cd622c8d481c67 SHA1 27b23d753451d93ef860f845b86e1bb2455c52b8 SHA256 893e86cf8f76664f7a1321ac0341045bfd3ebd3d7068c57e4203d4fa40133730
+EBUILD barry-0.11.ebuild 835 RMD160 7329f63679ef2eceaade0e06b8b675e17e630bac SHA1 55fdece47697b378beadcfc36d7729e80dd41636 SHA256 0c4b34e8768a695adb11e2d21956b4e85a291724af123b08d91f99bc4f43d142
 EBUILD barry-0.8.ebuild 777 RMD160 7819d70cc985dbc4e7cf588f77fbcaf8b6ce88b2 SHA1 67bf46b9ba861d2f82ca307bd0cbdc6a77a677e3 SHA256 563c9bbb440c92556457fbb8d13241d74888a42182d776bf02d051ee1d00e5be
 EBUILD barry-0.9.ebuild 772 RMD160 67ec4abf110e52a18e40cfd1be633b1b21a5b928 SHA1 796b5789cb86c76fe12a63bd83659824f339d71a SHA256 7f515d6161ccedc486d9e748096c34ca7052504f2352f2b10623f760dbfb0c97
-MISC ChangeLog 837 RMD160 bcc2ee472552d805958fe3bba02c66ed75c68367 SHA1 a66fc3dd22e0a1ec15876f7f4dc5d0902bd1a4a6 SHA256 f3519b522e7553e36f0c740c2aed8a8131d43ff567f34811d2855682c79636b3
+MISC ChangeLog 977 RMD160 bd54038df40f5e9bf032409d4dd7f97e42f4a4be SHA1 d753c08f85860245f24d352fe2d95c968d13f858 SHA256 168f51a8bc32d71c5bdf441722fe6b8dac3cf91c203217bcee825590f45fb5d6
 MISC metadata.xml 466 RMD160 1fea63e1eae08d62e276920e86ac813789fdf1b3 SHA1 7b37d256933e87dd311d68968ee27c8dd019828a SHA256 34f925e7f2c1134e6d1cca627b56653367dfde0617f6c62590504a0b6107e24a
diff --git a/app-pda/barry/barry-0.11.ebuild b/app-pda/barry/barry-0.11.ebuild
index 795183e52c95..ca9cf172be92 100644
--- a/app-pda/barry/barry-0.11.ebuild
+++ b/app-pda/barry/barry-0.11.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.11.ebuild,v 1.1 2007/12/20 17:15:20 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.11.ebuild,v 1.2 2008/07/27 11:36:31 loki_val Exp $
+
+inherit base
 
 DESCRIPTION="Barry is an Open Source Linux application that will allow
 synchronization, backup, restore, program management, and charging for BlackBerry devices"
@@ -15,6 +17,8 @@ IUSE=""
 DEPEND="dev-libs/libusb
 	dev-libs/openssl"
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc README NEWS
diff --git a/app-pda/barry/files/barry-0.11-gcc43.patch b/app-pda/barry/files/barry-0.11-gcc43.patch
new file mode 100644
index 000000000000..1a2a5096a540
--- /dev/null
+++ b/app-pda/barry/files/barry-0.11-gcc43.patch
@@ -0,0 +1,136 @@
+diff -ur barry-0.12.orig/examples/addcalendar.cc barry-0.12/examples/addcalendar.cc
+--- barry-0.12.orig/examples/addcalendar.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/examples/addcalendar.cc	2008-06-24 15:55:57.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <barry/barry.h>
+ #include <iostream>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace Barry;
+diff -ur barry-0.12.orig/src/controller.cc barry-0.12/src/controller.cc
+--- barry-0.12.orig/src/controller.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/controller.cc	2008-06-24 15:52:17.000000000 -0400
+@@ -29,14 +29,13 @@
+ #include "builder.h"
+ #include "endian.h"
+ #include "packet.h"
++#include <sstream>
++#include <iomanip>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+ 
+-#include <sstream>
+-
+-#include <iomanip>
+-
+ namespace Barry {
+ 
+ //
+diff -ur barry-0.12.orig/src/data.cc barry-0.12/src/data.cc
+--- barry-0.12.orig/src/data.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/data.cc	2008-06-24 15:48:25.000000000 -0400
+@@ -25,6 +25,8 @@
+ #include <iomanip>
+ #include <string>
+ #include <stdexcept>
++#include <cstring>
++#include <cstdlib>
+ 
+ //#define __DEBUG_MODE__
+ #include "debug.h"
+Only in barry-0.12.orig/src: data.loT
+diff -ur barry-0.12.orig/src/ldif.cc barry-0.12/src/ldif.cc
+--- barry-0.12.orig/src/ldif.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/ldif.cc	2008-06-24 15:48:51.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <stdexcept>
+ #include <iostream>
+ #include <iomanip>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/packet.cc barry-0.12/src/packet.cc
+--- barry-0.12.orig/src/packet.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/packet.cc	2008-06-24 15:51:39.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include "parser.h"
+ #include "builder.h"
+ #include "error.h"
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/r_calendar.cc barry-0.12/src/r_calendar.cc
+--- barry-0.12.orig/src/r_calendar.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/r_calendar.cc	2008-06-24 15:50:20.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <iomanip>
+ #include <time.h>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/r_task.cc barry-0.12/src/r_task.cc
+--- barry-0.12.orig/src/r_task.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/r_task.cc	2008-06-24 15:51:04.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "debug.h"
+ #include <ostream>
+ #include <iomanip>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace Barry::Protocol;
+diff -ur barry-0.12.orig/src/record.cc barry-0.12/src/record.cc
+--- barry-0.12.orig/src/record.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/record.cc	2008-06-24 15:50:00.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include <iomanip>
+ #include <time.h>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/socket.cc barry-0.12/src/socket.cc
+--- barry-0.12.orig/src/socket.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/socket.cc	2008-06-24 15:49:14.000000000 -0400
+@@ -30,7 +30,7 @@
+ #include "endian.h"
+ #include <openssl/sha.h>
+ #include <sstream>
+-
++#include <cstring>
+ 
+ using namespace Usb;
+ 
+diff -ur barry-0.12.orig/tools/btool.cc barry-0.12/tools/btool.cc
+--- barry-0.12.orig/tools/btool.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/tools/btool.cc	2008-06-24 15:53:09.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <vector>
+ #include <string>
+ #include <getopt.h>
++#include <memory>
+ 
+ 
+ using namespace std;
+diff -ur barry-0.12.orig/tools/btranslate.cc barry-0.12/tools/btranslate.cc
+--- barry-0.12.orig/tools/btranslate.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/tools/btranslate.cc	2008-06-24 15:55:23.000000000 -0400
+@@ -17,6 +17,9 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <sstream>
++#include <cstdlib>
++#include <cstring>
++#include <climits>
+ 
+ using namespace std;
+