Re-added coin support, glpk flag

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 33 insertions, 33 deletions

diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index 580b6af435a7..85f03b3f4eae 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -1,6 +1,10 @@
 # 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.2 2014/01/14 14:24:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lemon/ChangeLog,v 1.3 2014/01/15 20:12:20 bicatali Exp $
+
+  15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> lemon-1.3-r1.ebuild,
+  metadata.xml:
+  Re-added coin support, glpk flag
 
 *lemon-1.3-r1 (14 Jan 2014)
 
diff --git a/sci-libs/lemon/Manifest b/sci-libs/lemon/Manifest
index f81621e8d0ee..dbde48f267f7 100644
--- a/sci-libs/lemon/Manifest
+++ b/sci-libs/lemon/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX lemon-1.3-multilib.patch 437 SHA256 110fbd9a4e9fd23f6ad2edf89c27002cb0d3ea372e0df399f957963e2467bd19 SHA512 6efd7280070bae7bf7e62b28fb6a99e5f2190ddff75f8dd500a629c2a60908670c3ea19aeaf0086059ba9c3c7439e0c835811684dc1c2525c4f8a304a36bba8c WHIRLPOOL 2feb14b8b7ff54cd33cf5c96372480a5a935287ff673357c3f9e3d1fd7d22e18c9365f717ee3839a8a9945268b587a9479eba4d538631269877267207e4218e5
 AUX lemon-1.3-underlinking.patch 1240 SHA256 d016d71fb36cce256b1eb2b5cfe8118c312039ee14de6c685a93dca4ac91318b SHA512 5fa087948e51c2449aa94856393e44c452454e52511d5f7f6988c2c344eae215834b94de92e908240260339e9e8bdd116501139dd68d4d68528a91c690bad560 WHIRLPOOL ff0895286e7f38ed1c3874a90deb7fc0d9230c80a3f0119aa3499a2e2ab1b0db6113009d0560fc003414172bb116ea02fd02a9169d5f677dcd80d3f61aaf8947
 DIST lemon-1.3.tar.gz 5454290 SHA256 6c190dbb1e17bdb71597e79c409b2e798ffcbdb7d764ea45d6299339b12d3e05 SHA512 f48c14e42e0a463a3d203a05a012fdf635cf09503a5d18e14e64722e9f7f68d7fc223059e0a6a5d118491a473a25196d531e0a6302552f9fb8c121a4ed70af45 WHIRLPOOL 14325b538a27a8d46bc3840fa5687c8d286e7668e06f06c074417db245bc920b90f48825189b0e20858050b26676151a55bdb279bed4a0bccb133d9439435fad
-EBUILD lemon-1.3-r1.ebuild 1800 SHA256 fab6d5a2f43050d23eef00dae6ffcf5ff5c04a4eaa3828eda6a7f2bec343f0d6 SHA512 532375223692466d483d9e71fa97ae2c5b621004c9cbfd175a399aeb9e47454d937e31a4626607de64905dd29fef98d38debd6ba7e06d2ee7c125d3eb1ec99e7 WHIRLPOOL 84669e68e243dafe9b456632ecb76b151eef6360f6f9014143dabbe80b2153252e819cef65be034e978c7443f3a254cf7a1ec05f012c97898877bef701b3f155
-MISC ChangeLog 1646 SHA256 34e93d1e739c5c86a2d0f10911c194837eefb6e66b4daa53baac4ba528ac93ee SHA512 8106e31a8570e7b381a5e15e2336596f22bc0576b00caac1f80170c280073c4847a16c248d40e3d91c3d79b90f4211225991860e63ca4b5ad5167f58ba8756dc WHIRLPOOL 2d3e6032bcc3d2eeac3063112411b15f6d1c110fb067d498d285f36bd24a34eaea8dce72888f7ad04bd98ea3bc77ce45f35187cd6403a75c10769dd081cc6c9a
-MISC metadata.xml 661 SHA256 9a1d7377e643a0dfe628fd0ae42bab92095c34d0c03f8a0f6687bb5cd74d1ea0 SHA512 60fe79c8d42ce0efdf8e8f9c48130fcd128c06f3707cafba106566a69fab67825c2152b0c1c9a7aee4e8adf744f9bf9ab794640fd0c3e4af815abf22374578f1 WHIRLPOOL 487db36ccb040e95be0b18066fefe18d089d64f5afc313a3efde515f75b015b56c4eb7291094fa71c1a195835d585f68e42dafc4aa02c332623a6b25770caee2
+EBUILD lemon-1.3-r1.ebuild 1951 SHA256 1bcc130cad236e49f71f6463e33800eb4c20659e2fc4ed2694191f58270cf243 SHA512 90612dc70ad97ac2f3d6ce2b19ebe5b6fa5e42b8708dab23b04e1686d1b19c433ce8fe1a1fb744155310d7a21783fc0c264eeda3257f87cd69c05e6db3b75df7 WHIRLPOOL 5bd182d066aba1b6e506fe5db10677aa8aa1ad9ba6378646b6745c9834d00d5da339a617704ae32a48fa5a0d9a350f76dd1d745e090941fbeb79254e702b12b3
+MISC ChangeLog 1778 SHA256 60997141fd9eac2c7d2c1d7dbf6c315b76861e406d1253de7d9f6af482185449 SHA512 2e3e889d868609fa72e29184808da912801f87deb8de4c8021d294354a9fa0e1877fa9e34c5738ae6421897e0f0ed5d4da3589801bb965a6f11a48a68dd23c1e WHIRLPOOL c0b53373814397ba221c29b4a6ee934485c7218bb98b82caae4d2c9fcc9c5e050913390cb0a54f97c16418b767ee965449e640bbc42c13a63c0d28d420a7404f
+MISC metadata.xml 746 SHA256 949155d5b2d95a63b419eccf51446d934f50e239c5498d82bfb3142e2f5b6115 SHA512 e43fadf4e2f9e2e743a875de59d979a284544c5a1f69b05958704439c710b41a628c2a939d7dbd9b74fb4025c40c0737a7732d979bf22f40af49fd84e71e220d WHIRLPOOL f9fd16e22909f21039004459ba4aa1ff5a3e3fb38c49f28350eaa66c82dee22f2eb5012722c3133e474fb494d855c3782a026e84c4ef15d8627842722ab48c99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS1UiNAAoJELnU8jG9FVirkBMQAIFa5wK/3ekG9LlpEmuKXxdw
-sA72EPh/Ra/4FwPHnzb+uGO+eho9uYR1QScJwSrW9EWOE7a8PWE5A9qDvKzqPQL1
-a4CXr3KoI4qPnsyLh8ZZ4WvExAbGP0bt1r9MMInd6IO3vkwEn0dmw/VesXc2DXX4
-s8HzXIBLzQ86RiZgTHSoj/V2xLjKMbdL+vvjO/wCbRR+xe6Ie0RwqIyewn7xDUyC
-wkkg9N4VSEv4wwPvOwyYX0foWz2lNWRLneJWYHdOVM4Fl6xyqo5OHyucENmcF4NZ
-zsJFF+83Jdk5wQ36ROm03eokrfHLjxocWe6G9w3KO0DTvoSdYD7R44HSavJ9wM4B
-RWaeyg8G1xZoCjFgjKz1NXs1SJ/XYQC2y/JwtvWST3TzguWtx4r2FnDUPbi4T4mE
-v4b+OFcIXziZtI/EjxZWDOVoMC0RFFfzYO/Ixp+DJKedmqT39YsUx5JmYZ7OsVFB
-mnrSFt3mIFVuPoJXlKJ1g0vnOcKrPjjKTHTdwCNsuiN8YUqZqgGrqa6y/30tI1QO
-tdJyP2XlONbFn8e0X073IJ3uqlEifcuCSTlkgRke+kwvx5ubjpOHexB2w6B8LVF5
-h1i9/Qryw6WkQ51e8SV/sDaobYK3SzZXawPwZNyVINZvkul2hKEbyK92/m/Oj6oz
-2QW8CWbretuW6Qg2/bUg
-=S/Si
+iEYEAREIAAYFAlLW66UACgkQ1ycZbhPLE2DpJACaA4H/Rj+FDAVOWM+KGZN1ruAI
+YuYAn0ZzgFLBqiYW0BdlIqpqRLbc5sd5
+=ZlJw
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/lemon/lemon-1.3-r1.ebuild b/sci-libs/lemon/lemon-1.3-r1.ebuild
index d36299aaf623..84b845c5e1e2 100644
--- a/sci-libs/lemon/lemon-1.3-r1.ebuild
+++ b/sci-libs/lemon/lemon-1.3-r1.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.1 2014/01/14 14:24:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lemon/lemon-1.3-r1.ebuild,v 1.2 2014/01/15 20:12:20 bicatali Exp $
 
 EAPI=5
 
@@ -13,19 +13,23 @@ SRC_URI="http://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test tools"
+IUSE="+coin doc glpk static-libs test tools"
 
-RDEPEND="sci-mathematics/glpk"
+RDEPEND="
+	glpk? ( sci-mathematics/glpk )
+	coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= )"
 DEPEND="${RDEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		dev-libs/mathjax
 		app-doc/doxygen )"
 
+REQUIRED_USE="|| ( coin glpk )"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
 	"${FILESDIR}"/${P}-underlinking.patch
-	)
+)
 
 src_prepare() {
 	sed -i \
@@ -66,9 +70,9 @@ src_configure() {
 		-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
 		$(cmake-utils_use doc LEMON_DOC_SOURCE_BROWSER)
 		$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
-		-DLEMON_ENABLE_GLPK=YES
+		$(cmake-utils_use coin LEMON_ENABLE_COIN)
+		$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
 		-DLEMON_ENABLE_ILOG=NO
-		-DLEMON_ENABLE_COIN=NO
 		-DLEMON_ENABLE_SOPLEX=NO
 	)
 	cmake-utils_src_configure
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index e30bec58b862..b3fd5827bc6b 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>mmokrejs@fold.natur.cuni.cz</email>
-    <name>Martin Mokrejs</name>
-  </maintainer>
-  <longdescription>
+<herd>sci</herd>
+<maintainer>
+  <email>mmokrejs@fold.natur.cuni.cz</email>
+  <name>Martin Mokrejs</name>
+</maintainer>
+<longdescription>
   LEMON stands for Library for Efficient Modeling and Optimization in
   Networks. It is a C++ template library providing efficient
   implementations of common data structures and algorithms with focus
   on combinatorial optimization tasks connected mainly with graphs and
   networks.
 </longdescription>
-  <use>
-    <flag name="tools">Build additional tools</flag>
-  </use>
+<use>
+  <flag name='glpk'>Enable GNU Linear Programming Kit
+  <pkg>sci-mathematics/glpk</pkg> support</flag>
+  <flag name="tools">Build additional tools</flag>
+</use>
 </pkgmetadata>