* [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/
@ 2014-01-18 7:38 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2014-01-18 7:38 UTC (permalink / raw
To: gentoo-commits
commit: d2f98ed647d71eba4d2bdcd4d11bd198b8904e61
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 16:27:58 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 07:38:33 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2f98ed6
sci-libs/lemon: Import latest tree changes
Package-Manager: portage-2.2.8
---
sci-libs/lemon/ChangeLog | 4 ++
sci-libs/lemon/files/lemon-1.3-underlinking.patch | 47 ++++++++++++++++++++++
.../{lemon-1.3.ebuild => lemon-1.3-r1.ebuild} | 7 +++-
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index f565264..da26d24 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jan 2014; Justin Lecher <jlec@gentoo.org> -lemon-1.3.ebuild,
+ +lemon-1.3-r1.ebuild, +files/lemon-1.3-underlinking.patch:
+ Import latest tree changes
+
13 Jan 2014; Justin Lecher <jlec@gentoo.org> lemon-1.3.ebuild,
+files/lemon-1.3-multilib.patch, metadata.xml:
Fix for multilib-strict
diff --git a/sci-libs/lemon/files/lemon-1.3-underlinking.patch b/sci-libs/lemon/files/lemon-1.3-underlinking.patch
new file mode 100644
index 0000000..94aa196
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3-underlinking.patch
@@ -0,0 +1,47 @@
+ CMakeLists.txt | 4 ++++
+ lemon/CMakeLists.txt | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b06e5c7..fa68aa8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,21 +84,25 @@ IF(GLPK_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_MIP TRUE)
+ SET(LEMON_HAVE_GLPK TRUE)
++ SET(LEMON_LP_LIBRARY ${GLPK_LIBRARY})
+ ENDIF(GLPK_FOUND)
+ IF(ILOG_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_MIP TRUE)
+ SET(LEMON_HAVE_CPLEX TRUE)
++ SET(LEMON_LP_LIBRARY ${ILOG_LIBRARY})
+ ENDIF(ILOG_FOUND)
+ IF(COIN_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_MIP TRUE)
+ SET(LEMON_HAVE_CLP TRUE)
+ SET(LEMON_HAVE_CBC TRUE)
++ SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
+ ENDIF(COIN_FOUND)
+ IF(SOPLEX_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_SOPLEX TRUE)
++ SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
+ ENDIF(SOPLEX_FOUND)
+
+ IF(ILOG_FOUND)
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 8011833..2487345 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -59,6 +59,8 @@ IF(UNIX)
+ SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
+ ENDIF()
+
++TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARY})
++
+ INSTALL(
+ TARGETS lemon
+ ARCHIVE DESTINATION lib
diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3-r1.ebuild
similarity index 92%
rename from sci-libs/lemon/lemon-1.3.ebuild
rename to sci-libs/lemon/lemon-1.3-r1.ebuild
index de536b1..076e37f 100644
--- a/sci-libs/lemon/lemon-1.3.ebuild
+++ b/sci-libs/lemon/lemon-1.3-r1.ebuild
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
REQUIRED_USE="|| ( coin glpk )"
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-multilib.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ )
src_prepare() {
sed -i \
@@ -69,6 +72,8 @@ src_configure() {
$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
$(cmake-utils_use coin LEMON_ENABLE_COIN)
$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
+ -DLEMON_ENABLE_ILOG=NO
+ -DLEMON_ENABLE_SOPLEX=NO
)
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/
@ 2014-01-18 7:39 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2014-01-18 7:39 UTC (permalink / raw
To: gentoo-commits
commit: cc34418862edbf408417a0f44903e0b5789fc4d3
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 16:27:58 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 16:27:58 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cc344188
sci-libs/lemon: Import latest tree changes
Package-Manager: portage-2.2.8
---
sci-libs/lemon/ChangeLog | 4 ++
sci-libs/lemon/files/lemon-1.3-underlinking.patch | 47 ++++++++++++++++++++++
.../{lemon-1.3.ebuild => lemon-1.3-r1.ebuild} | 7 +++-
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index f565264..da26d24 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jan 2014; Justin Lecher <jlec@gentoo.org> -lemon-1.3.ebuild,
+ +lemon-1.3-r1.ebuild, +files/lemon-1.3-underlinking.patch:
+ Import latest tree changes
+
13 Jan 2014; Justin Lecher <jlec@gentoo.org> lemon-1.3.ebuild,
+files/lemon-1.3-multilib.patch, metadata.xml:
Fix for multilib-strict
diff --git a/sci-libs/lemon/files/lemon-1.3-underlinking.patch b/sci-libs/lemon/files/lemon-1.3-underlinking.patch
new file mode 100644
index 0000000..94aa196
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3-underlinking.patch
@@ -0,0 +1,47 @@
+ CMakeLists.txt | 4 ++++
+ lemon/CMakeLists.txt | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b06e5c7..fa68aa8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,21 +84,25 @@ IF(GLPK_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_MIP TRUE)
+ SET(LEMON_HAVE_GLPK TRUE)
++ SET(LEMON_LP_LIBRARY ${GLPK_LIBRARY})
+ ENDIF(GLPK_FOUND)
+ IF(ILOG_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_MIP TRUE)
+ SET(LEMON_HAVE_CPLEX TRUE)
++ SET(LEMON_LP_LIBRARY ${ILOG_LIBRARY})
+ ENDIF(ILOG_FOUND)
+ IF(COIN_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_MIP TRUE)
+ SET(LEMON_HAVE_CLP TRUE)
+ SET(LEMON_HAVE_CBC TRUE)
++ SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
+ ENDIF(COIN_FOUND)
+ IF(SOPLEX_FOUND)
+ SET(LEMON_HAVE_LP TRUE)
+ SET(LEMON_HAVE_SOPLEX TRUE)
++ SET(LEMON_LP_LIBRARY ${COIN_LIBRARY})
+ ENDIF(SOPLEX_FOUND)
+
+ IF(ILOG_FOUND)
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 8011833..2487345 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -59,6 +59,8 @@ IF(UNIX)
+ SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
+ ENDIF()
+
++TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARY})
++
+ INSTALL(
+ TARGETS lemon
+ ARCHIVE DESTINATION lib
diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3-r1.ebuild
similarity index 92%
rename from sci-libs/lemon/lemon-1.3.ebuild
rename to sci-libs/lemon/lemon-1.3-r1.ebuild
index de536b1..076e37f 100644
--- a/sci-libs/lemon/lemon-1.3.ebuild
+++ b/sci-libs/lemon/lemon-1.3-r1.ebuild
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
REQUIRED_USE="|| ( coin glpk )"
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-multilib.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ )
src_prepare() {
sed -i \
@@ -69,6 +72,8 @@ src_configure() {
$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
$(cmake-utils_use coin LEMON_ENABLE_COIN)
$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
+ -DLEMON_ENABLE_ILOG=NO
+ -DLEMON_ENABLE_SOPLEX=NO
)
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/
@ 2014-01-18 7:39 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2014-01-18 7:39 UTC (permalink / raw
To: gentoo-commits
commit: a7d47580b8a5cbab9d6f39124859d4445d1e11c1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 16:35:56 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 16:36:17 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a7d47580
sci-libs/lemon: Fix for multilib-strict
Package-Manager: portage-2.2.8
---
sci-libs/lemon/ChangeLog | 6 +++++-
sci-libs/lemon/files/lemon-1.3-multilib.patch | 18 ++++++++++++++++++
sci-libs/lemon/lemon-1.3.ebuild | 5 ++++-
sci-libs/lemon/metadata.xml | 22 +++++++++++-----------
4 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index 7499141..f565264 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/lemon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Jan 2014; Justin Lecher <jlec@gentoo.org> lemon-1.3.ebuild,
+ +files/lemon-1.3-multilib.patch, metadata.xml:
+ Fix for multilib-strict
+
*lemon-1.3 (08 Dec 2013)
08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +lemon-1.3.ebuild,
diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch
new file mode 100644
index 0000000..ee578d4
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3-multilib.patch
@@ -0,0 +1,18 @@
+ lemon/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 8011833..0209acf 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -61,8 +61,8 @@ ENDIF()
+
+ INSTALL(
+ TARGETS lemon
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ COMPONENT library
+ )
+
diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3.ebuild
index f599106..de536b1 100644
--- a/sci-libs/lemon/lemon-1.3.ebuild
+++ b/sci-libs/lemon/lemon-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="|| ( coin glpk )"
+PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+
src_prepare() {
sed -i \
-e '/ADD_SUBDIRECTORY(demo)/d' \
@@ -56,6 +58,7 @@ src_prepare() {
-e '/ADD_TEST(lp_test lp_test)/d' \
-e '/ADD_DEPENDENCIES(check lp_test)/d' \
test/CMakeLists.txt || die
+ cmake-utils_src_prepare
}
src_configure() {
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 3cea904..fa9c548 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,23 +1,23 @@
<?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="coin">Enable the <pkg>coinor-clp</pkg> and
+ <use>
+ <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
+ <flag name="glpk">Enable GNU Linear Programming Kit
<pkg>sci-mathematics/glpk</pkg> support</flag>
- <flag name="tools">Build additional tools</flag>
-</use>
+ <flag name="tools">Build additional tools</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/
@ 2014-01-18 7:38 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2014-01-18 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 34efa4e668a6b6c06512de7371e28c07ca8ab85e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 16:35:56 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 07:38:33 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=34efa4e6
sci-libs/lemon: Fix for multilib-strict
Package-Manager: portage-2.2.8
---
sci-libs/lemon/ChangeLog | 6 +++++-
sci-libs/lemon/files/lemon-1.3-multilib.patch | 18 ++++++++++++++++++
sci-libs/lemon/lemon-1.3.ebuild | 5 ++++-
sci-libs/lemon/metadata.xml | 22 +++++++++++-----------
4 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/sci-libs/lemon/ChangeLog b/sci-libs/lemon/ChangeLog
index 7499141..f565264 100644
--- a/sci-libs/lemon/ChangeLog
+++ b/sci-libs/lemon/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/lemon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Jan 2014; Justin Lecher <jlec@gentoo.org> lemon-1.3.ebuild,
+ +files/lemon-1.3-multilib.patch, metadata.xml:
+ Fix for multilib-strict
+
*lemon-1.3 (08 Dec 2013)
08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +lemon-1.3.ebuild,
diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch
new file mode 100644
index 0000000..ee578d4
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3-multilib.patch
@@ -0,0 +1,18 @@
+ lemon/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 8011833..0209acf 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -61,8 +61,8 @@ ENDIF()
+
+ INSTALL(
+ TARGETS lemon
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ COMPONENT library
+ )
+
diff --git a/sci-libs/lemon/lemon-1.3.ebuild b/sci-libs/lemon/lemon-1.3.ebuild
index f599106..de536b1 100644
--- a/sci-libs/lemon/lemon-1.3.ebuild
+++ b/sci-libs/lemon/lemon-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="|| ( coin glpk )"
+PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+
src_prepare() {
sed -i \
-e '/ADD_SUBDIRECTORY(demo)/d' \
@@ -56,6 +58,7 @@ src_prepare() {
-e '/ADD_TEST(lp_test lp_test)/d' \
-e '/ADD_DEPENDENCIES(check lp_test)/d' \
test/CMakeLists.txt || die
+ cmake-utils_src_prepare
}
src_configure() {
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 3cea904..fa9c548 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,23 +1,23 @@
<?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="coin">Enable the <pkg>coinor-clp</pkg> and
+ <use>
+ <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
+ <flag name="glpk">Enable GNU Linear Programming Kit
<pkg>sci-mathematics/glpk</pkg> support</flag>
- <flag name="tools">Build additional tools</flag>
-</use>
+ <flag name="tools">Build additional tools</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/
@ 2013-12-08 5:00 Sebastien Fabbro
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2013-12-08 5:00 UTC (permalink / raw
To: gentoo-commits
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@gentoo.org> +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@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
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@fold.natur.cuni.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>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/
@ 2013-07-10 20:57 Sebastien Fabbro
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2013-07-10 20:57 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-18 7:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-18 7:38 [gentoo-commits] proj/sci:master commit in: sci-libs/lemon/files/, sci-libs/lemon/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2014-01-18 7:39 Justin Lecher
2014-01-18 7:39 Justin Lecher
2014-01-18 7:38 Justin Lecher
2013-12-08 5:00 Sebastien Fabbro
2013-07-10 20:57 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox