- update to 3.5.0

- relax version limit in USE_PYTHON (python3 is now supported too)

PR:		179240
Submitted by:	Michael Gmelin <freebsd@grem.de> (maintainer)

5 files changed, 60 insertions, 39 deletions

diff --git a/devel/py-ice/files/patch-cpp-include-IceUtil-Config.h b/devel/py-ice/files/patch-cpp-include-IceUtil-Config.h
new file mode 100644
index 000000000000..db5520564b2e
--- /dev/null
+++ b/devel/py-ice/files/patch-cpp-include-IceUtil-Config.h
@@ -0,0 +1,11 @@
+--- cpp/include/IceUtil/Config.h.orig	2013-03-11 15:19:46.000000000 +0000
++++ cpp/include/IceUtil/Config.h	2013-05-20 02:09:58.239194578 +0000
+@@ -51,7 +51,7 @@
+ // Check for C++ 11 support
+ //
+ #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+-    (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) || \
++    (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) || (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) || \
+     (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ #   define ICE_CPP11
+ #endif
diff --git a/devel/py-ice/files/patch-py-config-Make.rules b/devel/py-ice/files/patch-py-config-Make.rules
index fa91df020747..08e01ae19a53 100644
--- a/devel/py-ice/files/patch-py-config-Make.rules
+++ b/devel/py-ice/files/patch-py-config-Make.rules
@@ -1,5 +1,5 @@
---- py/config/Make.rules.orig	2010-07-11 11:13:30.000000000 +1000
-+++ py/config/Make.rules	2010-07-11 11:18:09.000000000 +1000
+--- py/config/Make.rules.orig	2013-03-11 15:19:47.000000000 +0000
++++ py/config/Make.rules	2013-05-20 14:21:13.335195726 +0000
 @@ -12,7 +12,8 @@
  # if it does not exist.
  #
@@ -10,18 +10,18 @@
  
  #
  # The "root directory" for runpath embedded in executables. Can be unset
-@@ -80,8 +81,8 @@
- endif
+@@ -95,8 +96,8 @@
+ endif 
  
- libdir			= $(top_srcdir)/python
--install_pythondir	= $(prefix)/python
--install_libdir		= $(prefix)/python
-+install_pythondir	= %%PYTHON_SITELIBDIR%%/Ice
-+install_libdir		= %%PYTHON_SITELIBDIR%%/Ice
+ libdir                  = $(top_srcdir)/python
+-install_pythondir       = $(prefix)/python
+-install_libdir          = $(prefix)/python
++install_pythondir       = %%PYTHON_SITELIBDIR%%/Ice
++install_libdir          = %%PYTHON_SITELIBDIR%%/Ice
  
- #
- # Platform specific definitions
-@@ -105,7 +106,7 @@
+ ifeq ($(UNAME),SunOS)
+    ifeq ($(LP64),yes)
+@@ -118,7 +119,7 @@
      ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
      ICE_FLAGS	= -I$(ice_dir)/include
  endif
diff --git a/devel/py-ice/files/patch-py-python-Makefile b/devel/py-ice/files/patch-py-python-Makefile
index d808f28defb0..948ffc8e1348 100644
--- a/devel/py-ice/files/patch-py-python-Makefile
+++ b/devel/py-ice/files/patch-py-python-Makefile
@@ -9,7 +9,7 @@
  	@for i in $(PACKAGES) ; \
  	do \
 -	    $(INSTALL_DATA) -r $$i $(install_pythondir) ; \
-+	    $(INSTALL_DATA) -d $(install_pythondir)/$$i ; \
++	    mkdir -p $(install_pythondir)/$$i ; \
 +	    $(INSTALL_DATA) $$i/*.py* $(install_pythondir)/$$i ; \
  	done
  
diff --git a/devel/py-ice/files/patch-py-test-Ice-info-AllTests.py b/devel/py-ice/files/patch-py-test-Ice-info-AllTests.py
index 5dd600351d5c..5c04fe28227f 100644
--- a/devel/py-ice/files/patch-py-test-Ice-info-AllTests.py
+++ b/devel/py-ice/files/patch-py-test-Ice-info-AllTests.py
@@ -1,11 +1,11 @@
---- py/test/Ice/info/AllTests.py.orig	2011-06-15 19:44:00.000000000 +0000
-+++ py/test/Ice/info/AllTests.py	2012-09-11 19:18:30.188273390 +0000
+--- py/test/Ice/info/AllTests.py.orig	2013-03-11 15:19:47.000000000 +0000
++++ py/test/Ice/info/AllTests.py	2013-05-20 14:25:56.860196743 +0000
 @@ -7,12 +7,31 @@
  #
  # **********************************************************************
  
--import Ice, Test, threading
-+import Ice, Test, threading, sys, subprocess
+-import Ice, Test, sys, threading
++import Ice, Test, sys, threading, subprocess
  
  def test(b):
      if not b:
@@ -31,9 +31,9 @@
 +    return isFreeBSD() and sysctl("security.jail.jailed")
 +
  def allTests(communicator, collocated):
-     print "testing proxy endpoint information...",
- 
-@@ -64,12 +83,12 @@
+     sys.stdout.write("testing proxy endpoint information... ")
+     sys.stdout.flush()
+@@ -67,12 +86,12 @@
  
      ipEndpoint = endpoints[0].getInfo()
      test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2)
@@ -48,7 +48,7 @@
      test(udpEndpoint.datagram())
      test(udpEndpoint.port > 0)
  
-@@ -104,7 +123,7 @@
+@@ -108,7 +127,7 @@
      ipinfo = base.ice_getConnection().getEndpoint().getInfo()
      test(ipinfo.port == 12010)
      test(not ipinfo.compress)
@@ -57,16 +57,16 @@
  
      ctx = testIntf.getEndpointInfoAsContext()
      test(ctx["host"] == ipinfo.host)
-@@ -114,7 +133,7 @@
+@@ -118,7 +137,7 @@
  
      udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
      test(udp.port == 12010)
 -    test(udp.host == defaultHost)
 +    test(udp.host == defaultHost or isFreeBSDJail())
  
-     print "ok"
+     print("ok")
  
-@@ -124,8 +143,8 @@
+@@ -129,8 +148,8 @@
      test(not info.incoming)
      test(len(info.adapterName) == 0)
      test(info.remotePort == 12010)
diff --git a/devel/py-ice/files/patch-py-test-Ice-properties-run.py b/devel/py-ice/files/patch-py-test-Ice-properties-run.py
index 1ad3e948d3fc..3758be556db9 100644
--- a/devel/py-ice/files/patch-py-test-Ice-properties-run.py
+++ b/devel/py-ice/files/patch-py-test-Ice-properties-run.py
@@ -1,19 +1,29 @@
---- py/test/Ice/properties/run.py.orig	2011-06-15 19:44:00.000000000 +0000
-+++ py/test/Ice/properties/run.py	2012-09-11 19:05:41.531273236 +0000
-@@ -24,14 +24,14 @@
+--- py/test/Ice/properties/run.py.orig	2013-05-21 02:29:52.861195367 +0000
++++ py/test/Ice/properties/run.py	2013-05-21 02:30:44.972196471 +0000
+@@ -26,15 +26,15 @@
  #
- # Write config
- #
--configPath = u"./config/中国_client.config"
-+configPath = u"./config/中国_client.config".encode("utf-8")
- 
- TestUtil.createConfig(configPath, 
-                       ["# Automatically generated by Ice test driver.", 
-                        "Ice.Trace.Protocol=1",
-                        "Ice.Trace.Network=1", 
-                        "Ice.ProgramName=PropertiesClient", 
--                       "Config.Path=./config/中国_client.config"])
-+                       "Config.Path="+configPath])
+ if sys.version_info[0] == 2:
+     configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
+-    TestUtil.createConfig(configPath, 
++    TestUtil.createConfig(configPath.encode("utf-8"), 
+                           ["# Automatically generated by Ice test driver.", 
+                            "Ice.Trace.Protocol=1",
+                            "Ice.Trace.Network=1", 
+                            "Ice.ProgramName=PropertiesClient", 
+-                           "Config.Path=./config/中国_client.config"])
++                           "Config.Path=" + configPath.encode("utf-8")])
+ else:
+     configPath = "./config/\u4e2d\u56fd_client.config"
+-    TestUtil.createConfig(configPath, 
++    TestUtil.createConfig(configPath.encode("utf-8"), 
+                           ["# Automatically generated by Ice test driver.", 
+                            "Ice.Trace.Protocol=1",
+                            "Ice.Trace.Network=1", 
+@@ -44,5 +44,5 @@
  
  TestUtil.simpleTest()
  
+-if os.path.exists(configPath):
+-    os.remove(configPath)
++if os.path.exists(configPath.encode("utf-8")):
++    os.remove(configPath.encode("utf-8"))