SF.net SVN: gar:[26229] csw/mgar/pkg/lang-python/psutil/trunk

[dmichelsen at users.sourceforge.net]

Revision: 26229
          http://sourceforge.net/p/gar/code/26229
Author:   dmichelsen
Date:     2017-06-09 11:53:33 +0000 (Fri, 09 Jun 2017)
Log Message:
-----------
lang-python/psutil/trunk: Update to 5.2.2

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/psutil/trunk/Makefile
    csw/mgar/pkg/lang-python/psutil/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch

Modified: csw/mgar/pkg/lang-python/psutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/Makefile	2017-06-09 07:17:22 UTC (rev 26228)
+++ csw/mgar/pkg/lang-python/psutil/trunk/Makefile	2017-06-09 11:53:33 UTC (rev 26229)
@@ -3,7 +3,7 @@
 #
 
 NAME = psutil
-VERSION = 3.2.2
+VERSION = 5.2.2
 GARTYPE = v2
 CATEGORIES = python
 
@@ -11,22 +11,23 @@
 psutil is a cross-platform library for retrieving information onrunning processes and system utilization (CPU,memory, disks, network)in Python. 
 endef
 
-
 MASTER_SITES += $(PYPI_MIRROR)
 DISTFILES += $(DISTNAME).tar.gz
 
 # This is a new package, don't bother building for 2.6 some deps are 2.7 only anyway
-#MODULATIONS_PYTHON_VERSION = 2_7
+MODULATIONS_PYTHON_VERSION = 2_7
+CHECKPKG_OVERRIDES_CSWpy-psutil += python-package-missing-py26-files
 
-PATCHFILES += fix_solaris_build.patch
-
 PACKAGES += CSWpy-psutil
 SPKG_DESC_CSWpy-psutil = Psutil is a library for retrieving information onrunning processes
 # PKGFILES is catchall
-
 RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibpython2-7-1-0
-RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibpython2-6-1-0
 RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibgcc-s1
+# We don't have upstart:
+#   'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg', 'COLORTERM': 'gnome-terminal',
+CHECKPKG_OVERRIDES_CSWpy-psutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/psutil-5.2.2-py2.7.egg-info/PKG-INFO
 
+REINPLACE_USRLOCAL += psutil/tests/test_process.py
+REINPLACE_USRLOCAL += psutil/tests/test_posix.py
 
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/psutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/checksums	2017-06-09 07:17:22 UTC (rev 26228)
+++ csw/mgar/pkg/lang-python/psutil/trunk/checksums	2017-06-09 11:53:33 UTC (rev 26229)
@@ -1 +1 @@
-56df1727c9e26076a80da4c3f8f67976  psutil-3.2.2.tar.gz
+bb98d48796cd76d9ccee871aad720f9c  psutil-5.2.2.tar.gz

Deleted: csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch	2017-06-09 07:17:22 UTC (rev 26228)
+++ csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch	2017-06-09 11:53:33 UTC (rev 26229)
@@ -1,61 +0,0 @@
-From f89aec2e56e1e1e503a6292850048bbea6de31a1 Mon Sep 17 00:00:00 2001
-From: bsebi <sebastianbrestin at gmail.com>
-Date: Wed, 28 Oct 2015 18:50:41 +0200
-Subject: [PATCH] #704: psutil does not compile/cannot be imported on solaris
- sparc
-
----
- CREDITS                | 5 +++++
- psutil/__init__.py     | 2 +-
- psutil/_psutil_posix.c | 2 +-
- setup.py               | 4 ++--
- 5 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/psutil/__init__.py b/psutil/__init__.py
-index 1a75a9f..2343391 100644
---- a/psutil/__init__.py
-+++ b/psutil/__init__.py
-@@ -121,7 +121,7 @@
- elif sys.platform.startswith("freebsd"):
-     from . import _psbsd as _psplatform
- 
--elif sys.platform.startswith("sunos"):
-+elif sys.platform.startswith("sunos") or sys.platform.startswith("solaris"):
-     from . import _pssunos as _psplatform
-     from ._pssunos import (CONN_IDLE,  # NOQA
-                            CONN_BOUND)
-diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c
-index 1e27cdb..1dfbcf4 100644
---- a/psutil/_psutil_posix.c
-+++ b/psutil/_psutil_posix.c
-@@ -16,7 +16,7 @@
- #include <net/if.h>
- 
- #ifdef PSUTIL_SUNOS10
--#include "arch/solaris10/ifaddrs.h"
-+#include "arch/solaris/v10/ifaddrs.h"
- #else
- #include <ifaddrs.h>
- #endif
-diff --git a/setup.py b/setup.py
-index 3cb2dd6..8ff41d3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -71,7 +71,7 @@ def write(self, s):
-     posix_extension = Extension(
-         'psutil._psutil_posix',
-         sources=['psutil/_psutil_posix.c'])
--    if sys.platform.startswith("sunos"):
-+    if sys.platform.startswith("sunos") or sys.platform.startswith("solaris"):
-         posix_extension.libraries.append('socket')
-         if platform.release() == '5.10':
-             posix_extension.sources.append('psutil/arch/solaris/v10/ifaddrs.c')
-@@ -175,7 +175,7 @@ def on_exit():
-         define_macros=macros)
-     extensions = [ext, posix_extension]
- # Solaris
--elif sys.platform.lower().startswith('sunos'):
-+elif sys.platform.lower().startswith('sunos') or sys.platform.lower().startswith('solaris'):
-     ext = Extension(
-         'psutil._psutil_sunos',
-         sources=['psutil/_psutil_sunos.c'],

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.