diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:12:20 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-01-15 20:12:20 +0000 |
| commit | b13c11eb48cf9f8c1d44937bd900ed35f467f0ae (patch) | |
| tree | bbc90bf933eace5df6b67ac84f344df2d0da9f5b /sci-libs/lemon | |
| parent | cleanup, as-needed applied upstream (diff) | |
| download | gentoo-2-b13c11eb48cf9f8c1d44937bd900ed35f467f0ae.tar.gz gentoo-2-b13c11eb48cf9f8c1d44937bd900ed35f467f0ae.tar.bz2 gentoo-2-b13c11eb48cf9f8c1d44937bd900ed35f467f0ae.zip | |
Re-added coin support, glpk flag
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs/lemon')
| -rw-r--r-- | sci-libs/lemon/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/lemon/lemon-1.3-r1.ebuild | 16 | ||||
| -rw-r--r-- | sci-libs/lemon/metadata.xml | 20 |
3 files changed, 26 insertions, 16 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/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> |