Added a patch for gcc-4.3-compatibility as kindly provided by Ryan Hill on bug 203701.

Package-Manager: portage-2.1.4

4 files changed, 177 insertions, 13 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index e07f9d419d33..af857f053824 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/aspell
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.99 2007/12/28 23:35:20 welp Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.100 2008/01/26 18:49:16 philantrop Exp $
+
+  26 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/aspell-0.60.5-gcc-4.3.patch, aspell-0.60.5.ebuild:
+  Added a patch for gcc-4.3-compatibility as kindly provided by Ryan Hill on
+  bug 203701.
 
   28 Dec 2007; <welp@gentoo.org> aspell-0.60.5.ebuild:
   Keyworded ~sparc-fbsd; bug 197275
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 1f60c79bcddd..0fa78b8f4c2b 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -6,6 +6,10 @@ AUX aspell-0.60.3-templateinstantiations.patch 274 RMD160 e84029e2b8c63e75421aec
 MD5 fb277ca79b2dcd2aa6a842c8b8ad59e4 files/aspell-0.60.3-templateinstantiations.patch 274
 RMD160 e84029e2b8c63e75421aecfc15fd30ec5d893419 files/aspell-0.60.3-templateinstantiations.patch 274
 SHA256 71ec6d58f4e5e629d82869bc7c8c3eb63663aedf1be3c38f87ab872835f90f2a files/aspell-0.60.3-templateinstantiations.patch 274
+AUX aspell-0.60.5-gcc-4.3.patch 5460 RMD160 2b90f62f32994154034fc49baf71947f95279e01 SHA1 18ddce494afeff4fe97d1d531e4bd1f78b9d8465 SHA256 349f092bb2cc2f18d3cd8fb3039774f7157bf44179a704c968dcf425b40ed08e
+MD5 2688bca53eb1a15f98777a54f736d6ae files/aspell-0.60.5-gcc-4.3.patch 5460
+RMD160 2b90f62f32994154034fc49baf71947f95279e01 files/aspell-0.60.5-gcc-4.3.patch 5460
+SHA256 349f092bb2cc2f18d3cd8fb3039774f7157bf44179a704c968dcf425b40ed08e files/aspell-0.60.5-gcc-4.3.patch 5460
 AUX aspell-0.60.5-nls.patch 443 RMD160 c5d89ec5ca398c990a7bb6598d5283471e43b92a SHA1 d502ebb74c97662af8ea365eb1cfffd222681859 SHA256 9c8a619f97ffcbb6a90bb5d5f0531d0890ca0033dcfae5b0fc70cb635df7b39c
 MD5 296318124ed2a3aceeb234a89b721646 files/aspell-0.60.5-nls.patch 443
 RMD160 c5d89ec5ca398c990a7bb6598d5283471e43b92a files/aspell-0.60.5-nls.patch 443
@@ -20,14 +24,14 @@ EBUILD aspell-0.50.5-r4.ebuild 1918 RMD160 c44f0875467fa48ca1b786bbbd5245f7ba68a
 MD5 06ea3169f00b1e8a332376caa870997b aspell-0.50.5-r4.ebuild 1918
 RMD160 c44f0875467fa48ca1b786bbbd5245f7ba68a2be aspell-0.50.5-r4.ebuild 1918
 SHA256 0cb69f5a88638ac387a12f39f21aa7133e2e2246c86a9023549d340bf199ef4c aspell-0.50.5-r4.ebuild 1918
-EBUILD aspell-0.60.5.ebuild 2948 RMD160 4a77950a301cf4489d3aa439e9364950b763033d SHA1 9140d54d602297ff6afd0aa106a179709ae83613 SHA256 75a510fd4a8322ea1fa70cd98b18abb14ddd714947cb53d93c2e1e00b95079ee
-MD5 c71f1de1d754de940e72f69322c2da2f aspell-0.60.5.ebuild 2948
-RMD160 4a77950a301cf4489d3aa439e9364950b763033d aspell-0.60.5.ebuild 2948
-SHA256 75a510fd4a8322ea1fa70cd98b18abb14ddd714947cb53d93c2e1e00b95079ee aspell-0.60.5.ebuild 2948
-MISC ChangeLog 15541 RMD160 a2f3483492b9a22b4cae7293a956acc7a1117328 SHA1 e74cbe8fa09d1cf65b05d9fce81536cf01099b83 SHA256 50607dc26fd37c35df8e5db608f9ac5ab2da5b7f01d83c41998b8e0a98326f40
-MD5 bd5ecff618d3a0b774e4bb363921351e ChangeLog 15541
-RMD160 a2f3483492b9a22b4cae7293a956acc7a1117328 ChangeLog 15541
-SHA256 50607dc26fd37c35df8e5db608f9ac5ab2da5b7f01d83c41998b8e0a98326f40 ChangeLog 15541
+EBUILD aspell-0.60.5.ebuild 2997 RMD160 186aa4147a325b0546637dfdcaa0f6a47e27ea5f SHA1 2773248d455e724dfb21ad592965e7a5b7594350 SHA256 444cb843941a60d03706e2a015e5e53109240a6090d0e5052d2378fc8579f104
+MD5 bf170f424aca361c4937eece985a1780 aspell-0.60.5.ebuild 2997
+RMD160 186aa4147a325b0546637dfdcaa0f6a47e27ea5f aspell-0.60.5.ebuild 2997
+SHA256 444cb843941a60d03706e2a015e5e53109240a6090d0e5052d2378fc8579f104 aspell-0.60.5.ebuild 2997
+MISC ChangeLog 15755 RMD160 99a89045defecf470bdd4864cd62d3d9884b3337 SHA1 ce74b3b888bb8a2d87a8026d969a5f8c97ace810 SHA256 e6dcaf3b3dd5b835dd78ea26149cddc85c7850cff1ba5a8f037f09148c5e99fb
+MD5 4ef8ae97bfa41378b38f8d2d99d3e966 ChangeLog 15755
+RMD160 99a89045defecf470bdd4864cd62d3d9884b3337 ChangeLog 15755
+SHA256 e6dcaf3b3dd5b835dd78ea26149cddc85c7850cff1ba5a8f037f09148c5e99fb ChangeLog 15755
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
diff --git a/app-text/aspell/aspell-0.60.5.ebuild b/app-text/aspell/aspell-0.60.5.ebuild
index 65c189a04630..cfb8f8051136 100644
--- a/app-text/aspell/aspell-0.60.5.ebuild
+++ b/app-text/aspell/aspell-0.60.5.ebuild
@@ -1,6 +1,6 @@
-# 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-text/aspell/aspell-0.60.5.ebuild,v 1.17 2007/12/28 23:35:20 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.5.ebuild,v 1.18 2008/01/26 18:49:16 philantrop Exp $
 
 # N.B. This is before inherit of autotools, as autotools.eclass adds the
 # relevant dependencies to DEPEND.
@@ -50,6 +50,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/aspell-0.60.3-templateinstantiations.patch
 	epatch "${FILESDIR}/${P}-nls.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 
 	eautomake
 	elibtoolize --reverse-deps
@@ -87,7 +88,7 @@ src_install() {
 		cd examples
 		make clean || die
 		docinto examples
-		dodoc ${S}/examples/*
+		dodoc "${S}"/examples/*
 	fi
 }
 
diff --git a/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch b/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
new file mode 100644
index 000000000000..22d04d089cd5
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
@@ -0,0 +1,154 @@
+diff -Naur aspell-0.60.5-orig/common/convert.cpp aspell-0.60.5/common/convert.cpp
+--- aspell-0.60.5-orig/common/convert.cpp	2006-11-18 02:36:01.000000000 -0600
++++ aspell-0.60.5/common/convert.cpp	2007-12-29 11:17:11.000000000 -0600
+@@ -238,7 +238,7 @@
+   }
+ 
+   template <class T>
+-  static void free_norm_table(NormTable<T> * d)
++  void free_norm_table(NormTable<T> * d)
+   {
+     for (T * cur = d->data; cur != d->end; ++cur) {
+       if (cur->sub_table) 
+diff -Naur aspell-0.60.5-orig/common/string.hpp aspell-0.60.5/common/string.hpp
+--- aspell-0.60.5-orig/common/string.hpp	2004-11-29 11:50:05.000000000 -0600
++++ aspell-0.60.5/common/string.hpp	2007-12-29 11:17:11.000000000 -0600
+@@ -129,10 +129,10 @@
+     }
+ 
+     char & operator[] (size_t pos) {return begin_[pos];}
+-    const char operator[] (size_t pos) const {return begin_[pos];}
++    char operator[] (size_t pos) const {return begin_[pos];}
+ 
+     char & back() {return end_[-1];}
+-    const char back() const {return end_[-1];}
++    char back() const {return end_[-1];}
+ 
+     void clear() {end_ = begin_;}
+ 
+@@ -492,7 +492,7 @@
+ 
+ namespace std
+ {
+-  template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
++  template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
+ }
+ 
+ #endif
+diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.cpp aspell-0.60.5/modules/speller/default/affix.cpp
+--- aspell-0.60.5-orig/modules/speller/default/affix.cpp	2006-01-21 08:27:54.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/affix.cpp	2007-12-29 11:17:11.000000000 -0600
+@@ -193,7 +193,7 @@
+   typedef const Conds * Value;
+   typedef const char * Key;
+   static const bool is_multi = false;
+-  hash<const char *> hfun;
++  acommon::hash<const char *> hfun;
+   size_t hash(const char * s) {return hfun(s);}
+   bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
+   const char * key(const Conds * c) {return c->str;}
+diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.hpp aspell-0.60.5/modules/speller/default/affix.hpp
+--- aspell-0.60.5-orig/modules/speller/default/affix.hpp	2004-11-29 11:50:06.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/affix.hpp	2007-12-29 11:17:11.000000000 -0600
+@@ -107,7 +107,7 @@
+     {
+       return expand(word,aff,buf,0);
+     }
+-    WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
++    WordAff * expand_suffix(ParmString word, const unsigned char * aff,
+                             ObjStack &, int limit = INT_MAX,
+                             unsigned char * new_aff = 0, WordAff * * * l = 0,
+                             ParmString orig_word = 0) const;
+diff -Naur aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp aspell-0.60.5/modules/speller/default/readonly_ws.cpp
+--- aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp	2006-11-18 03:17:19.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp	2007-12-29 11:17:11.000000000 -0600
+@@ -726,7 +726,7 @@
+   struct WordLookupParms {
+     const char * block_begin;
+     WordLookupParms() {}
+-    typedef Vector<u32int>      Vector;
++    typedef acommon::Vector<u32int> Vector;
+     typedef u32int              Value;
+     typedef const char *        Key;
+     static const bool is_multi = false;
+diff -Naur aspell-0.60.5-orig/prog/aspell.cpp aspell-0.60.5/prog/aspell.cpp
+--- aspell-0.60.5-orig/prog/aspell.cpp	2006-12-19 04:51:08.000000000 -0600
++++ aspell-0.60.5/prog/aspell.cpp	2007-12-29 11:18:10.000000000 -0600
+@@ -239,6 +239,14 @@
+   return i;
+ }
+ 
++static void line_buffer() {
++#ifndef WIN32
++  // set up stdin and stdout to be line buffered
++  assert(setvbuf(stdin, 0, _IOLBF, 0) == 0); 
++  assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
++#endif
++}
++
+ Conv dconv;
+ Conv uiconv;
+ 
+@@ -686,11 +694,7 @@
+ 
+ void pipe() 
+ {
+-#ifndef WIN32
+-  // set up stdin and stdout to be line buffered
+-  assert(setvbuf(stdin, 0, _IOLBF, 0) == 0); 
+-  assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
+-#endif
++  line_buffer();
+ 
+   bool terse_mode = true;
+   bool do_time = options->retrieve_bool("time");
+@@ -1651,6 +1655,7 @@
+   Conv oconv(setup_conv(lang, options));
+   String word;
+   String sl;
++  line_buffer();
+   while (CIN.getline(word)) {
+     const char * w = iconv(word);
+     lang->LangImpl::to_soundslike(sl, w);
+@@ -1675,6 +1680,7 @@
+   Conv oconv(setup_conv(lang, options));
+   String word;
+   GuessInfo gi;
++  line_buffer();
+   while (CIN.getline(word)) {
+     lang->munch(iconv(word), &gi);
+     COUT << word;
+@@ -1713,6 +1719,7 @@
+   String word, buf;
+   ObjStack exp_buf;
+   WordAff * exp_list;
++  line_buffer();
+   while (CIN.getline(word)) {
+     buf = word;
+     char * w = iconv(buf.mstr(), buf.size());
+@@ -1799,6 +1806,7 @@
+   String word;
+   String base;
+   String affs;
++  line_buffer();
+   while (CIN.getline(word)) {
+     word = iconv(word);
+ 
+@@ -1882,7 +1890,7 @@
+   typedef SML_WordEntry Value;
+   typedef const char * Key;
+   static const bool is_multi = false;
+-  hash<const char *> hash;
++  acommon::hash<const char *> hash;
+   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
+   Key key(const Value & v) {return v.word;}
+ };
+@@ -2033,7 +2041,7 @@
+   typedef CML_Entry Value;
+   typedef const char * Key;
+   static const bool is_multi = true;
+-  hash<const char *> hash;
++  acommon::hash<const char *> hash;
+   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
+   Key key(const Value & v) {return v.word;}
+ };