[gentoo-commits] repo/gentoo:master commit in: sci-libs/colpack/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/colpack/files/

[Aaron Bauman]

commit:     bba0d17aa60092d38f1c1184517fa027c432408c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 25 12:40:39 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 22:08:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba0d17a

sci-libs/colpack: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sci-libs/colpack/files/colpack-1.0.6-flags.patch   | 10 ---
 sci-libs/colpack/files/colpack-1.0.8-no-bin.patch  | 15 -----
 .../colpack/files/colpack-1.0.9-fix-c++14.patch    | 71 ----------------------
 .../files/colpack-1.0.9-fix_gcc49_omp.patch        | 26 --------
 4 files changed, 122 deletions(-)

diff --git a/sci-libs/colpack/files/colpack-1.0.6-flags.patch b/sci-libs/colpack/files/colpack-1.0.6-flags.patch
deleted file mode 100644
index 6d4bb6a0d61..00000000000
--- a/sci-libs/colpack/files/colpack-1.0.6-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur ColPack-1.0.6.orig/Makefile.am ColPack-1.0.6/Makefile.am
---- ColPack-1.0.6.orig/Makefile.am	2012-04-13 03:25:37.000000000 +0100
-+++ ColPack-1.0.6/Makefile.am	2012-04-13 03:30:35.000000000 +0100
-@@ -1,5 +1,5 @@
- ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
--COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS)  -O5  
-+COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS)
- 
- INCLUDES =  $(COLPACK_COMMON_FLAGS) \
- 		-I$(top_srcdir)/Main \

diff --git a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
deleted file mode 100644
index e9230b0ff10..00000000000
--- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Sebastien Fabbro <bicatali@gentoo.org>
-Avoid installing the ColPack binary on an absolute path
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,8 +17,7 @@
- LDADD = libColPack.la
- AM_DEFAULT_SOURCE_EXT = .cpp
- 
--noinst_bin_PROGRAMS = ColPack
--noinst_bindir = $(abs_top_builddir)/progs
-+noinst_PROGRAMS = ColPack
- lib_LTLIBRARIES = libColPack.la
- pkginclude_HEADERS = \
- 			Utilities/CoutLock.h Utilities/command_line_parameter_processor.h  \

diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch
deleted file mode 100644
index 7076be5426a..00000000000
--- a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 44851d9e90d9847fbfeaaea7b0ed1e7c3d093dcb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@besser82.io>
-Date: Wed, 24 Feb 2016 23:26:20 +0100
-Subject: [PATCH] fix semantic errors in error-msgs
-
----
- Utilities/extra.cpp | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp
-index 21862e6..9f59263 100644
---- a/Utilities/extra.cpp
-+++ b/Utilities/extra.cpp
-@@ -49,7 +49,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
- 
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -84,7 +84,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_MatrixName = "pattern"+s_postfix+s_BaseName;
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
- 
-@@ -111,7 +111,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
-     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
-     if(!out_CompressedMatrix) {
--	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -140,7 +140,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_MatrixName = "pattern_value"+s_postfix+s_BaseName;
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
- 
-@@ -167,7 +167,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
-     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
-     if(!out_CompressedMatrix) {
--	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -671,7 +671,6 @@ int buildDotWithColor(ColPack::GraphColoringInterface &g, vector<string> &ListOf
- 	    }
- 	  }
- 	}
--	
-       }
-     }
-   }
-@@ -1483,4 +1482,3 @@ int DisplayADICFormat_Value(std::list<std::vector<double> > &lvd_Value) {
- }
- 
- #endif
--

diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch b/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch
deleted file mode 100644
index 0510be9f90e..00000000000
--- a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-===================================================================
---- ColPack-1.0.9.orig/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-+++ ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-@@ -388,8 +388,9 @@ namespace ColPack
- 					  if ( m_vi_LeftVertexColors [m_vi_Edges [x]] == m_vi_LeftVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) {
- 							//Algo 4 - Line 18: add [v] to R ; cont <- false; break
- #pragma omp critical
-+							{
- 							vi_verticesNeedNewColor.push_back(v);
--#pragma omp end critical
-+							}
- 							cont = false;
- 							break;
- 						}
-@@ -575,8 +576,9 @@ namespace ColPack
- 					  if ( m_vi_RightVertexColors [m_vi_Edges [x]] == m_vi_RightVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) {
- 							//Algo 4 - Line 18: add [v] to R ; cont <- false; break
- #pragma omp critical
-+							{
- 							vi_verticesNeedNewColor.push_back(v);
--#pragma omp end critical
-+							}
- 							cont = false;
- 							break;
- 						}