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

[Sebastien Fabbro]

commit:     2f160fdf8f3accbd270a8e853dd35d7f9d6d8592
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 04:47:31 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 04:47:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2f160fdf

sci-libs/lemon: Version bump

Package-Manager: portage-2.2.7-prefix
RepoMan-Options: --force

---
 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/lemon-1.3.ebuild              | 75 ++++++++++++++++++++++++++++
 sci-libs/lemon/metadata.xml                  |  9 ++--
 5 files changed, 87 insertions(+), 101 deletions(-)

diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index e49c34a..7499141 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lemon-1.3 (08 Dec 2013)
+
+  08 Dec 2013; Sébastien Fabbro <bicatali@g.o> +lemon-1.3.ebuild,
+  -files/lemon-1.2.3-gcc47.patch, -lemon-1.2.3.ebuild, metadata.xml:
+  sci-libs/lemon: Version bump
+
   10 Jul 2013; Sébastien Fabbro <bicatali@g.o>
   +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

diff --git a/sci-libs/lemon/files/lemon-1.2.3-gcc47.patch b/sci-libs/lemon/files/lemon-1.2.3-gcc47.patch
deleted file mode 100644
index e165e32..0000000
--- a/sci-libs/lemon/files/lemon-1.2.3-gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index 0e46da6..0000000
--- a/sci-libs/lemon/lemon-1.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-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/${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="coin doc static-libs test tools"
-
-RDEPEND="
-	sci-mathematics/glpk
-	coin? ( sci-libs/coinor-cbc sci-libs/coinor-clp )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/valgrind )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
-
-src_configure() {
-	#	$(use_enable test valgrind)
-	local myeconfargs=(
-		$(use_enable tools)
-		$(use_with coin)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && emake DESTDIR="${D}" install-html
-}

diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3.ebuild
new file mode 100644
index 0000000..f599106
--- /dev/null
+++ b/sci-libs/lemon/lemon-1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils
+
+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/${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+coin doc glpk static-libs test tools"
+
+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 )"
+
+src_prepare() {
+	sed -i \
+		-e '/ADD_SUBDIRECTORY(demo)/d' \
+		CMakeLists.txt || die
+
+	use doc || sed -i \
+		-e '/ADD_SUBDIRECTORY(doc)/d' \
+		CMakeLists.txt || die
+
+	use tools || sed -i \
+		-e '/ADD_SUBDIRECTORY(tools)/d' \
+		CMakeLists.txt || die
+
+	use test || sed -i \
+		-e '/ADD_SUBDIRECTORY(test)/d' \
+		CMakeLists.txt || die
+
+	for t in \
+		max_clique \
+		max_flow \
+		graph_utils \
+		random \
+		time_measure \
+		tsp; do
+		sed -i -e "/${t}_test/d" test/CMakeLists.txt || die
+	done
+	sed -i \
+		-e '/ADD_TEST(lp_test lp_test)/d' \
+		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
+		test/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=TRUE
+		-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)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}

diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index ff6ff78..3cea904 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
+<herd>sci</herd>
 <maintainer>
   <email>mmokrejs@×××××××××××××××.cz</email>
   <name>Martin Mokrejs</name>
@@ -14,7 +14,10 @@
   networks.
 </longdescription>
 <use>
-  <flag name="coin">Enable the CoinOR-Clp and CoinOR-CBC graph algorithms</flag>
-  <flag name="tools">Build additional tools</flag>
+  <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>  
 </use>
 </pkgmetadata>