On Sat Sep 21, 2024 at 11:37:38AM GMT, Stuart Henderson wrote:
> Surely those headers should be in the qt subpackage not -main?
> 

Yes, it makes sense. New diff:

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index fdb25f89307..cba7d07eb8c 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -5,7 +5,7 @@ VERSION =	1.23.2
 DISTNAME =	gpgme-${VERSION}
 PKGNAME-main =	gpgme-${VERSION}
 PKGNAME-qt =	gpgme-qt-${VERSION}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security devel
 
diff --git a/security/gpgme/pkg/PLIST-main b/security/gpgme/pkg/PLIST-main
index 3efc0f5fd05..4398d6f5b0f 100644
--- a/security/gpgme/pkg/PLIST-main
+++ b/security/gpgme/pkg/PLIST-main
@@ -2,9 +2,7 @@
 bin/gpgme-config
 @bin bin/gpgme-json
 @bin bin/gpgme-tool
-include/QGpgME/WKDRefreshJob
 include/gpgme.h
-include/qgpgme/wkdrefreshjob.h
 @info info/gpgme.info
 @static-lib lib/libgpgme.a
 lib/libgpgme.la
diff --git a/security/gpgme/pkg/PLIST-qt b/security/gpgme/pkg/PLIST-qt
index 7d638c750ed..d4a8a90793b 100644
--- a/security/gpgme/pkg/PLIST-qt
+++ b/security/gpgme/pkg/PLIST-qt
@@ -1,3 +1,4 @@
+@conflict gpgme-<1.23.2p1
 include/QGpgME/
 include/QGpgME/AbstractImportJob
 include/QGpgME/AddExistingSubkeyJob
@@ -47,6 +48,7 @@ include/QGpgME/VerifyDetachedJob
 include/QGpgME/VerifyOpaqueJob
 include/QGpgME/WKDLookupJob
 include/QGpgME/WKDLookupResult
+include/QGpgME/WKDRefreshJob
 include/QGpgME/WKSPublishJob
 include/gpgme++/
 include/gpgme++/configuration.h
@@ -143,6 +145,7 @@ include/qgpgme/verifydetachedjob.h
 include/qgpgme/verifyopaquejob.h
 include/qgpgme/wkdlookupjob.h
 include/qgpgme/wkdlookupresult.h
+include/qgpgme/wkdrefreshjob.h
 include/qgpgme/wkspublishjob.h
 lib/cmake/Gpgmepp/
 lib/cmake/Gpgmepp/GpgmeppConfig.cmake