--- /dev/null
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN=OS
+
+DESCRIPTION="COIN-OR Optimization Services"
+HOMEPAGE="https://projects.coin-or.org/OS/"
+SRC_URI="http://www.coin-or.org/download/source/${MY_PN}/${MY_PN}-${PV}.tgz"
+
+LICENSE="EPL-1.0"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+
+RDEPEND="
+ sci-libs/coinor-bcp:=
+ sci-libs/coinor-bonmin:=
+ sci-libs/coinor-couenne:=
+ sci-libs/coinor-clp:=
+ sci-libs/coinor-dylp:=
+ sci-libs/coinor-symphony:=
+ sci-libs/coinor-utils:=
+ sci-libs/coinor-vol:=
+ sci-libs/ipopt:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+ test? ( sci-libs/coinor-sample )"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch" )
+
+src_prepare() {
+ default
+
+ # needed for the --with-coin-instdir
+ dodir /usr
+}
+
+src_configure() {
+ append-cppflags -DNDEBUG
+
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --enable-dependency-linking \
+ --with-coin-instdir="${ED%/}"/usr
+}
+
+src_install() {
+ default
+ use doc && dodoc doc/*.pdf
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+}
--- /dev/null
+Fix building with C++14, which errors out due to bool -> T* conversions
+and changed semantics caught by -Werror=terminate.
+
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594180
+Patch partially taken from: https://projects.coin-or.org/OS/changeset/5137/
+
+--- a/src/OSCommonInterfaces/OSInstance.cpp
++++ b/src/OSCommonInterfaces/OSInstance.cpp
+@@ -165,6 +165,9 @@
+ }\r
+ \r
+ OSInstance::~OSInstance()\r
++#if __cplusplus >= 201103L\r
++ noexcept(false)\r
++#endif\r
+ {\r
+ std::ostringstream outStr;\r
+ \r
+--- a/src/OSCommonInterfaces/OSInstance.h
++++ b/src/OSCommonInterfaces/OSInstance.h
+@@ -2267,7 +2267,11 @@
+ OSInstance();\r
+ \r
+ /** The OSInstance class destructor */\r
+- ~OSInstance();\r
++ ~OSInstance()\r
++#if __cplusplus >= 201103L\r
++ noexcept(false)\r
++#endif\r
++ ;\r
+ \r
+ /** the instanceHeader is implemented as a general file header object \r
+ * to allow sharing of classes between schemas \r
+--- a/src/OSCommonInterfaces/OSMatrix.cpp
++++ b/src/OSCommonInterfaces/OSMatrix.cpp
+@@ -2297,7 +2297,7 @@
+
+ if (!processBlocks(rowPartition, rowPartitionSize,
+ colPartition, colPartitionSize, false, symmetry))
+- return false;
++ return NULL;
+ return ExpandedMatrixByBlocks.back();
+ }// end of MatrixType::getBlocks
+
+--- a/src/OSParsers/OSParseosil.tab.cpp
++++ b/src/OSParsers/OSParseosil.tab.cpp
+@@ -180,7 +180,7 @@
+
+ #define GETATTRIBUTETEXT \
+ for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \
+- if( *ch != '=') { osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return false;} \
++ if( *ch != '=') { osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return NULL;} \
+ ch++; \
+ for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \
+ if(*ch == '\"'){ \
+@@ -196,7 +196,7 @@
+ *p = ch; \
+ for( ; *ch != '\''; ch++); \
+ } \
+- else { osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return false;} \
++ else { osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return NULL;} \
+ }\
+ numChar = ch - *p; \
+ attText = new char[numChar + 1]; \
+@@ -11070,7 +11070,7 @@
+ // eat the white space
+ for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
+ for(i = 0; sizeOf[i] == *ch; i++, ch++);
+- if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return false;}
++ if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return NULL;}
+ // ch should be pointing to the first character after sizeOf
+ GETATTRIBUTETEXT;
+ ch++;
+@@ -11080,7 +11080,7 @@
+ // eat the white space
+ for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
+ // better have an > sign or not valid
+- if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return false;}
++ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return NULL;}
+ ch++;
+ // we are now pointing start of the data
+ const char *b64textstart = ch;
+@@ -11089,7 +11089,7 @@
+ const char *b64textend = ch;
+ // we should be pointing to </base64BinaryData>
+ for(i = 0; endBase64BinaryData[i] == *ch; i++, ch++);
+- if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return false;}
++ if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return NULL;}
+ int b64len = b64textend - b64textstart;
+ b64string = new char[ b64len + 1];
+ for(ki = 0; ki < b64len; ki++) b64string[ki] = b64textstart[ ki];
+@@ -11097,7 +11097,7 @@
+ // burn the white space
+ for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
+ // better have an > sign or not valid
+- if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return false;}
++ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return NULL;}
+ ch++;
+ for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
+ *p = ch;
projects / gentoo.git / commitdiff