This adds patches No 3 [1] and No 5 [2] from upstream.

Also fixes LIB_DEPENDS handling (previous versions of the slave
ports won't depend on libIce.so), move LIB_DEPENDS and LIB_VRS
for slaves to master, upgrade to USES= python

[1] http://www.zeroc.com/forums/patches/6183-patch-3-ice-3-5-1-marshaling-bug-nested-optionals.html
[2] http://www.zeroc.com/forums/patches/6285-patch-5-ice-3-5-1-fix-icegrid-registry-issue-shared-replica-groups.html

Approved by:	mentors (implicit)

1 files changed, 3 insertions, 3 deletions

diff --git a/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py b/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
index 71682c85e713..f3a00fbb3848 100644
--- a/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
+++ b/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
@@ -14,11 +14,11 @@
      domainname = ""
  
 +print "Network and process debug output:"
-+subprocess.call(["/usr/bin/netstat", "-an"])
-+subprocess.call(["/bin/ps", "-alxww"])
-+subprocess.call(["/usr/bin/sockstat"])
 +subprocess.call(["/sbin/ifconfig", "-a"])
 +subprocess.call(["/sbin/sysctl", "-a"])
++subprocess.call(["/bin/ps", "-alxww"])
++subprocess.call(["/usr/bin/sockstat"])
++subprocess.call(["/usr/bin/netstat", "-an"])
  testcases = [
          ('testing category filter',
                  ('', '', '', 'foo "a cat with spaces"', '', ''),