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

[Aaron Bauman]

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

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

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  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..000
--- 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.0 +0100
-+++ ColPack-1.0.6/Makefile.am  2012-04-13 03:30:35.0 +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..000
--- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Sebastien Fabbro 
-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..000
--- 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?= 
-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: \""< &ListOf
-   }
- }
-   }
--  
-   }
- }
-   }
-@@ -1483,4 +1482,3 @@ int 
DisplayADICFormat_Value(std::list > &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..000
--- 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
-+  {
-   

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

[David Seifert]

commit: 968e6a0bcb47baa93568b213a8f4bf5bfd2d2183
Author: David Seifert  gentoo  org>
AuthorDate: Wed Sep 28 22:47:12 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 28 22:51:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968e6a0b

sci-libs/colpack: Allow for compiling with GCC 6

Gentoo-bug: 594388
* EAPI=6
* Delete .la files when USE="-static-libs"

Package-Manager: portage-2.3.1

 sci-libs/colpack/colpack-1.0.9-r1.ebuild   | 57 +
 sci-libs/colpack/files/colpack-1.0.8-no-bin.patch  |  4 +-
 .../colpack/files/colpack-1.0.9-fix-c++14.patch| 71 ++
 3 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/sci-libs/colpack/colpack-1.0.9-r1.ebuild 
b/sci-libs/colpack/colpack-1.0.9-r1.ebuild
new file mode 100644
index ..d2555c3
--- /dev/null
+++ b/sci-libs/colpack/colpack-1.0.9-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+MY_PN="ColPack"
+
+DESCRIPTION="C++ algorithms for specialized vertex coloring problems"
+LICENSE="GPL-3 LGPL-3"
+HOMEPAGE="http://www.cscapes.org/coloringpage/software.htm";
+SRC_URI="http://cscapes.cs.purdue.edu/download/${MY_PN}/${MY_PN}-${PV}.tar.gz";
+
+SLOT="0"
+IUSE="openmp static-libs"
+KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.0.6-flags.patch"
+   "${FILESDIR}/${PN}-1.0.8-no-bin.patch"
+   "${FILESDIR}/${PN}-1.0.9-fix_gcc49_omp.patch"
+   "${FILESDIR}/${PN}-1.0.9-fix-c++14.patch"
+)
+
+pkg_setup() {
+   if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+   ewarn "You are using gcc without OpenMP"
+   die "Need an OpenMP capable compiler"
+   fi
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable openmp)
+}
+
+src_install() {
+   default
+
+   if ! use static-libs; then
+   find "${D}" -name '*.la' -delete || die
+   fi
+}

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
index f2400d6..e9230b0 100644
--- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
+++ b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
@@ -1,8 +1,8 @@
 From: Sebastien Fabbro 
 Avoid installing the ColPack binary on an absolute path
 
 Makefile.am2012-03-20 21:37:34.0 -0700
-+++ Makefile.am2012-09-17 14:24:02.168309078 -0700
+--- a/Makefile.am
 b/Makefile.am
 @@ -17,8 +17,7 @@
  LDADD = libColPack.la
  AM_DEFAULT_SOURCE_EXT = .cpp

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
new file mode 100644
index ..7076be5
--- /dev/null
+++ b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch
@@ -0,0 +1,71 @@
+From 44851d9e90d9847fbfeaaea7b0ed1e7c3d093dcb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= 
+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: \""< &ListOf
+   }
+ }
+   }
+-  
+   }
+ }
+   }
+@@ -1483,4 +1482,3 @@ int 
DisplayADICFormat_Value(std::list > &lvd_Value) {
+ }
+ 
+ #endif
+-