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

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     5fc4bebdff2229470164ccb26c3272b170f4d1b6
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 20:57:11 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> 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 <bicatali@gentoo.org>
+  +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 <jlec@gentoo.org> lemon-1.2.3.ebuild,
   metadata.xml:
   Move to EAPI=5; sort *DEPEND correctly
@@ -17,4 +22,3 @@
   02 Mar 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   +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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-biology</herd>
-  <maintainer>
-    <email>mmokrejs@fold.natur.cuni.cz</email>
-    <name>Martin Mokrejs</name>
-  </maintainer>
+<herd>sci-biology</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="coin">Enable the CoinOR-Clp and CoinOR-CBC graph algorithms</flag>
+  <flag name="tools">Build additional tools</flag>
+</use>
 </pkgmetadata>