security/*gpgme*: Update to 1.7.0

security/py-gpgme: Convert pkg-plist to Python 3.x style

7 files changed, 75 insertions, 66 deletions

diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist
index b3ba19178070..73e8a46aafec 100644
--- a/security/gpgme-cpp/pkg-plist
+++ b/security/gpgme-cpp/pkg-plist
@@ -10,6 +10,7 @@ include/gpgme++/error.h
 include/gpgme++/eventloopinteractor.h
 include/gpgme++/exception.h
 include/gpgme++/global.h
+include/gpgme++/gpgaddexistingsubkeyeditinteractor.h
 include/gpgme++/gpgadduserideditinteractor.h
 include/gpgme++/gpgagentgetinfoassuantransaction.h
 include/gpgme++/gpggencardkeyinteractor.h
@@ -42,4 +43,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake
 lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
 lib/libgpgmepp.so
 lib/libgpgmepp.so.6
-lib/libgpgmepp.so.6.12.1
+lib/libgpgmepp.so.6.14.0
diff --git a/security/gpgme-qt5/pkg-plist b/security/gpgme-qt5/pkg-plist
index a311af33cbf0..abdf09291c16 100644
--- a/security/gpgme-qt5/pkg-plist
+++ b/security/gpgme-qt5/pkg-plist
@@ -1,4 +1,5 @@
 include/QGpgME/AbstractImportJob
+include/QGpgME/AddExistingSubkeyJob
 include/QGpgME/AddUserIDJob
 include/QGpgME/ChangeExpiryJob
 include/QGpgME/ChangeOwnerTrustJob
@@ -27,6 +28,7 @@ include/QGpgME/MultiDeleteJob
 include/QGpgME/Protocol
 include/QGpgME/QGpgMENewCryptoConfig
 include/QGpgME/QuickJob
+include/QGpgME/ReceiveKeysJob
 include/QGpgME/RefreshKeysJob
 include/QGpgME/SignEncryptJob
 include/QGpgME/SignJob
@@ -35,8 +37,11 @@ include/QGpgME/SpecialJob
 include/QGpgME/TofuPolicyJob
 include/QGpgME/VerifyDetachedJob
 include/QGpgME/VerifyOpaqueJob
+include/QGpgME/WKDLookupJob
+include/QGpgME/WKDLookupResult
 include/QGpgME/WKSPublishJob
 include/qgpgme/abstractimportjob.h
+include/qgpgme/addexistingsubkeyjob.h
 include/qgpgme/adduseridjob.h
 include/qgpgme/changeexpiryjob.h
 include/qgpgme/changeownertrustjob.h
@@ -67,6 +72,7 @@ include/qgpgme/qgpgme_export.h
 include/qgpgme/qgpgme_version.h
 include/qgpgme/qgpgmenewcryptoconfig.h
 include/qgpgme/quickjob.h
+include/qgpgme/receivekeysjob.h
 include/qgpgme/refreshkeysjob.h
 include/qgpgme/signencryptjob.h
 include/qgpgme/signjob.h
@@ -75,9 +81,11 @@ include/qgpgme/specialjob.h
 include/qgpgme/tofupolicyjob.h
 include/qgpgme/verifydetachedjob.h
 include/qgpgme/verifyopaquejob.h
+include/qgpgme/wkdlookupjob.h
+include/qgpgme/wkdlookupresult.h
 include/qgpgme/wkspublishjob.h
 lib/cmake/QGpgme/QGpgmeConfig.cmake
 lib/cmake/QGpgme/QGpgmeConfigVersion.cmake
 lib/libqgpgme.so
 lib/libqgpgme.so.7
-lib/libqgpgme.so.7.5.1
+lib/libqgpgme.so.7.7.0
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 938605ba1c98..54b615d39da5 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,7 +1,7 @@
 # Created by: teramoto@comm.eng.osaka-u.ac.jp
 
 PORTNAME=	gpgme
-PORTVERSION=	1.15.1
+PORTVERSION=	1.17.0
 PORTREVISION?=	0
 CATEGORIES?=	security
 MASTER_SITES=	GNUPG/gpgme
@@ -82,8 +82,8 @@ TEST_USE=		QT=testlib_build
 BUILD_DEPENDS+=	swig:devel/swig \
 		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
-USES+=		python:3.6+
-USE_PYTHON=	py3kplist flavors
+USES+=		python:3.7+
+USE_PYTHON=	flavors
 CONFIGURE_ARGS+=--enable-languages="python"
 CONFIGURE_ENV+=	BSD_PYTHON="${PYTHON_CMD}" \
 		BSD_PYTHON_VERSION="${PYTHON_VER}" \
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 59c3bdf2a31f..81e11419f43d 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610205903
-SHA256 (gpgme-1.15.1.tar.bz2) = eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
-SIZE (gpgme-1.15.1.tar.bz2) = 1699349
+TIMESTAMP = 1645363726
+SHA256 (gpgme-1.17.0.tar.bz2) = 4ed3f50ceb7be2fce2c291414256b20c9ebf4c03fddb922c88cda99c119a69f5
+SIZE (gpgme-1.17.0.tar.bz2) = 1748416
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index e4f4699b807e..2c90a61a5643 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -8,7 +8,7 @@ lib/common-lisp/gpgme/gpgme.asd
 lib/common-lisp/gpgme/gpgme.lisp
 lib/libgpgme.so
 lib/libgpgme.so.11
-lib/libgpgme.so.11.24.1
+lib/libgpgme.so.11.26.0
 libdata/pkgconfig/gpgme-glib.pc
 libdata/pkgconfig/gpgme.pc
 share/aclocal/gpgme.m4
diff --git a/security/py-gpgme/Makefile b/security/py-gpgme/Makefile
index e636238bd912..06c2dcb7f7f3 100644
--- a/security/py-gpgme/Makefile
+++ b/security/py-gpgme/Makefile
@@ -11,6 +11,6 @@ BINDING_NAME=	python
 PLIST=		${.CURDIR}/pkg-plist
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/gpg/_gpgme*.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gpg/_gpgme*.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/py-gpgme/pkg-plist b/security/py-gpgme/pkg-plist
index 4a5952119bb2..3b825d5c7441 100644
--- a/security/py-gpgme/pkg-plist
+++ b/security/py-gpgme/pkg-plist
@@ -1,86 +1,86 @@
 %%PYTHON_SITELIBDIR%%/gpg-%%VERSION%%-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/gpg/__init__.py
-%%PYTHON_SITELIBDIR%%/gpg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gpg/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/callbacks%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/callbacks%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/core%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/gpgme%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/gpgme%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/results%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/results%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/util%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/version%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/__pycache__/version%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gpg/_gpgme%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/gpg/callbacks.py
-%%PYTHON_SITELIBDIR%%/gpg/callbacks.pyc
-%%PYTHON_SITELIBDIR%%/gpg/callbacks.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/__init__.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/create%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/create%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/event%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/event%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/import_type%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/import_type%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/keysign%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/keysign%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/md%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/md%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/pk%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/pk%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/protocol%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/protocol%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/sigsum%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/sigsum%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/status%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/status%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/validity%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/__pycache__/validity%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gpg/constants/create.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/data/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/data/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/data/__pycache__/encoding%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/data/__pycache__/encoding%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gpg/constants/data/encoding.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/data/encoding.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/data/encoding.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/event.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/event.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/event.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/import_type.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/import_type.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/import_type.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__init__.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__pycache__/mode%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/__pycache__/mode%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/keysign.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/md.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/pk.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/pk.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/pk.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/protocol.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/protocol.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/protocol.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/sig/__init__.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__pycache__/mode%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__pycache__/mode%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__pycache__/notation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/sig/__pycache__/notation%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gpg/constants/sig/mode.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/sig/mode.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/sig/mode.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/sig/notation.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/sig/notation.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/sig/notation.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/sigsum.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/sigsum.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/sigsum.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/status.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__pycache__/policy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__pycache__/policy%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyo
 %%PYTHON_SITELIBDIR%%/gpg/constants/validity.py
-%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyc
-%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyo
 %%PYTHON_SITELIBDIR%%/gpg/core.py
-%%PYTHON_SITELIBDIR%%/gpg/core.pyc
-%%PYTHON_SITELIBDIR%%/gpg/core.pyo
 %%PYTHON_SITELIBDIR%%/gpg/errors.py
-%%PYTHON_SITELIBDIR%%/gpg/errors.pyc
-%%PYTHON_SITELIBDIR%%/gpg/errors.pyo
 %%PYTHON_SITELIBDIR%%/gpg/gpgme.py
-%%PYTHON_SITELIBDIR%%/gpg/gpgme.pyc
-%%PYTHON_SITELIBDIR%%/gpg/gpgme.pyo
 %%PYTHON_SITELIBDIR%%/gpg/results.py
-%%PYTHON_SITELIBDIR%%/gpg/results.pyc
-%%PYTHON_SITELIBDIR%%/gpg/results.pyo
 %%PYTHON_SITELIBDIR%%/gpg/util.py
-%%PYTHON_SITELIBDIR%%/gpg/util.pyc
-%%PYTHON_SITELIBDIR%%/gpg/util.pyo
 %%PYTHON_SITELIBDIR%%/gpg/version.py
-%%PYTHON_SITELIBDIR%%/gpg/version.pyc
-%%PYTHON_SITELIBDIR%%/gpg/version.pyo