On 9/5/20 7:25 AM, Edd Barrett wrote:
> Hi all,
>
> No maintainer:
> mail/pine-pgp-filters
> security/py-gnupg
> security/py-gnupg,python3
> security/clamav-unofficial-sigs
>
I've been using an updated py3-gnupg in my local tree.
I've attached the git diff which sets the GPGBINARY to gpg2 currently.
That modification can be removed if gpg1 is going to be removed and gpg2
will become gpg1.
Another small modification is to remove external tests from running, which
makes all 32 tests pass, which seems like a nice benefit.
Also, I haven't added myself as maintainer but am willing to take it if
nobody else wants to.
OK?
Aisha
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 09751fe61e8..08b678ea114 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -2,10 +2,9 @@
COMMENT= Python module for GnuPG interface
-MODPY_EGG_VERSION= 0.4.3
+MODPY_EGG_VERSION= 0.4.6
DISTNAME= python-gnupg-${MODPY_EGG_VERSION}
PKGNAME= py-gnupg-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES= security devel
@@ -19,13 +18,17 @@ MODPY_PI= Yes
MODULES= lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR ?= python3
-BUILD_DEPENDS= security/gnupg
-RUN_DEPENDS= security/gnupg
+MODPY_SETUPTOOLS = Yes
+
+BUILD_DEPENDS= security/gnupg2
+RUN_DEPENDS= security/gnupg2
do-test:
cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} LOGNAME=nobody ${MODPY_BIN} test_gnupg.py
+ ${SETENV} ${MAKE_ENV} \
+ NO_EXTERNAL_TESTS=1 LOGNAME=nobody GPGBINARY=gpg2 \
+ ${MODPY_BIN} test_gnupg.py
.include <bsd.port.mk>
diff --git a/security/py-gnupg/distinfo b/security/py-gnupg/distinfo
index 98bfd59a0ef..8882777bee0 100644
--- a/security/py-gnupg/distinfo
+++ b/security/py-gnupg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-gnupg-0.4.3.tar.gz) = LRWN/GtUkndSuUXr5X5qDEXaJ3R/o7muZuzMDSFHrA0=
-SIZE (python-gnupg-0.4.3.tar.gz) = 46958
+SHA256 (python-gnupg-0.4.6.tar.gz) = OqCISzvUFGUsI4W53znnuHJywuyhuPzDCJvJ5YZSAZo=
+SIZE (python-gnupg-0.4.6.tar.gz) = 52527
diff --git a/security/py-gnupg/pkg/PLIST b/security/py-gnupg/pkg/PLIST
index a5e37297e50..d0a504f60ea 100644
--- a/security/py-gnupg/pkg/PLIST
+++ b/security/py-gnupg/pkg/PLIST
@@ -1,5 +1,8 @@
@comment $OpenBSD: PLIST,v 1.8 2018/06/23 15:11:23 ajacoutot Exp $
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/gnupg.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gnupg.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/python_gnupg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/gnupg.py
+lib/python${MODPY_VERSION}/site-packages/python_gnupg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/python_gnupg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/python_gnupg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/python_gnupg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/python_gnupg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
