From 477405deae059a23a536e0f9407916f94e6d8141 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 6 Jan 2023 11:55:15 +0000
Subject: [PATCH] update to py3-logilab-common-1.9.8

---
 devel/py-logilab-common/Makefile              | 30 ++++++++-----------
 devel/py-logilab-common/distinfo              |  4 +--
 .../patches/patch-logilab_common_proc_py      | 16 +++++-----
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 5b14f855499..d389534166e 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,29 +1,23 @@
-COMMENT=		common low-level libraries for logilab projects
+COMMENT=	common low-level libraries for logilab projects
 
-MODPY_EGG_VERSION =	1.4.0
-DISTNAME=		logilab-common-${MODPY_EGG_VERSION}
-PKGNAME=		py-${DISTNAME}
-CATEGORIES=		devel
-REVISION=		8
+MODPY_EGG_VERSION=	1.9.8
+DISTNAME=	logilab-common-${MODPY_EGG_VERSION}
+PKGNAME=	py-${DISTNAME}
+CATEGORIES=	devel
 
-HOMEPAGE=		https://www.logilab.org/project/logilab-common
+HOMEPAGE=	https://www.logilab.org/project/logilab-common
 
 # LGPLv2.1+
 PERMIT_PACKAGE=	Yes
 
-MODULES=		lang/python
+MODULES=	lang/python
 
-RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
-TEST_DEPENDS =		${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
-			devel/py-tz${MODPY_FLAVOR}
+TEST_DEPENDS=	devel/py-tz${MODPY_FLAVOR}
 
-MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools
+MODPY_PI=	Yes
+MODPY_PYBUILD=	setuptools
 
-FLAVORS =		python3
-FLAVOR =		python3
-
-do-test:
-	cd ${WRKSRC} && ${MODPY_BIN} -W once -m logilab.common.pytest
+FLAVORS=	python3
+FLAVOR=		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-logilab-common/distinfo b/devel/py-logilab-common/distinfo
index 83100d6870f..6892d6be7c0 100644
--- a/devel/py-logilab-common/distinfo
+++ b/devel/py-logilab-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (logilab-common-1.4.0.tar.gz) = T2/rmE7hqgvvS6nkK80HwglfYx6X/t3CGwu45Mh5IK8=
-SIZE (logilab-common-1.4.0.tar.gz) = 185740
+SHA256 (logilab-common-1.9.8.tar.gz) = 9KjSAbbx60aqU2ejw9J0pQ7FDSD1fY/6jUveom7b/ec=
+SIZE (logilab-common-1.9.8.tar.gz) = 206662
diff --git a/devel/py-logilab-common/patches/patch-logilab_common_proc_py b/devel/py-logilab-common/patches/patch-logilab_common_proc_py
index d7c7ea71691..15c13cac32b 100644
--- a/devel/py-logilab-common/patches/patch-logilab_common_proc_py
+++ b/devel/py-logilab-common/patches/patch-logilab_common_proc_py
@@ -1,7 +1,8 @@
 OpenBSD doesn't support RLIMIT_AS
 
---- logilab/common/proc.py.orig	Mon Oct 12 20:39:18 2015
-+++ logilab/common/proc.py	Sun Oct 18 17:05:28 2015
+Index: logilab/common/proc.py
+--- logilab/common/proc.py.orig
++++ logilab/common/proc.py
 @@ -30,7 +30,7 @@ __docformat__ = "restructuredtext en"
  
  import os
@@ -11,21 +12,20 @@ OpenBSD doesn't support RLIMIT_AS
  from signal import signal, SIGXCPU, SIGKILL, SIGUSR2, SIGUSR1
  from threading import Timer, currentThread, Thread, Event
  from time import time
-@@ -251,10 +251,10 @@ class ResourceController:
+@@ -253,10 +253,10 @@ class ResourceController:
                  setrlimit(RLIMIT_CPU, cpu_limit)
              if self.max_memory is not None:
-                 self._msentinel = MemorySentinel(1, int(self.max_memory) )
+                 self._msentinel = MemorySentinel(1, int(self.max_memory))
 -                self._old_max_memory = getrlimit(RLIMIT_AS)
 +                self._old_max_memory = getrlimit(RLIMIT_DATA)
                  self._old_usr1_hdlr = signal(SIGUSR1, self._hangle_sig_memory)
--                as_limit = (int(self.max_memory), self._old_max_memory[1])
+                 as_limit = (int(self.max_memory), self._old_max_memory[1])
 -                setrlimit(RLIMIT_AS, as_limit)
-+                data_limit = (int(self.max_memory), self._old_max_memory[1])
-+                setrlimit(RLIMIT_DATA, data_limit)
++                setrlimit(RLIMIT_DATA, as_limit)
                  self._msentinel.start()
          self._limit_set += 1
  
-@@ -272,6 +272,6 @@ class ResourceController:
+@@ -274,6 +274,6 @@ class ResourceController:
              if self.max_memory is not None:
                  self._msentinel.stop()
                  self._msentinel = None