From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sci-libs/coinor-os/Manifest | 6 ++ sci-libs/coinor-os/coinor-os-2.10.1.ebuild | 61 +++++++++++++ .../files/coinor-os-2.10.1-fix-c++14.patch | 100 +++++++++++++++++++++ sci-libs/coinor-os/metadata.xml | 14 +++ 4 files changed, 181 insertions(+) create mode 100644 sci-libs/coinor-os/Manifest create mode 100644 sci-libs/coinor-os/coinor-os-2.10.1.ebuild create mode 100644 sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch create mode 100644 sci-libs/coinor-os/metadata.xml (limited to 'sci-libs/coinor-os') diff --git a/sci-libs/coinor-os/Manifest b/sci-libs/coinor-os/Manifest new file mode 100644 index 000000000000..93eec4b6e764 --- /dev/null +++ b/sci-libs/coinor-os/Manifest @@ -0,0 +1,6 @@ +AUX coinor-os-2.10.1-fix-c++14.patch 4301 SHA256 90bfec1bc7961b1a0beafbddf75bb0d690e3d645847decd29331fa7941de0501 SHA512 03f53d5a72ad7eef7305fcbd8ee7c07469c418f0e351b7bd84ccba5be0a0395aa5843d84fc7575f5a489a4632dafb651669ef56e760be4c50e69f6c45e24d96e WHIRLPOOL f7b63baea2d8ed104edf2cc278a1bee933fd8a783540f16d58c07e765e71fcadccfde3eb8bab4fb224988a2d4fcace44219ee10e39f403a4148c7c4e9292f5b6 +DIST OS-2.10.1.tgz 37106742 SHA256 3db70a66f4b764e3ec7d43a58982098d80d5d7470825ff9dc029da1806c59b05 SHA512 bfc0af075e0db2160db694ec1e6f69c36cd52b29449fcbd689c809db01a9cf5f6a8a59edb7fb7269db5757faa14da5cd9fef34dffc73de7b2953b35fc2b710f0 WHIRLPOOL bd8f0ad49097ed7816ea24aa86db2d28df29734dbf7a8bacc9d4254f3ea52520a4010079d554f4bc500a9dcba468b470e0fe19c27b20c844e5bf7fde7774f89d +EBUILD coinor-os-2.10.1.ebuild 1245 SHA256 c6863cd13ef67aa1be21784547ea5bd01a3537579f039fe10eb57f1cf722e59a SHA512 4acc7c0505fa7b46b3eb4f4977817b21da48f8154267d3283bf89180045e2547d98fbd6f96869dbb21f4eac48f1e4aa9a317363665e23ec35756826df7059f9e WHIRLPOOL 194db06ca6fc22959ce1c3d78c8359a832cbf380689f664e7779b57dd4d30a50dd4ea18da4820a33c32629c26aa160b7f79671035adc148aab6dd11939e6822a +MISC ChangeLog 2847 SHA256 c576fed7e63a610e812de60dfd8880164305853d4c0d38dfe9b25af44c11f0d1 SHA512 0fe71a33dce9767b2bca63b9e8d6421bbf928fd53347a9b11cd5f339a7a25212cb1a995068d2ff0154c43f781273561049d47f25e2ff81b95bb4512cf9f968ac WHIRLPOOL 1283508c07c5a7c272f37cc11bedd44f7867636912bf58ac9fcde3d6b12c5fbc9eb0dd15f189a1e355c0180bd5fa51ad866c8bd0e4c02fa463d9494420b6b2fa +MISC ChangeLog-2015 960 SHA256 8850a98bd54f8345b9be1faf4f423ab843d1c735bfa68de602037526699245cf SHA512 edb3ffb727f3ab6cc8e49ba03968f1817f5f4e73c6a8d5386250d8d812d94baad7b81f0a67ae6a06f48fe2ce8109741fa94dd1d85fc5564dcbb9a7b69035e4d4 WHIRLPOOL 77c176fa070bd9040fb665750453f2bf198fb80e68ea360a6f2d49b88503ab5732b1c512aaef0b75b85d53d39856c30f66b3377039bff43a0ad8e8b11518bdd6 +MISC metadata.xml 542 SHA256 e1a21084c412a8c2db7cb7c4f13f2f057896db04e9c9baf9ec5a3b18bce6fd53 SHA512 6a192caadd1aa4dd532ed2d8ddd17328564af52ffd6f1f9fec9f7eac7bd3f1cf593885e02b3b314d32e21263119883218842b906b51e312703af7603e291f531 WHIRLPOOL 51efd3d704cdad5e88db738a703ef81ed47abcd3bff165184f7e63263ce5c783c2bebce8b2a6b861eec352b73098d4a7ad0969ed21e7b8e9885faadb1c28fa9a diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild new file mode 100644 index 000000000000..ae0fb46a7469 --- /dev/null +++ b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 +} diff --git a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch b/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch new file mode 100644 index 000000000000..a788646abfe1 --- /dev/null +++ b/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch @@ -0,0 +1,100 @@ +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 @@ + } + + OSInstance::~OSInstance() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + std::ostringstream outStr; + +--- a/src/OSCommonInterfaces/OSInstance.h ++++ b/src/OSCommonInterfaces/OSInstance.h +@@ -2267,7 +2267,11 @@ + OSInstance(); + + /** The OSInstance class destructor */ +- ~OSInstance(); ++ ~OSInstance() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + /** the instanceHeader is implemented as a general file header object + * to allow sharing of classes between schemas +--- 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 element"); return false;} ++ if(i != 6) { osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in 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," element does not have a proper closing >"); return false;} ++ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno," 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 + for(i = 0; endBase64BinaryData[i] == *ch; i++, ch++); +- if(i != 18) { osilerror_wrapper( ch,osillineno," problem with element"); return false;} ++ if(i != 18) { osilerror_wrapper( ch,osillineno," problem with 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," element does not have a proper closing >"); return false;} ++ if(*ch != '>' ) { osilerror_wrapper( ch,osillineno," element does not have a proper closing >"); return NULL;} + ch++; + for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; + *p = ch; diff --git a/sci-libs/coinor-os/metadata.xml b/sci-libs/coinor-os/metadata.xml new file mode 100644 index 000000000000..3d6e1c008811 --- /dev/null +++ b/sci-libs/coinor-os/metadata.xml @@ -0,0 +1,14 @@ + + + + + sci@gentoo.org + Gentoo Science Project + + + The objective of Optimization Services (OS) is to provide a set of + standards for representing optimization instances, results, solver + options, and communication between clients and solvers in a + distributed environment using Web Services. + + -- cgit v1.2.3