[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-os/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-os/

[David Seifert]

commit:     d452f3c397f3fdaacd4f382458c14da3aab10e1e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 17:08:37 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 17:09:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d452f3c3

sci-libs/coinor-os: Remove old ebuild

Package-Manager: portage-2.3.1

 sci-libs/coinor-os/Manifest               |  1 -
 sci-libs/coinor-os/coinor-os-2.8.3.ebuild | 62 -------------------------------
 2 files changed, 63 deletions(-)

diff --git a/sci-libs/coinor-os/Manifest b/sci-libs/coinor-os/Manifest
index f6678ca..a0e27fe 100644
--- a/sci-libs/coinor-os/Manifest
+++ b/sci-libs/coinor-os/Manifest
@@ -1,2 +1 @@
 DIST OS-2.10.1.tgz 37106742 SHA256 3db70a66f4b764e3ec7d43a58982098d80d5d7470825ff9dc029da1806c59b05 SHA512 bfc0af075e0db2160db694ec1e6f69c36cd52b29449fcbd689c809db01a9cf5f6a8a59edb7fb7269db5757faa14da5cd9fef34dffc73de7b2953b35fc2b710f0 WHIRLPOOL bd8f0ad49097ed7816ea24aa86db2d28df29734dbf7a8bacc9d4254f3ea52520a4010079d554f4bc500a9dcba468b470e0fe19c27b20c844e5bf7fde7774f89d
-DIST OS-2.8.3.tgz 36046350 SHA256 45dbedbaf0db850a62d50351e1b855c529edcb627ed4ddea0011afbfc72e4da3 SHA512 33812e4ae12862bb44d0cb7e2210d418ce8fe705988364ee0622fc5aef04491e6675447bcac379a16add15ec4d123d853a5940ce1244a5767f1587c09b435078 WHIRLPOOL 8e802db5d0faf17e11cc11e5768c581b5b686fdea0db9668c6631a3a90aa9d71eb9f684bcfbba8dbdcc66d88ebf9367b8ce86e6c139cd640faf6d90673ab8d6e

diff --git a/sci-libs/coinor-os/coinor-os-2.8.3.ebuild b/sci-libs/coinor-os/coinor-os-2.8.3.ebuild
deleted file mode 100644
index 1195488..00000000
--- a/sci-libs/coinor-os/coinor-os-2.8.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils multilib flag-o-matic
-
-MYPN=OS
-
-DESCRIPTION="COIN-OR Optimization Services"
-HOMEPAGE="https://projects.coin-or.org/OS/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${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}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	append-cppflags -DNDEBUG
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc doc/*.pdf
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-os/

[Sam James]

commit:     affa9e263c66472d917f46bc2129054e0d6fdcee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 21:10:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 21:11:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affa9e26

sci-libs/coinor-os: workaround build failure with GCC 11

Not backporting the patches given they're large and awkward
to rebase (they don't apply cleanly).

Closes: https://bugs.gentoo.org/808793
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/coinor-os/coinor-os-2.10.1.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
index 2093e3961b6..792b443c5d9 100644
--- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
+++ b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ 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"
+S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
 
 LICENSE="EPL-1.0"
 SLOT="0/6"
@@ -32,9 +33,9 @@ DEPEND="${RDEPEND}
 	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" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10.1-fix-c++14.patch"
+)
 
 src_prepare() {
 	default
@@ -46,6 +47,11 @@ src_prepare() {
 src_configure() {
 	append-cppflags -DNDEBUG
 
+	# Can be dropped > 2.10.3 as patches landed upstream but don't
+	# apply cleanly to 2.10.1.
+	# bug #808793
+	append-cxxflags -std=c++14
+
 	econf \
 		--enable-shared \
 		$(use_enable static-libs static) \