Another fix for gcc 4.1 on amd64.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 382 insertions, 11 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 163e7a6953b1..8968c38164af 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.42 2006/07/20 03:51:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.43 2006/08/08 23:54:38 williamh Exp $
+
+  08 Aug 2006; William Hubbs <williamh@gentoo.org>
+  +files/festival-1.95_beta-gcc41-amd64-int-pointer.patch,
+  festival-1.95_beta.ebuild:
+  Added another amd64 patch.  Thanks again Ed.
 
   20 Jul 2006; William Hubbs <williamh@gentoo.org>
   +files/festival-1.95_beta-gcc41-amd64.patch,
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 48be804be401..bcf82cb45fbb 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -6,6 +6,10 @@ AUX festival-1.95_beta-asterisk.patch 739 RMD160 d333c05bcba43c2713730beec0cd8e1
 MD5 d3ccc7a2b85c1c574ef09b92e1ea88ed files/festival-1.95_beta-asterisk.patch 739
 RMD160 d333c05bcba43c2713730beec0cd8e13bd2f3436 files/festival-1.95_beta-asterisk.patch 739
 SHA256 0331929ddfe43bd424c1a55ad8309920c8b51c6d0c2f651beb926d1eecb322d0 files/festival-1.95_beta-asterisk.patch 739
+AUX festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256 RMD160 2c61af99e561996dc4e69926df20c488fbb22744 SHA1 ff75f26459c0e979b20bb0918119f19817ab4cd2 SHA256 34ba1902084915bcd12e57cb8bacbfbaefcf27ffbfa7092756ce12201bfe83f1
+MD5 ff15432edcea34f603774f15378c8fa5 files/festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256
+RMD160 2c61af99e561996dc4e69926df20c488fbb22744 files/festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256
+SHA256 34ba1902084915bcd12e57cb8bacbfbaefcf27ffbfa7092756ce12201bfe83f1 files/festival-1.95_beta-gcc41-amd64-int-pointer.patch 11256
 AUX festival-1.95_beta-gcc41-amd64.patch 419 RMD160 e8667b23ee4c163b9a64131f2c84575299943cc8 SHA1 e3657a7aca05bc0416cf2b8f4c59cf4c2a00b82e SHA256 dcf272c6426da6ea01fad9bf080e377f0def66b8c248c6cc9d5ee816b38ebea6
 MD5 47c12560f1a8e7e2e7bf977f2ca9ae38 files/festival-1.95_beta-gcc41-amd64.patch 419
 RMD160 e8667b23ee4c163b9a64131f2c84575299943cc8 files/festival-1.95_beta-gcc41-amd64.patch 419
@@ -54,14 +58,14 @@ EBUILD festival-1.4.3-r4.ebuild 5016 RMD160 2228059eb2d666748192713f290762bd1c7a
 MD5 788ae46e7dfaf5536a84541100cf597a festival-1.4.3-r4.ebuild 5016
 RMD160 2228059eb2d666748192713f290762bd1c7af49b festival-1.4.3-r4.ebuild 5016
 SHA256 44c687c0d739e51afb8c98640af7c8e350c0f85930bb16d75bdb8479f5b2aa6f festival-1.4.3-r4.ebuild 5016
-EBUILD festival-1.95_beta.ebuild 5122 RMD160 cd67bd24372348ad62b67d8fc3f28be9388c0509 SHA1 a33d859318835d28ef59817329161643fdfbbdbb SHA256 a3af7b1d480c66aa71ce7501dc1133028b4881d3edb2e7dc16f76b7c6bf380f1
-MD5 5aafdfa46a24f483548dd7626c725745 festival-1.95_beta.ebuild 5122
-RMD160 cd67bd24372348ad62b67d8fc3f28be9388c0509 festival-1.95_beta.ebuild 5122
-SHA256 a3af7b1d480c66aa71ce7501dc1133028b4881d3edb2e7dc16f76b7c6bf380f1 festival-1.95_beta.ebuild 5122
-MISC ChangeLog 9505 RMD160 b5b31e69a338ed99e56ad40e90eefadc321feca6 SHA1 099532bab352269e4755e164b4a46e4ecce96842 SHA256 df1a5de4261e1802e7c17122683178f61044e9642fed50926153e60d19f84e8c
-MD5 a3612228ba21ba15959144bfd4abcbea ChangeLog 9505
-RMD160 b5b31e69a338ed99e56ad40e90eefadc321feca6 ChangeLog 9505
-SHA256 df1a5de4261e1802e7c17122683178f61044e9642fed50926153e60d19f84e8c ChangeLog 9505
+EBUILD festival-1.95_beta.ebuild 5190 RMD160 ae2f15494687e0349636128af8e2698dfd7ddadc SHA1 c0e3c64a6f566053a78cb7817d7dbd58e4d6c2ad SHA256 45136634e181e9d00b0af502941bdc7dca5739252973dc2aa37596cdf0bea733
+MD5 fc2d9db9425520320477815b770c00a4 festival-1.95_beta.ebuild 5190
+RMD160 ae2f15494687e0349636128af8e2698dfd7ddadc festival-1.95_beta.ebuild 5190
+SHA256 45136634e181e9d00b0af502941bdc7dca5739252973dc2aa37596cdf0bea733 festival-1.95_beta.ebuild 5190
+MISC ChangeLog 9692 RMD160 13796f982df6d1f7cc1417d42ba3f9f1c5660a10 SHA1 d17435948ec439344db3394cf9a63f3b407e98f5 SHA256 9957e77348b093887ed550932a5f7deff088ebe958225eecc6aa126da6fa0ddd
+MD5 ed988a9461d039e8500898b738e25f68 ChangeLog 9692
+RMD160 13796f982df6d1f7cc1417d42ba3f9f1c5660a10 ChangeLog 9692
+SHA256 9957e77348b093887ed550932a5f7deff088ebe958225eecc6aa126da6fa0ddd ChangeLog 9692
 MISC metadata.xml 248 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 SHA1 bdd70f0d466d7bea88716581054941113ce22a16 SHA256 b40271c6a99e7610d9df3544a98da28417f406b82a48b04f1a8a9bb474cd04cc
 MD5 dd298b30a3c1071fdfd33569480dcfd3 metadata.xml 248
 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 metadata.xml 248
diff --git a/app-accessibility/festival/festival-1.95_beta.ebuild b/app-accessibility/festival/festival-1.95_beta.ebuild
index 6d7ede031cff..9f9340dec613 100644
--- a/app-accessibility/festival/festival-1.95_beta.ebuild
+++ b/app-accessibility/festival/festival-1.95_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta.ebuild,v 1.3 2006/07/20 03:51:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta.ebuild,v 1.4 2006/08/08 23:54:38 williamh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -58,7 +58,10 @@ src_unpack() {
 
 	# gcc 4.1 compatibility patches
 	epatch ${FILESDIR}/${P}-gcc41.patch
-	use amd64 && epatch ${FILESDIR}/${P}-gcc41-amd64.patch
+	if use amd64; then
+		epatch ${FILESDIR}/${P}-gcc41-amd64.patch
+		epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
+	fi
 }
 
 src_compile() {
diff --git a/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64-int-pointer.patch b/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64-int-pointer.patch
new file mode 100644
index 000000000000..25f162012fa1
--- /dev/null
+++ b/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64-int-pointer.patch
@@ -0,0 +1,359 @@
+--- speech_tools/include/EST_simplestats.h	2006/07/21 02:18:39	1.1
++++ speech_tools/include/EST_simplestats.h	2006/07/21 02:35:43
+@@ -194,7 +194,7 @@ enum EST_tprob_type {tprob_string, tprob
+     for example
+     \begin{verbatim}
+        EST_DiscreteProbistribution pdf;
+-       for (int i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
++       for (long i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
+        {
+           EST_String name;
+           double prob;
+@@ -265,17 +265,17 @@ public:
+     /// 
+     double frequency(const int i) const; 
+     /// Used for iterating through members of the distribution
+-    int item_start() const;
++    long item_start() const;
+     /// Used for iterating through members of the distribution
+-    int item_next(int idx) const;
++    long item_next(long idx) const;
+     /// Used for iterating through members of the distribution
+-    int item_end(int idx) const;
++    int item_end(long idx) const;
+     /// During iteration returns name given index 
+-    const EST_String &item_name(int idx) const;
++    const EST_String &item_name(long idx) const;
+     /// During iteration returns name and frequency given index  
+-    void item_freq(int idx,EST_String &s,double &freq) const;
++    void item_freq(long idx,EST_String &s,double &freq) const;
+     /// During iteration returns name and probability given index
+-    void item_prob(int idx,EST_String &s,double &prob) const;
++    void item_prob(long idx,EST_String &s,double &prob) const;
+ 
+     /// Returns discrete vocabulary of distribution
+     inline const EST_Discrete *const get_discrete() const { return discrete; };
+--- speech_tools/stats/wagon/wagon_aux.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/stats/wagon/wagon_aux.cc	2006/07/21 02:36:09
+@@ -537,7 +537,7 @@ ostream & operator <<(ostream &s, WImpur
+     }
+     else if (imp.t == wnim_class)
+     {
+-	int i;
++	long i;
+ 	EST_String name;
+ 	double prob;
+ 
+--- speech_tools/stats/EST_DProbDist.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/stats/EST_DProbDist.cc	2006/07/21 02:41:32
+@@ -305,15 +305,15 @@ double EST_DiscreteProbDistribution::ent
+ }
+ 
+ //  For iterating through members of a probability distribution
+-int EST_DiscreteProbDistribution::item_start(void) const
++long EST_DiscreteProbDistribution::item_start(void) const
+ {
+     if (type == tprob_discrete)
+ 	return 0;
+     else
+-	return (int)scounts.list.head();
++	return (long)scounts.list.head();
+ }
+ 
+-int EST_DiscreteProbDistribution::item_end(int idx) const
++int EST_DiscreteProbDistribution::item_end(long idx) const
+ {
+     if (type == tprob_discrete)
+ 	return (idx >= icounts.length());
+@@ -321,15 +321,15 @@ int EST_DiscreteProbDistribution::item_e
+ 	return ((EST_Litem *)idx == 0);
+ }
+ 
+-int EST_DiscreteProbDistribution::item_next(int idx) const
++long EST_DiscreteProbDistribution::item_next(long idx) const
+ {
+     if (type == tprob_discrete)
+ 	return ++idx;
+     else
+-	return (int)next((EST_Litem *)idx);
++	return (long)next((EST_Litem *)idx);
+ }
+ 
+-const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
++const EST_String &EST_DiscreteProbDistribution::item_name(long idx) const
+ {
+     if (type == tprob_discrete)
+ 	return discrete->name(idx);
+@@ -337,7 +337,7 @@ const EST_String &EST_DiscreteProbDistri
+ 	return scounts.list((EST_Litem *)idx).k;
+ }
+ 
+-void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const
++void EST_DiscreteProbDistribution::item_freq(long idx,EST_String &s,double &freq) const
+ {
+     if (type == tprob_discrete)
+     {
+@@ -351,7 +351,7 @@ void EST_DiscreteProbDistribution::item_
+     }
+ }
+ 
+-void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const
++void EST_DiscreteProbDistribution::item_prob(long idx,EST_String &s,double &prob) const
+ {
+     if (type == tprob_discrete)
+     {
+@@ -368,7 +368,7 @@ void EST_DiscreteProbDistribution::item_
+ ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
+ {
+     // Output best with probabilities
+-    int i;
++    long i;
+     double prob;
+     double sum=0;
+     EST_String name;
+--- speech_tools/grammar/ngram/EST_Ngrammar.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/grammar/ngram/EST_Ngrammar.cc	2006/07/21 02:38:54
+@@ -180,7 +180,7 @@ bool EST_BackoffNgrammarState::accumulat
+ 					  const double count)
+ {
+ 
+-//    int i;
++//    long i;
+ //    cerr << "accumulate level " << p_level << " : ";
+ //    for(i=0;i<words.n();i++)
+ //    {
+@@ -302,7 +302,7 @@ void EST_BackoffNgrammarState::print_fre
+     // not right - just print out, then recurse through children
+     // change to use 'backoff_traverse'
+     
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+     for (k=p_pdf.item_start();
+@@ -369,7 +369,7 @@ void EST_BackoffNgrammarState::zap()
+ {
+ 
+     // recursively delete this state and all its children
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+     for (k=p_pdf.item_start();
+@@ -452,7 +452,7 @@ bool EST_BackoffNgrammarState::set_backo
+ 
+ void EST_BackoffNgrammarState::frequency_of_frequencies(EST_DVector &ff)
+ {
+-    int k,max=ff.n();
++    long k; int max=ff.n();
+     double freq;
+     EST_String name;
+     for (k=p_pdf.item_start();
+@@ -911,7 +911,7 @@ void EST_Ngrammar::accumulate(const EST_
+ {
+     
+     /*
+-       int i;
++       long i;
+        for(i=0;i<words.n();i++)
+        {
+        cerr << vocab_pdf.item_name(words(i));
+@@ -1581,7 +1581,7 @@ void EST_Ngrammar::prune_backoff_represe
+     // remove any branches with zero frequency count
+     
+     // find children of this state with zero freq and zap them
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+     for (k=start_state->pdf_const().item_start();
+@@ -2320,7 +2320,7 @@ void EST_Ngrammar::print_freqs(ostream &
+ 	backoff_representation->print_freqs(os,p_order);
+     else
+     {
+-	int i,j,k;
++	int i,j; long k;
+ 	EST_IVector window(p_order-1);
+ 	
+ 	for (i=0; i < p_num_states; i++)
+@@ -2661,7 +2661,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
+     function(start_state,params);
+     
+     // and recurse down the tree
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+     for (k=start_state->pdf_const().item_start();
+@@ -2692,7 +2692,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
+     {
+ 	// and recurse down the tree if we haven't
+ 	// reached the level yet
+-	int k;
++	long k;
+ 	double freq;
+ 	EST_String name;
+ 	
+--- speech_tools/grammar/ngram/ngrammar_io.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/grammar/ngram/ngrammar_io.cc	2006/07/21 02:39:05
+@@ -281,7 +281,7 @@ EST_read_status 
+ load_ngram_cstr_bin(const EST_String filename, EST_Ngrammar &n)
+ {
+     EST_TokenStream ts;
+-    int i,j,k,order;
++    int i,j,order; long k;
+     int num_entries;
+     double approx_num_samples = 0.0;
+     long freq_data_start, freq_data_end;
+@@ -407,7 +407,7 @@ EST_write_status
+ save_ngram_htk_ascii_sub(const EST_String &word, ostream *ost, 
+ 			 EST_Ngrammar &n, double floor)
+ {
+-    int k;
++    long k;
+     EST_String name;
+     double freq;
+     EST_StrVector this_ngram(2); // assumes bigram
+@@ -734,7 +734,7 @@ save_ngram_cstr_ascii(const EST_String f
+     // awb's format
+     (void)trace;
+     ostream *ost;
+-    int i,k;
++    int i; long k;
+     
+     if (filename == "-")
+ 	ost = &cout;
+@@ -831,7 +831,7 @@ save_ngram_cstr_bin(const EST_String fil
+     if (n.representation() == EST_Ngrammar::sparse)
+ 	return misc_write_error;
+     
+-    int i,k;
++    int i; long k;
+     FILE *ofd;
+     double lfreq = -1;
+     double count = -1;
+--- speech_tools/grammar/ngram/ngrammar_aux.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/grammar/ngram/ngrammar_aux.cc	2006/07/21 02:39:20
+@@ -117,7 +117,7 @@ smooth_ExponentialFit(EST_DVector &N, in
+ 
+ void make_f_of_f(EST_BackoffNgrammarState *s,void *params)
+ {
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+ 
+@@ -138,7 +138,7 @@ void make_f_of_f(EST_BackoffNgrammarStat
+ 
+ void get_max_f(EST_BackoffNgrammarState *s,void *params)
+ {
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+ 
+@@ -158,7 +158,7 @@ void get_max_f(EST_BackoffNgrammarState 
+ 
+ void map_f_of_f(EST_BackoffNgrammarState *s,void *params)
+ {
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+ 
+@@ -184,7 +184,7 @@ void map_f_of_f(EST_BackoffNgrammarState
+ 
+ void zero_small_f(EST_BackoffNgrammarState *s,void *params)
+ {
+-    int k;
++    long k;
+     double freq;
+     EST_String name;
+ 
+@@ -204,7 +204,7 @@ void zero_small_f(EST_BackoffNgrammarSta
+ 
+ void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order)
+ {
+-  int i,k,size;
++  int i,size; long k;
+   double max=0.0;
+ 
+   // if ff has zero size, do complete frequency of frequencies
+@@ -302,7 +302,7 @@ void frequency_of_frequencies(EST_DVecto
+ 
+ void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order)
+ {
+-  int i,k;
++  int i; long k;
+ 
+ 
+   switch(n.representation())
+--- speech_tools/grammar/ngram/EST_PST.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/grammar/ngram/EST_PST.cc	2006/07/21 02:39:31
+@@ -71,7 +71,7 @@ EST_PredictionSuffixTree_tree_node::prin
+ 	// Base -- print from pd 
+ 	EST_String s;
+ 	double freq;
+-	for (int i = pd.item_start(); 
++	for (long i = pd.item_start(); 
+ 	     !pd.item_end(i); 
+ 	     i=pd.item_next(i))
+ 	{
+@@ -98,7 +98,7 @@ EST_PredictionSuffixTree_tree_node::prin
+ 	EST_String s;
+ 	double prob;
+ 	os << get_path() << " :";
+-	for (int i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
++	for (long i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
+ 	{
+ 	    pd.item_prob(i,s,prob);
+ 	    os << " " << s << " " << prob;
+--- speech_tools/grammar/ngram/freqsmooth.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/grammar/ngram/freqsmooth.cc	2006/07/21 02:46:42
+@@ -74,7 +74,7 @@ void fs_build_backoff_ngrams(EST_Ngramma
+ 				 EST_Ngrammar &ngram)
+ {
+     // Build all the backoff grammars back to uni-grams
+-    int i,j,k,l;
++    int i,j,l; long k;
+ 
+     for (i=0; i < ngram.order()-1; i++)
+ 	backoff_ngrams[i].init(i+1,EST_Ngrammar::dense,
+@@ -110,7 +110,7 @@ int fs_backoff_smooth(EST_Ngrammar *back
+ {
+     // For all ngrams which are too infrequent, adjust their
+     // frequencies based on their backoff probabilities
+-    int i,j;
++    int i; long j;
+     double occurs;
+     double backoff_prob;
+ 
+--- speech_tools/grammar/wfst/wfst_train.cc	2006/07/21 02:18:39	1.1
++++ speech_tools/grammar/wfst/wfst_train.cc	2006/07/21 02:39:47
+@@ -299,7 +299,7 @@ static LISP find_best_split(EST_WFST &wf
+     LISP *ssplits;
+     gc_protect(&splits);
+     EST_String sname;
+-    int b,best_b,i;
++    int b,best_b; long i;
+     int num_pdfs;
+     double best_score, score, sfreq;
+ 
+@@ -374,7 +374,7 @@ static double score_pdf_combine(EST_Disc
+     // Find score of (a+b) vs (all-(a+b))
+     EST_DiscreteProbDistribution ab(a);
+     EST_DiscreteProbDistribution all_but_ab(all);
+-    int i;
++    long i;
+     EST_String sname;
+     double sfreq, score;
+     for (i=b.item_start(); !b.item_end(i);
+@@ -506,7 +506,7 @@ static double find_score_if_split(EST_WF
+     EST_DiscreteProbDistribution pdf_split(&wfst.in_symbols());
+     EST_DiscreteProbDistribution pdf_remain(&wfst.in_symbols());
+     int in, tostate, id;
+-    int i;
++    long i;
+     double sfreq;
+     EST_String sname;
+