[gentoo-commits] proj/sci:master commit in: sci-libs/coinor-couenne/

[gentoo-commits] proj/sci:master commit in: sci-libs/coinor-couenne/

[Sebastien Fabbro]

commit:     698ecefbbe3d07005666b99325312c08ce211d9e
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Thu Jul 19 18:38:04 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 18:38:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=698ecefb

sci-libs/coinor-couenne: Initial import

(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/coinor-couenne/ChangeLog                  |    9 +++
 .../coinor-couenne/coinor-couenne-0.4.2.ebuild     |   65 ++++++++++++++++++++
 sci-libs/coinor-couenne/metadata.xml               |   12 ++++
 3 files changed, 86 insertions(+), 0 deletions(-)

diff --git a/sci-libs/coinor-couenne/ChangeLog b/sci-libs/coinor-couenne/ChangeLog
new file mode 100644
index 0000000..eaf936c
--- /dev/null
+++ b/sci-libs/coinor-couenne/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sci-libs/coinor-couenne
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*coinor-couenne-0.4.2 (19 Jul 2012)
+
+  19 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +coinor-couenne-0.4.2.ebuild, +metadata.xml:
+  sci-libs/coinor-couenne: Initial import

diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.4.2.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.4.2.ebuild
new file mode 100644
index 0000000..35588e9
--- /dev/null
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools-utils multilib
+
+MYPN=Couenne
+
+DESCRIPTION="COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation"
+HOMEPAGE="https://projects.coin-or.org/Couenne/"
+SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+RDEPEND="sci-libs/coinor-bonmin"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
+
+src_prepare() {
+	# as-needed fix
+	# hack to avoid eautoreconf (coinor has its own weird autotools)
+	sed -i \
+		-e 's:\(libBonCouenne_la_LIBADD.*=\).*:\1 $(top_builddir)/src/libCouenne.la:' \
+		src/main/Makefile.in || die
+
+	sed -i \
+		-e '/LINK/s/$(libCouenne_la_LIBADD)/@COUENNELIB_LIBS@ $(libCouenne_la_LIBADD)/' \
+		src/Makefile.in || die
+
+	# missing includes from Bonmin
+	ln -s ../../../Bonmin/src/Interfaces/BonExitCodes.hpp \
+		src/main/BonExitCodes.hpp
+	ln -s ../../../Bonmin/src/Algorithms/QuadCuts/BonLinearCutsGenerator.hpp \
+		src/main/BonLinearCutsGenerator.hpp
+}
+
+src_configure() {
+	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \
+		autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	# resolve as-needed
+	# circular dependencies between libCouenne and libBonCouenne :(
+	pushd ${AUTOTOOLS_BUILD_DIR}/src > /dev/null
+	rm libCouenne.la main/libBonCouenne.la || die
+	emake LIBS+="-Lmain/.libs -lBonCouenne" libCouenne.la
+	emake -C main
+	popd > /dev/null
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc doc/couenne-user-manual.pdf
+	# already installed
+	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
+}

diff --git a/sci-libs/coinor-couenne/metadata.xml b/sci-libs/coinor-couenne/metadata.xml
new file mode 100644
index 0000000..77cb214
--- /dev/null
+++ b/sci-libs/coinor-couenne/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  Couenne (Convex Over and Under ENvelopes for Nonlinear Estimation)
+  is a spatial branch and bound algorithm that implements linearization, bound
+  reduction, and branching techniques for Mixed-integer, Nonlinear
+  Programming (MINLP) problems. The purpose of Couenne is to find global
+  optima of nonconvex MINLPs.
+</longdescription>
+</pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sci-libs/coinor-couenne/

[Sebastien Fabbro]

commit:     f2df2464e15b5f723976fe01972cdd7bdca6e20a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 29 20:09:16 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 20:09:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f2df2464

sci-libs/coinor-couenne: Version bump

Package-Manager: portage-2.2.01.21688-prefix

---
 sci-libs/coinor-couenne/ChangeLog                  |    8 +++++++-
 ...ne-0.4.2.ebuild => coinor-couenne-0.4.3.ebuild} |    4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-libs/coinor-couenne/ChangeLog b/sci-libs/coinor-couenne/ChangeLog
index eaf936c..1ef49eb 100644
--- a/sci-libs/coinor-couenne/ChangeLog
+++ b/sci-libs/coinor-couenne/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/coinor-couenne
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*coinor-couenne-0.4.3 (29 Jan 2013)
+
+  29 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +coinor-couenne-0.4.3.ebuild, -coinor-couenne-0.4.2.ebuild:
+  sci-libs/coinor-couenne: Version bump
+
 *coinor-couenne-0.4.2 (19 Jul 2012)
 
   19 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.4.2.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.4.3.ebuild
similarity index 97%
rename from sci-libs/coinor-couenne/coinor-couenne-0.4.2.ebuild
rename to sci-libs/coinor-couenne/coinor-couenne-0.4.3.ebuild
index 35588e9..f2c9f9b 100644
--- a/sci-libs/coinor-couenne/coinor-couenne-0.4.2.ebuild
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit autotools-utils multilib
 

[gentoo-commits] proj/sci:master commit in: sci-libs/coinor-couenne/

[Sebastien Fabbro]

commit:     fd8117db18e69abd46fb7a954f51547b2989331d
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 18:33:37 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 18:33:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fd8117db

sci-libs/coinor-couenne: Version bump

Package-Manager: portage-2.2.7-prefix

---
 sci-libs/coinor-couenne/ChangeLog                                   | 6 ++++++
 .../{coinor-couenne-0.4.3.ebuild => coinor-couenne-0.4.6.ebuild}    | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/coinor-couenne/ChangeLog b/sci-libs/coinor-couenne/ChangeLog
index 1ef49eb..952b8b2 100644
--- a/sci-libs/coinor-couenne/ChangeLog
+++ b/sci-libs/coinor-couenne/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*coinor-couenne-0.4.6 (07 Dec 2013)
+
+  07 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +coinor-couenne-0.4.6.ebuild, -coinor-couenne-0.4.3.ebuild:
+  sci-libs/coinor-couenne: Version bump
+
 *coinor-couenne-0.4.3 (29 Jan 2013)
 
   29 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.4.3.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.4.6.ebuild
similarity index 86%
rename from sci-libs/coinor-couenne/coinor-couenne-0.4.3.ebuild
rename to sci-libs/coinor-couenne/coinor-couenne-0.4.6.ebuild
index bf1a92e..6f3b3d3 100644
--- a/sci-libs/coinor-couenne/coinor-couenne-0.4.3.ebuild
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.4.6.ebuild
@@ -33,12 +33,6 @@ src_prepare() {
 	sed -i \
 		-e '/LINK/s/$(libCouenne_la_LIBADD)/@COUENNELIB_LIBS@ $(libCouenne_la_LIBADD)/' \
 		src/Makefile.in || die
-
-	# missing includes from Bonmin
-	ln -s ../../../Bonmin/src/Interfaces/BonExitCodes.hpp \
-		src/main/BonExitCodes.hpp
-	ln -s ../../../Bonmin/src/Algorithms/QuadCuts/BonLinearCutsGenerator.hpp \
-		src/main/BonLinearCutsGenerator.hpp
 }
 
 src_configure() {