From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 287BE1381F3 for ; Wed, 10 Jul 2013 20:57:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 133C4E08BD; Wed, 10 Jul 2013 20:57:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B545E08BD for ; Wed, 10 Jul 2013 20:57:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B62D33E6C3 for ; Wed, 10 Jul 2013 20:57:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E1EE7E468F for ; Wed, 10 Jul 2013 20:57:28 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1373489831.5fc4bebdff2229470164ccb26c3272b170f4d1b6.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/lemon/ChangeLog sci-libs/lemon/files/lemon-1.2.3-gcc47.patch sci-libs/lemon/lemon-1.2.3.ebuild sci-libs/lemon/metadata.xml X-VCS-Directories: sci-libs/lemon/files/ sci-libs/lemon/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 5fc4bebdff2229470164ccb26c3272b170f4d1b6 X-VCS-Branch: master Date: Wed, 10 Jul 2013 20:57:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ce11d721-f870-47d3-af79-5b4b1243fce0 X-Archives-Hash: 4778180983bd2d5b0e74c971c119132d commit: 5fc4bebdff2229470164ccb26c3272b170f4d1b6 Author: Sébastien Fabbro gentoo org> AuthorDate: Wed Jul 10 20:57:11 2013 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Wed Jul 10 20:57:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5fc4bebd sci-libs/lemon: Add patch for gcc-4.7. Install docs properly. Add coin and tools flags Package-Manager: portage-2.2.01.22120-prefix --- sci-libs/lemon/ChangeLog | 6 ++- sci-libs/lemon/files/lemon-1.2.3-gcc47.patch | 59 ++++++++++++++++++++++++++++ sci-libs/lemon/lemon-1.2.3.ebuild | 39 ++++++++++-------- sci-libs/lemon/metadata.xml | 21 +++++++--- 4 files changed, 102 insertions(+), 23 deletions(-) diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog index 34e0b9a..e49c34a 100644 --- a/sci-libs/lemon/ChangeLog +++ b/sci-libs/lemon/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Jul 2013; Sébastien Fabbro + +files/lemon-1.2.3-gcc47.patch, lemon-1.2.3.ebuild, metadata.xml: + sci-libs/lemon: Add patch for gcc-4.7. Install docs properly. Add coin and + tools flags + 03 Mar 2013; Justin Lecher lemon-1.2.3.ebuild, metadata.xml: Move to EAPI=5; sort *DEPEND correctly @@ -17,4 +22,3 @@ 02 Mar 2012; Martin Mokrejs +lemon-1.2.3.ebuild, +metadata.xml: initial and working ebuild - diff --git a/sci-libs/lemon/files/lemon-1.2.3-gcc47.patch b/sci-libs/lemon/files/lemon-1.2.3-gcc47.patch new file mode 100644 index 0000000..e165e32 --- /dev/null +++ b/sci-libs/lemon/files/lemon-1.2.3-gcc47.patch @@ -0,0 +1,59 @@ +diff -Nur lemon-1.2.3.orig/lemon/adaptors.h lemon-1.2.3/lemon/adaptors.h +--- lemon-1.2.3.orig/lemon/adaptors.h 2013-07-10 09:28:46.293503981 -0700 ++++ lemon-1.2.3/lemon/adaptors.h 2013-07-10 09:30:05.968962785 -0700 +@@ -1371,7 +1371,7 @@ + /// Creates a subgraph for the given graph with the given node + /// and edge filter maps. + SubGraph(GR& graph, NF& node_filter, EF& edge_filter) { +- initialize(graph, node_filter, edge_filter); ++ this->initialize(graph, node_filter, edge_filter); + } + + /// \brief Sets the status of the given node +@@ -2277,7 +2277,7 @@ + /// + /// Creates an undirected graph from the given digraph. + Undirector(DGR& digraph) { +- initialize(digraph); ++ this->initialize(digraph); + } + + /// \brief Arc map combined from two original arc maps +diff -Nur lemon-1.2.3.orig/lemon/bits/edge_set_extender.h lemon-1.2.3/lemon/bits/edge_set_extender.h +--- lemon-1.2.3.orig/lemon/bits/edge_set_extender.h 2013-07-10 09:28:46.293503981 -0700 ++++ lemon-1.2.3/lemon/bits/edge_set_extender.h 2013-07-10 09:32:23.647752824 -0700 +@@ -523,13 +523,13 @@ + // + // Returns the base node of the iterator + Node baseNode(const IncEdgeIt &e) const { +- return e.direction ? u(e) : v(e); ++ return e.direction ? this->u(e) : this->v(e); + } + // Running node of the iterator + // + // Returns the running node of the iterator + Node runningNode(const IncEdgeIt &e) const { +- return e.direction ? v(e) : u(e); ++ return e.direction ? this->v(e) : this->u(e); + } + + +diff -Nur lemon-1.2.3.orig/lemon/bits/graph_extender.h lemon-1.2.3/lemon/bits/graph_extender.h +--- lemon-1.2.3.orig/lemon/bits/graph_extender.h 2013-07-10 09:28:46.293503981 -0700 ++++ lemon-1.2.3/lemon/bits/graph_extender.h 2013-07-10 09:30:45.954190124 -0700 +@@ -587,13 +587,13 @@ + // + // Returns the base node of the iterator + Node baseNode(const IncEdgeIt &edge) const { +- return edge._direction ? u(edge) : v(edge); ++ return edge._direction ? this->u(edge) : this->v(edge); + } + // Running node of the iterator + // + // Returns the running node of the iterator + Node runningNode(const IncEdgeIt &edge) const { +- return edge._direction ? v(edge) : u(edge); ++ return edge._direction ? this->v(edge) : this->u(edge); + } + + // Mappable extension diff --git a/sci-libs/lemon/lemon-1.2.3.ebuild b/sci-libs/lemon/lemon-1.2.3.ebuild index 061f5d3..0e46da6 100644 --- a/sci-libs/lemon/lemon-1.2.3.ebuild +++ b/sci-libs/lemon/lemon-1.2.3.ebuild @@ -4,31 +4,36 @@ EAPI=5 -DESCRIPTION="C++ template STATIC library of efficient implementations of common data structures and algorithms" +AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools-utils eutils + +DESCRIPTION="C++ template static library of common data structures and algorithms" HOMEPAGE="https://lemon.cs.elte.hu/trac/lemon/" -SRC_URI="http://lemon.cs.elte.hu/pub/sources/lemon-"${PV}".tar.gz" +SRC_URI="http://lemon.cs.elte.hu/pub/sources/${P}.tar.gz" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="coin doc static-libs test tools" RDEPEND=" - sci-mathematics/glpk" + sci-mathematics/glpk + coin? ( sci-libs/coinor-cbc sci-libs/coinor-clp )" DEPEND="${RDEPEND} - doc? ( - app-text/ghostscript-gpl - dev-lang/python ) test? ( dev-util/valgrind )" -src_prepare(){ - if use test; then - MYOPTS="--enable-valgrind" - else - MYOPTS="" - fi - econf ${MYOPTS} +PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) + +src_configure() { + # $(use_enable test valgrind) + local myeconfargs=( + $(use_enable tools) + $(use_with coin) + ) + autotools-utils_src_configure } -# a dynamic library can be built using -# cmake -DBUILD_SHARED_LIBS=TRUE .. +src_install() { + autotools-utils_src_install + use doc && emake DESTDIR="${D}" install-html +} diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml index 2bc8930..ff6ff78 100644 --- a/sci-libs/lemon/metadata.xml +++ b/sci-libs/lemon/metadata.xml @@ -1,9 +1,20 @@ - sci-biology - - mmokrejs@fold.natur.cuni.cz - Martin Mokrejs - +sci-biology + + mmokrejs@fold.natur.cuni.cz + Martin Mokrejs + + + 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. + + + Enable the CoinOR-Clp and CoinOR-CBC graph algorithms + Build additional tools +