aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2013-07-17 12:01:48 -0700
committerSébastien Fabbro <bicatali@gentoo.org>2013-07-17 12:01:48 -0700
commit49435180151a6a5f0d731ebe013878a54f6799a5 (patch)
tree31ea5539ab2536f0e2e46dbaf8f4469f00225eba
parentsci-libs/superlu_dist: Spelling (diff)
downloadsci-49435180151a6a5f0d731ebe013878a54f6799a5.tar.gz
sci-49435180151a6a5f0d731ebe013878a54f6799a5.tar.bz2
sci-49435180151a6a5f0d731ebe013878a54f6799a5.zip
sci-libs/coinor-clp: Version bump
Package-Manager: portage-2.2.01.22124-prefix
-rw-r--r--sci-libs/coinor-clp/ChangeLog6
-rw-r--r--sci-libs/coinor-clp/Manifest2
-rw-r--r--sci-libs/coinor-clp/coinor-clp-1.15.2.ebuild (renamed from sci-libs/coinor-clp/coinor-clp-1.15.1.ebuild)1
-rw-r--r--sci-libs/coinor-clp/files/coinor-clp-1.15.1-mpi-header.patch12
4 files changed, 7 insertions, 14 deletions
diff --git a/sci-libs/coinor-clp/ChangeLog b/sci-libs/coinor-clp/ChangeLog
index 1d7d59e4b..c9eb70d8b 100644
--- a/sci-libs/coinor-clp/ChangeLog
+++ b/sci-libs/coinor-clp/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*coinor-clp-1.15.2 (17 Jul 2013)
+
+ 17 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +coinor-clp-1.15.2.ebuild,
+ -coinor-clp-1.15.1.ebuild, -files/coinor-clp-1.15.1-mpi-header.patch:
+ sci-libs/coinor-clp: Version bump
+
*coinor-clp-1.15.1 (19 Jun 2013)
19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +coinor-clp-1.15.1.ebuild,
diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index 116810cc2..d7b9317d3 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -1 +1 @@
-DIST Clp-1.15.1.tgz 5636624 SHA256 bd6ba2a0b96ff4bd91d8dad1ce1dfb60a730eae52eb9b9059d25effa4ec13b3d SHA512 59de666afc1143c621fed810c214c4f35e635f57bcade27c5be4da5844e6271f75e1df9a6ac6241ff374749a0607ccc8edc895cddfc26e5dbe8e73e88303deb8 WHIRLPOOL e0edeeec290549567308e17ec4bbb1ab7e48d27b31dd0defe324271850f134a7443e9351eedf259c762345adb8c0688021b149cbb2156ab767e06dcd7efff234
+DIST Clp-1.15.2.tgz 5640289 SHA256 b0d998d79149d7b4126068291c9e32403735df46253c7e8d9e5793c2d5d47549 SHA512 52f13ff77d10d776ac0ba7664259a8a9859e2fe80aa17bab8715711dc2e2266375b177978a154ff52498f30286f7f007b365fa890f851e1211e0c506504f7740 WHIRLPOOL 7b1be9736b737a84c0e735d62f5127ede1da56341f63fda08b05c340bf4c160d6cc06ef23fdb8ff121802e1c1479dc81d55f7271d22b3b91f1ae3db2f5312729
diff --git a/sci-libs/coinor-clp/coinor-clp-1.15.1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.15.2.ebuild
index a5630cb53..80d0e7b7a 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.15.1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.15.2.ebuild
@@ -39,7 +39,6 @@ src_prepare() {
sed -i \
-e 's:\(libClp_la_LIBADD.*=\).*:\1 @CLPLIB_LIBS@:g' \
src/Makefile.in || die
- epatch "${FILESDIR}"/${P}-mpi-header.patch
if has_version sci-libs/mumps[-mpi]; then
ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h src/mpi.h
elif has_version sci-libs/mumps[mpi]; then
diff --git a/sci-libs/coinor-clp/files/coinor-clp-1.15.1-mpi-header.patch b/sci-libs/coinor-clp/files/coinor-clp-1.15.1-mpi-header.patch
deleted file mode 100644
index 7ad03e8c7..000000000
--- a/sci-libs/coinor-clp/files/coinor-clp-1.15.1-mpi-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ClpCholeskyMumps.cpp.orig 2013-06-19 09:58:02.834485943 -0700
-+++ src/ClpCholeskyMumps.cpp 2013-06-19 09:57:39.013355095 -0700
-@@ -14,8 +14,8 @@
- #define USE_COMM_WORLD -987654
- extern "C" {
- #include "dmumps_c.h"
--#include "mpi.h"
- }
-+#include "mpi.h"
-
- #include "ClpCholeskyMumps.hpp"
- #include "ClpMessage.hpp"