security/*gpgme*: Update to 1.21.0

Split out the headers shared between the qt5 and qt6 flavors of
security/gpgme-qt to security/gpgme-qt-headers so that they no longer
conflict.

https://dev.gnupg.org/T6585

10 files changed, 47 insertions, 125 deletions

diff --git a/security/Makefile b/security/Makefile
index 8a4b7983dcae..1ca071f87b2e 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -197,6 +197,7 @@
     SUBDIR += gpgme
     SUBDIR += gpgme-cpp
     SUBDIR += gpgme-qt
+    SUBDIR += gpgme-qt-headers
     SUBDIR += gsa
     SUBDIR += gsad
     SUBDIR += gsasl
diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist
index afa01a90a173..c5eb9f270964 100644
--- a/security/gpgme-cpp/pkg-plist
+++ b/security/gpgme-cpp/pkg-plist
@@ -44,4 +44,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake
 lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
 lib/libgpgmepp.so
 lib/libgpgmepp.so.6
-lib/libgpgmepp.so.6.17.0
+lib/libgpgmepp.so.6.18.0
diff --git a/security/gpgme-qt-headers/Makefile b/security/gpgme-qt-headers/Makefile
new file mode 100644
index 000000000000..76fbf8376bd0
--- /dev/null
+++ b/security/gpgme-qt-headers/Makefile
@@ -0,0 +1,14 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-${SLAVEPORT}
+
+COMMENT=	Shared headers for the Gpgme Qt bindings
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+MASTERDIR=	${.CURDIR}/../../security/gpgme
+SLAVEPORT=	qt-headers
+BINDING_NAME=	qt
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/gpgme-qt/pkg-plist.qt5 b/security/gpgme-qt-headers/pkg-plist
index d10663f13c7f..5f86f21d9979 100644
--- a/security/gpgme-qt/pkg-plist.qt5
+++ b/security/gpgme-qt-headers/pkg-plist
@@ -98,8 +98,3 @@ 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.15
-lib/libqgpgme.so.15.2.1
diff --git a/security/gpgme-qt/Makefile b/security/gpgme-qt/Makefile
index 017cf7dda006..354fd2ccc31a 100644
--- a/security/gpgme-qt/Makefile
+++ b/security/gpgme-qt/Makefile
@@ -14,5 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MASTERDIR=	${.CURDIR}/../../security/gpgme
 SLAVEPORT=	qt
 BINDING_NAME=	qt
+PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/gpgme-qt/pkg-plist b/security/gpgme-qt/pkg-plist
new file mode 100644
index 000000000000..4d404382a6cb
--- /dev/null
+++ b/security/gpgme-qt/pkg-plist
@@ -0,0 +1,5 @@
+lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%Config.cmake
+lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%ConfigVersion.cmake
+lib/libqgpgme%%qt_SUFFIX%%.so
+lib/libqgpgme%%qt_SUFFIX%%.so.15
+lib/libqgpgme%%qt_SUFFIX%%.so.15.3.0
diff --git a/security/gpgme-qt/pkg-plist.qt6 b/security/gpgme-qt/pkg-plist.qt6
deleted file mode 100644
index 77f12008e497..000000000000
--- a/security/gpgme-qt/pkg-plist.qt6
+++ /dev/null
@@ -1,105 +0,0 @@
-include/QGpgME/AbstractImportJob
-include/QGpgME/AddExistingSubkeyJob
-include/QGpgME/AddUserIDJob
-include/QGpgME/ChangeExpiryJob
-include/QGpgME/ChangeOwnerTrustJob
-include/QGpgME/ChangePasswdJob
-include/QGpgME/CryptoConfig
-include/QGpgME/DN
-include/QGpgME/DataProvider
-include/QGpgME/Debug
-include/QGpgME/DecryptJob
-include/QGpgME/DecryptVerifyArchiveJob
-include/QGpgME/DecryptVerifyJob
-include/QGpgME/DefaultKeyGenerationJob
-include/QGpgME/DeleteJob
-include/QGpgME/DownloadJob
-include/QGpgME/EncryptArchiveJob
-include/QGpgME/EncryptJob
-include/QGpgME/ExportJob
-include/QGpgME/FileListDataProvider
-include/QGpgME/GpgCardJob
-include/QGpgME/HierarchicalKeyKistJob
-include/QGpgME/ImportFromKeyserverJob
-include/QGpgME/ImportJob
-include/QGpgME/Job
-include/QGpgME/KeyForMailboxJob
-include/QGpgME/KeyGenerationJob
-include/QGpgME/KeyListJob
-include/QGpgME/ListAllKeysJob
-include/QGpgME/MultiDeleteJob
-include/QGpgME/Protocol
-include/QGpgME/QGpgMENewCryptoConfig
-include/QGpgME/QuickJob
-include/QGpgME/ReceiveKeysJob
-include/QGpgME/RefreshKeysJob
-include/QGpgME/RevokeKeyJob
-include/QGpgME/SetPrimaryUserIDJob
-include/QGpgME/SignArchiveJob
-include/QGpgME/SignEncryptArchiveJob
-include/QGpgME/SignEncryptJob
-include/QGpgME/SignJob
-include/QGpgME/SignKeyJob
-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
-include/qgpgme/changepasswdjob.h
-include/qgpgme/cryptoconfig.h
-include/qgpgme/dataprovider.h
-include/qgpgme/debug.h
-include/qgpgme/decryptjob.h
-include/qgpgme/decryptverifyarchivejob.h
-include/qgpgme/decryptverifyjob.h
-include/qgpgme/defaultkeygenerationjob.h
-include/qgpgme/deletejob.h
-include/qgpgme/dn.h
-include/qgpgme/downloadjob.h
-include/qgpgme/encryptarchivejob.h
-include/qgpgme/encryptjob.h
-include/qgpgme/exportjob.h
-include/qgpgme/filelistdataprovider.h
-include/qgpgme/gpgcardjob.h
-include/qgpgme/hierarchicalkeylistjob.h
-include/qgpgme/importfromkeyserverjob.h
-include/qgpgme/importjob.h
-include/qgpgme/job.h
-include/qgpgme/keyformailboxjob.h
-include/qgpgme/keygenerationjob.h
-include/qgpgme/keylistjob.h
-include/qgpgme/listallkeysjob.h
-include/qgpgme/multideletejob.h
-include/qgpgme/protocol.h
-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/revokekeyjob.h
-include/qgpgme/setprimaryuseridjob.h
-include/qgpgme/signarchivejob.h
-include/qgpgme/signencryptarchivejob.h
-include/qgpgme/signencryptjob.h
-include/qgpgme/signjob.h
-include/qgpgme/signkeyjob.h
-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/QGpgmeQt6/QGpgmeQt6Config.cmake
-lib/cmake/QGpgmeQt6/QGpgmeQt6ConfigVersion.cmake
-lib/libqgpgmeqt6.so
-lib/libqgpgmeqt6.so.15
-lib/libqgpgmeqt6.so.15.2.1
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 7169cfc03799..fd7b18ee07d2 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gpgme
-PORTVERSION=	1.20.0
+PORTVERSION=	1.21.0
 PORTREVISION?=	0
 CATEGORIES?=	security
 MASTER_SITES=	GNUPG/gpgme
@@ -18,7 +18,8 @@ USES=		compiler:c11 cpe gmake libtool localbase:ldflags tar:bzip2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+CFLAGS+=	-Wno-suggest-override -Wno-unknown-warning-option
+INSTALL_TARGET?=install-strip
 TEST_TARGET=	check
 
 CPE_VENDOR=	gnu
@@ -54,7 +55,7 @@ BUILD_WRKSRC=	${WRKSRC}/lang/${BINDING_NAME}
 INSTALL_WRKSRC=	${WRKSRC}/lang/${BINDING_NAME}
 TEST_WRKSRC=	${WRKSRC}/lang/${BINDING_NAME}/tests
 
-.  if ${SLAVEPORT} != "cpp"
+.  if ${SLAVEPORT} != "cpp" && ${SLAVEPORT} != "qt-headers"
 OPTIONS_DEFINE+=	TEST
 .  endif
 
@@ -64,26 +65,32 @@ CONFIGURE_ARGS+=--enable-languages="cpp"
 NO_TEST=	yes
 .  endif
 
+.  if ${SLAVEPORT} == "qt-headers"
+CONFIGURE_ARGS+=--enable-languages=""
+ALL_TARGET=	all-am
+INSTALL_TARGET=	install-data
+NO_TEST=	yes
+.  endif
+
 .  if ${SLAVEPORT} == "qt"
 LIB_DEPENDS+=	libgpgmepp.so:security/gpgme-cpp
+RUN_DEPENDS+=	${LOCALBASE}/include/qgpgme/qgpgme_version.h:security/gpgme-qt-headers
 
 FLAVORS=		qt5 qt6
 FLAVOR?=		${FLAVORS:[1]}
 qt5_PKGNAMESUFFIX=	-qt5
 qt6_PKGNAMESUFFIX=	-qt6
-qt5_PLIST=		${.CURDIR}/pkg-plist.qt5
-qt6_PLIST=		${.CURDIR}/pkg-plist.qt6
-qt5_CONFLICTS_INSTALL=	gpgme-qt6
-qt6_CONFLICTS_INSTALL=	gpgme-qt5
 
 .    if ${FLAVOR:U} == "qt5"
 USES+=		compiler:c++11-lib pkgconfig qt:5
 USE_QT=		buildtools:build core
 TEST_USE=	QT=testlib:build
+PLIST_SUB=	QT_SUFFIX="" qt_SUFFIX=""
 .    else
 USES+=		compiler:c++17-lang pkgconfig qt:6
 USE_QT=		base
 USE_CXXSTD=	c++17
+PLIST_SUB=	QT_SUFFIX="Qt6" qt_SUFFIX="qt6"
 .    endif
 
 CONFIGURE_ARGS+=--enable-languages="cpp ${FLAVOR}"
@@ -115,13 +122,17 @@ post-patch:
 .  if ${SLAVEPORT} == "qt"
 	@${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \
 	${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g'
+	@${REINPLACE_CMD} -e 's|install-exec-am install-data-am|install-exec-am install-data-local|' \
+		${WRKSRC}/lang/qt/src/Makefile.in
+.  endif
+.  if ${SLAVEPORT} == "qt-headers"
+	@${REINPLACE_CMD} -e '/^all-am/s|$$(LTLIBRARIES)||' \
+		-e '/^install-data-am/s|install-data-local||' \
+		${WRKSRC}/lang/qt/src/Makefile.in
 .  endif
 .endif
 	@${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \
 		${WRKSRC}/lang/cl/Makefile.in
-	@${REINPLACE_CMD} -e 's|-Wsuggest-override||g' \
-		${WRKSRC}/lang/cpp/src/Makefile.in \
-		${WRKSRC}/lang/qt/src/Makefile.in
 
 post-patch-DOXYGEN-off:
 	@${REINPLACE_CMD} -e '/SUBDIRS/s|doc||' \
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 527c32d38147..6a1ca470392a 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683032158
-SHA256 (gpgme-1.20.0.tar.bz2) = 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
-SIZE (gpgme-1.20.0.tar.bz2) = 1817377
+TIMESTAMP = 1688831601
+SHA256 (gpgme-1.21.0.tar.bz2) = 416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
+SIZE (gpgme-1.21.0.tar.bz2) = 1830113
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index 848a524b7fda..7477164b34fb 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.29.0
+lib/libgpgme.so.11.30.0
 libdata/pkgconfig/gpgme-glib.pc
 libdata/pkgconfig/gpgme.pc
 share/aclocal/gpgme.m4