[gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/

["Justin Lecher" <jlec@gentoo.org>]

commit:     cc34418862edbf408417a0f44903e0b5789fc4d3
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 16:27:58 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 16:27:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cc344188

sci-libs/lemon: Import latest tree changes

Package-Manager: portage-2.2.8

---
 sci-libs/lemon/ChangeLog                           |  4 ++
 sci-libs/lemon/files/lemon-1.3-underlinking.patch  | 47 ++++++++++++++++++++++
 .../{lemon-1.3.ebuild => lemon-1.3-r1.ebuild}      |  7 +++-
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index f565264..da26d24 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jan 2014; Justin Lecher <jlec@gentoo.org> -lemon-1.3.ebuild,
+  +lemon-1.3-r1.ebuild, +files/lemon-1.3-underlinking.patch:
+  Import latest tree changes
+
   13 Jan 2014; Justin Lecher <jlec@gentoo.org> lemon-1.3.ebuild,
   +files/lemon-1.3-multilib.patch, metadata.xml:
   Fix for multilib-strict

diff --git a/sci-libs/lemon/files/lemon-1.3-underlinking.patch b/sci-libs/lemon/files/lemon-1.3-underlinking.patch
new file mode 100644
index 0000000..94aa196
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3-underlinking.patch
@@ -0,0 +1,47 @@
+ CMakeLists.txt       | 4 ++++
+ lemon/CMakeLists.txt | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b06e5c7..fa68aa8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,21 +84,25 @@ IF(GLPK_FOUND)
+   SET(LEMON_HAVE_LP TRUE)
+   SET(LEMON_HAVE_MIP TRUE)
+   SET(LEMON_HAVE_GLPK TRUE)
++  SET(LEMON_LP_LIBRARY ${GLPK_LIBRARY})
+ ENDIF(GLPK_FOUND)
+ IF(ILOG_FOUND)
+   SET(LEMON_HAVE_LP TRUE)
+   SET(LEMON_HAVE_MIP TRUE)
+   SET(LEMON_HAVE_CPLEX TRUE)
++  SET(LEMON_LP_LIBRARY ${ILOG_LIBRARY})
+ ENDIF(ILOG_FOUND)
+ IF(COIN_FOUND)
+   SET(LEMON_HAVE_LP TRUE)
+   SET(LEMON_HAVE_MIP TRUE)
+   SET(LEMON_HAVE_CLP TRUE)
+   SET(LEMON_HAVE_CBC TRUE)
++  SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
+ ENDIF(COIN_FOUND)
+ IF(SOPLEX_FOUND)
+   SET(LEMON_HAVE_LP TRUE)
+   SET(LEMON_HAVE_SOPLEX TRUE)
++  SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
+ ENDIF(SOPLEX_FOUND)
+ 
+ IF(ILOG_FOUND)
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 8011833..2487345 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -59,6 +59,8 @@ IF(UNIX)
+   SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
+ ENDIF()
+ 
++TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARY})
++
+ INSTALL(
+   TARGETS lemon
+   ARCHIVE DESTINATION lib

diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3-r1.ebuild
similarity index 92%
rename from sci-libs/lemon/lemon-1.3.ebuild
rename to sci-libs/lemon/lemon-1.3-r1.ebuild
index de536b1..076e37f 100644
--- a/sci-libs/lemon/lemon-1.3.ebuild
+++ b/sci-libs/lemon/lemon-1.3-r1.ebuild
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( coin glpk )"
 
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	)
 
 src_prepare() {
 	sed -i \
@@ -69,6 +72,8 @@ src_configure() {
 		$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
 		$(cmake-utils_use coin LEMON_ENABLE_COIN)
 		$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
+		-DLEMON_ENABLE_ILOG=NO
+		-DLEMON_ENABLE_SOPLEX=NO
 	)
 	cmake-utils_src_configure
 }