Fixed as-needed bug #500272

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 19 insertions, 11 deletions

diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index 39b013fae052..dbf6d218b560 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/lemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lemon/ChangeLog,v 1.5 2014/02/04 18:06:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lemon/ChangeLog,v 1.6 2014/02/04 18:19:49 bicatali Exp $
+
+*lemon-1.3-r2 (04 Feb 2014)
+
+  04 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/lemon-1.3-as-needed.patch, +lemon-1.3-r2.ebuild,
+  -files/lemon-1.3-underlinking.patch, -lemon-1.3-r1.ebuild, metadata.xml:
+  Fixed as-needed bug #500272
 
   04 Feb 2014; Justin Lecher <jlec@gentoo.org> metadata.xml:
   fix invalid USE, #500288
diff --git a/sci-libs/lemon/files/lemon-1.3-underlinking.patch b/sci-libs/lemon/files/lemon-1.3-as-needed.patch
index 94aa1960abfe..ab205e69a4fa 100644
--- a/sci-libs/lemon/files/lemon-1.3-underlinking.patch
+++ b/sci-libs/lemon/files/lemon-1.3-as-needed.patch
@@ -10,25 +10,25 @@ index b06e5c7..fa68aa8 100644
    SET(LEMON_HAVE_LP TRUE)
    SET(LEMON_HAVE_MIP TRUE)
    SET(LEMON_HAVE_GLPK TRUE)
-+  SET(LEMON_LP_LIBRARY ${GLPK_LIBRARY})
++  SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${GLPK_LIBRARIES})
  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})
++  SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${ILOG_LIBRARIES})
  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})
++  SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${COIN_LIBRARIES})
  ENDIF(COIN_FOUND)
  IF(SOPLEX_FOUND)
    SET(LEMON_HAVE_LP TRUE)
    SET(LEMON_HAVE_SOPLEX TRUE)
-+  SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
++  SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${COIN_LIBRARIES})
  ENDIF(SOPLEX_FOUND)
  
  IF(ILOG_FOUND)
@@ -40,7 +40,7 @@ index 8011833..2487345 100644
    SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
  ENDIF()
  
-+TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARY})
++TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARIES})
 +
  INSTALL(
    TARGETS lemon
diff --git a/sci-libs/lemon/lemon-1.3-r1.ebuild b/sci-libs/lemon/lemon-1.3-r2.ebuild
index 84b845c5e1e2..5d01d6bfa850 100644
--- a/sci-libs/lemon/lemon-1.3-r1.ebuild
+++ b/sci-libs/lemon/lemon-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lemon/lemon-1.3-r1.ebuild,v 1.2 2014/01/15 20:12:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lemon/lemon-1.3-r2.ebuild,v 1.1 2014/02/04 18:19:49 bicatali Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+coin doc glpk static-libs test tools"
 
 RDEPEND="
-	glpk? ( sci-mathematics/glpk )
+	glpk? ( sci-mathematics/glpk:= )
 	coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= )"
 DEPEND="${RDEPEND}
 	doc? (
@@ -28,7 +28,7 @@ REQUIRED_USE="|| ( coin glpk )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-as-needed.patch
 )
 
 src_prepare() {
@@ -67,13 +67,12 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=TRUE
+		-DCOIN_ROOT_DIR="${EPREFIX}/usr"
 		-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
 		$(cmake-utils_use doc LEMON_DOC_SOURCE_BROWSER)
 		$(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
 }
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 97448dd67e8c..1a144a87e2f5 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -14,6 +14,8 @@
   networks.
 </longdescription>
 <use>
+  <flag name="coin">Enable the <pkg>coinor-clp</pkg> and
+  <pkg>coinor-cbc</pkg> graph algorithms</flag>
   <flag name='glpk'>Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
   <flag name="tools">Build additional tools</flag>