gentoo resync : 14.07.2018

1 files changed, 0 insertions, 44 deletions

diff --git a/app-text/bact/files/bact-0.13-cpp14.patch b/app-text/bact/files/bact-0.13-cpp14.patch
deleted file mode 100644
index fa083c223b12..000000000000
--- a/app-text/bact/files/bact-0.13-cpp14.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix C++14 compilation errors -- since C++11 make_pair<T1,T2> is resolved to
-make_pair(T1&&, T2&&). Types should be deduced.
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312
-
---- a/bact_classify.cpp
-+++ b/bact_classify.cpp
-@@ -86,7 +86,7 @@
- 	if (id == -2) continue;
- 	if (id != -1) {
- 	  if (userule) 
--	    rules.insert (std::make_pair <std::string, double> (item, alpha[id]));
-+	    rules.insert (std::make_pair(item, alpha[id]));
- 	  result.push_back (id);
- 	}
- 	project (item, size+1, newdepth, l, new_trie_pos, new_str_pos);
-@@ -138,7 +138,7 @@
-        if (id == -2) continue;
-        if (id >= 0) {
- 	 if (userule) 
--	   rules.insert (std::make_pair <std::string, double> (tree[i].val.key(), alpha[id]));
-+	   rules.insert (std::make_pair(tree[i].val.key(), alpha[id]));
- 	 result.push_back (id);
-        }
-        project (tree[i].val.key(), 1, 0, i, 0, 0);
-@@ -158,7 +158,7 @@
- 
-     for (std::map <std::string, double>::iterator it = rules.begin();
- 	 it != rules.end(); ++it) 
--      tmp.push_back (std::make_pair <std::string, double> (it->first,  it->second));
-+      tmp.push_back (std::make_pair(it->first,  it->second));
-       
-     std::sort (tmp.begin(), tmp.end(), pair_2nd_cmp<std::string, double>());
- 
---- a/bact_mkmodel.cpp
-+++ b/bact_mkmodel.cpp
-@@ -111,7 +111,7 @@
-    
-   for (std::map<std::string, double>::iterator it = rules.begin(); it != rules.end(); ++it) {
-     double a = it->second / alpha_sum;
--    ary2.push_back (std::make_pair <const char*, double>(it->first.c_str(), a));
-+    ary2.push_back (std::make_pair(it->first.c_str(), a));
-     ary.push_back  ((Darts::DoubleArray::key_type *)it->first.c_str());
-     alpha.push_back (a);
-   }