[130063] trunk/dports/python/py-sip

[michaelld at macports.org]

Revision: 130063
          https://trac.macports.org/changeset/130063
Author:   michaelld at macports.org
Date:     2014-12-25 09:38:01 -0800 (Thu, 25 Dec 2014)
Log Message:
-----------
py[27,34]-sip: update to 4.16.5; SIP API remains unchanged so no rev-bump of dependencies needed.

Modified Paths:
--------------
    trunk/dports/python/py-sip/Portfile
    trunk/dports/python/py-sip/files/patch-configure.py.diff
    trunk/dports/python/py-sip/files/patch-siputils.py.diff

Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile	2014-12-25 17:36:24 UTC (rev 130062)
+++ trunk/dports/python/py-sip/Portfile	2014-12-25 17:38:01 UTC (rev 130063)
@@ -21,7 +21,7 @@
 
 homepage            http://www.riverbankcomputing.co.uk/software/sip/intro
 
-version             4.16.4
+version             4.16.5
 
 # from siplib/sip.h.in:
 #
@@ -32,7 +32,7 @@
 # removed or the order changed then the major number must be
 # incremented and the minor number set to 0.
 # 
-# SIP 4.16.[1-4] provides SIP API 11.1.
+# SIP 4.16.[1-5] provides SIP API 11.1.
 # SIP 4.15.5 provided SIP API 11.0.
 
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -51,8 +51,8 @@
         distname        sip-${version}
     }
 
-    checksums           rmd160 d1ce6d022272bb31bb90fd36ed55371bde7aa4be \
-                        sha256 ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5
+    checksums           rmd160 a7ed8f728ad8cc50b1838be837e3967f69d9cd68 \
+                        sha256 a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87
 
     patchfiles          patch-siputils.py.diff \
                         patch-specs_macx-g++.diff \

Modified: trunk/dports/python/py-sip/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-configure.py.diff	2014-12-25 17:36:24 UTC (rev 130062)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff	2014-12-25 17:38:01 UTC (rev 130063)
@@ -1,6 +1,6 @@
---- configure.py.orig	2014-06-02 14:22:56.000000000 -0400
-+++ configure.py	2014-06-02 14:23:07.000000000 -0400
-@@ -880,7 +880,6 @@
+--- configure.py.orig	2014-12-24 04:56:52.000000000 -0500
++++ configure.py	2014-12-25 11:19:20.000000000 -0500
+@@ -890,7 +890,6 @@
          raise
      except:
          sys.stderr.write(

Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff	2014-12-25 17:36:24 UTC (rev 130062)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2014-12-25 17:38:01 UTC (rev 130063)
@@ -1,5 +1,5 @@
---- siputils.py.orig	2014-05-10 11:00:48.000000000 -0400
-+++ siputils.py	2014-06-02 14:22:26.000000000 -0400
+--- siputils.py.orig	2014-11-29 08:50:28.000000000 -0500
++++ siputils.py	2014-12-25 11:19:20.000000000 -0500
 @@ -297,7 +297,7 @@
              # These require special handling as they are (potentially) a set of
              # space separated values rather than a single value that might
@@ -9,7 +9,7 @@
                  val = val.split()
  
              # We also want to treat lists of libraries in the same way so that
-@@ -613,6 +613,16 @@
+@@ -614,6 +614,16 @@
              libdir.extend(libdir_qt)
              rpaths.extend(libdir_qt)
  
@@ -26,7 +26,7 @@
              if qt_version >= 0x040000:
                  # Try and read QT_LIBINFIX from qconfig.pri.
                  qconfig = os.path.join(mkspecs, "qconfig.pri")
-@@ -748,7 +758,7 @@
+@@ -749,7 +759,7 @@
                          if mod == "QAxContainer":
                              incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
                          elif self._is_framework(mod):
@@ -35,7 +35,7 @@
  
                              if mod == "QtAssistant" and qt_version < 0x040202:
                                  mod = "QtAssistantClient"
-@@ -834,7 +844,7 @@
+@@ -835,7 +845,7 @@
      def _is_framework(self, mod):
          """Return true if the given Qt module is a framework.
          """
@@ -44,7 +44,7 @@
  
      def _qt_module_to_lib(self, mname):
          """Return the name of the Qt library corresponding to a module.
-@@ -962,7 +972,7 @@
+@@ -963,7 +973,7 @@
          if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
              prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
          elif sys.platform == "darwin" and framework:
@@ -53,7 +53,7 @@
          else:
              prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
  
-@@ -2471,6 +2481,40 @@
+@@ -2477,6 +2487,40 @@
                  lhs = line[:assstart].strip()
                  rhs = line[assend + 1:].strip()
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141225/bd5dbc8b/attachment.html>