[110813] trunk/dports/python/py-graph-tool

[mmoll at macports.org]

Revision: 110813
          https://trac.macports.org/changeset/110813
Author:   mmoll at macports.org
Date:     2013-09-06 13:15:12 -0700 (Fri, 06 Sep 2013)
Log Message:
-----------
py-graph-tool: update to version 2.2.25, remove py31 subport

Modified Paths:
--------------
    trunk/dports/python/py-graph-tool/Portfile

Added Paths:
-----------
    trunk/dports/python/py-graph-tool/files/
    trunk/dports/python/py-graph-tool/files/patch-clang.diff

Modified: trunk/dports/python/py-graph-tool/Portfile
===================================================================
--- trunk/dports/python/py-graph-tool/Portfile	2013-09-06 20:10:35 UTC (rev 110812)
+++ trunk/dports/python/py-graph-tool/Portfile	2013-09-06 20:15:12 UTC (rev 110813)
@@ -7,7 +7,7 @@
 
 set realname        graph-tool
 name                py-${realname}
-version             2.2.24
+version             2.2.25
 categories          python science
 platforms           darwin
 license             GPL-3
@@ -20,11 +20,11 @@
 homepage            http://graph-tool.skewed.de
 master_sites        http://downloads.skewed.de/graph-tool/
 use_bzip2           yes
-checksums           md5     1c1ec9e8df33fe1d1560736b98816743 \
-                    sha1    0ba18967a749396c8a959e423cb6c9532add4432 \
-                    rmd160  cc1979e17e4604b163bc2a620c4c76b9c4ff58d6
+checksums           md5     83a7c55ac58eb2ef67f0c16ecb36b711 \
+                    sha1    3b740243662a4dd4e5a1f7aa20f4ddf6fab1ea31 \
+                    rmd160  5bf4f9e42142c4ee9a10b825bcfaeed548a396ac
 distname            ${realname}-${version}
-python.versions     26 27 31 32 33
+python.versions     26 27 32 33
 python.default_version 27
 
 if {$subport != $name} {
@@ -51,7 +51,7 @@
     configure.env-append PYTHON=${python.bin} \
                          PYTHON_VERSION=${python.branch} \
                          PYTHON_CPPFLAGS=-I${python.include} \
-                         PYTHON_EXTRA_LDFLAGS="-L${python.libdir}/.. -lpython${python.branch}"
+                         PYTHON_LDFLAGS="-L${python.libdir}/.. -lpython${python.branch}"
     configure.cppflags-append -I${prefix}/include -I${python.include}/..
     configure.ldflags-append -L${prefix}/lib
     configure.args-append --with-boost=${prefix} --exec-prefix=${python.prefix}
@@ -62,6 +62,8 @@
     # some point.
     if {[string match *clang* ${configure.compiler}]} {
         configure.args-append --disable-sparsehash
+        # http://graph-tool.skewed.de/ticket/141
+        patchfiles-append patch-clang.diff
     } else {
         depends_lib-append port:sparsehash
         configure.cppflags-append -I${prefix}/include/sparsehash
@@ -80,7 +82,7 @@
 if {$name == $subport} {
     livecheck.type      regex
     livecheck.url       $homepage
-    livecheck.regex     Version (\[0-9.\]+) of graph-tool
+    livecheck.regex     Download version (\[0-9.\]+)
 } else {
     livecheck.type      none
 }

Added: trunk/dports/python/py-graph-tool/files/patch-clang.diff
===================================================================
--- trunk/dports/python/py-graph-tool/files/patch-clang.diff	                        (rev 0)
+++ trunk/dports/python/py-graph-tool/files/patch-clang.diff	2013-09-06 20:15:12 UTC (rev 110813)
@@ -0,0 +1,48 @@
+diff --git a/src/graph/graph_adaptor.hh b/src/graph/graph_adaptor.hh
+index aa9f379..be9d675 100644
+--- src/graph/graph_adaptor.hh
++++ src/graph/graph_adaptor.hh
+@@ -139,8 +139,8 @@ struct make_undirected_edge
+ template <class Graph, class Iter>
+ struct transformed_iterator
+ {
+-    typedef typename mpl::if_<std::tr1::is_convertible<typename std::iterator_traits<Iter>::iterator_category,
+-                                                       std::random_access_iterator_tag>,
++    typedef typename mpl::if_<is_convertible<typename std::iterator_traits<Iter>::iterator_category,
++                                             std::random_access_iterator_tag>,
+                               transform_random_access_iterator<make_undirected_edge<Graph>, Iter>,
+                               transform_iterator<make_undirected_edge<Graph>, Iter> >::type type;
+     typedef is_convertible<typename std::iterator_traits<Iter>::iterator_category,
+diff --git a/src/graph/topology/graph_subgraph_isomorphism.cc b/src/graph/topology/graph_subgraph_isomorphism.cc
+index 8d4633a..112472e 100644
+--- src/graph/topology/graph_subgraph_isomorphism.cc
++++ src/graph/topology/graph_subgraph_isomorphism.cc
+@@ -15,13 +15,14 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 
++#include <graph_python_interface.hh>
++
+ #include "graph.hh"
+ #include "graph_filtering.hh"
+ 
+ #include "random.hh"
+ 
+ #include <graph_subgraph_isomorphism.hh>
+-#include <graph_python_interface.hh>
+ 
+ #include "tr1_include.hh"
+ #include TR1_HEADER(unordered_map)
+diff --git a/src/graph/topology/graph_subgraph_isomorphism.hh b/src/graph/topology/graph_subgraph_isomorphism.hh
+index 0728147..f349ace 100644
+--- src/graph/topology/graph_subgraph_isomorphism.hh
++++ src/graph/topology/graph_subgraph_isomorphism.hh
+@@ -213,7 +213,7 @@ void find_mappings(const Graph1& sub, const Graph2& g, matrix_t& M0,
+     // [current M] [current sub vertex] [current mapping vertex]
+     typedef tuple<matrix_t, size_t,
+                   typename matrix_t::value_type::const_iterator> state_t;
+-    list<state_t> Mstack;
++    std::list<state_t> Mstack;
+     Mstack.push_back(make_tuple(M0, i, M0[i].begin()));
+     get<2>(Mstack.back()) = get<0>(Mstack.back())[i].begin();
+     tr1::unordered_set<size_t> already_mapped;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130906/90cb092e/attachment-0001.html>