Update security/gpgme-* to 1.8.0

In this version, libgpgme-pthread.so has been removed in favor of just using libgpgme.so as the thread-safe library. PORTREVISION has been bumped on all ports depending on security/gpgme so that any that may have linked to -lgpgme-pthread will link to -lgpgme instead. The Python module provided by security/py-gpgme has been renamed upstream from pyme3 to gpg. This removes the conflict with security/py-pyme, although security/py-gpgme is still the direct replacement of that module.
svn path=/head/; revision=427185
2024-12-24 04:33:24 +00:00 · 2016-11-26 23:41:16 +00:00 · 2016-11-26 23:41:16 +00:00 · d32b8fe316 · 2021-03-31 03:12:20 +00:00
commit d32b8fe316
parent f334a7c6fa
46 changed files with 173 additions and 151 deletions
--- a/18
+++ b/18
@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20161126:
+  AFFECTS: Users of security/gpgme-*
+  AUTHOR: jhale@FreeBSD.org
+
+  Gpgme has been updated to 1.8.0.
+  With it comes the removal of libgpgme-pthread.so in favor of using
+  libgpgme.so itself as the thread-safe library. Ports that may have
+  linked to -lgpgme-pthread will now just link to -lgpgme. PORTREVISION
+  has been bumped on all ports with a dependency on security/gpgme.
+
+  The Python module provided by security/py-gpgme has been renamed
+  from pyme3 to gpg, as well.
+
+  Portmaster users:
+      portmaster -r gpgme
+  Portupgrade users:
+      portupgrade -fr security/gpgme
+
 20161121:
  AFFECTS: Users of graphics/tiff
  AUTHOR: antoine@FreeBSD.org
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	basket
 PORTVERSION=	1.81
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://basket.kde.org/downloads/

--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_KDELIBS_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_KDELIBS_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
--- a/devel/geany-plugin-pg/Makefile
+++ b/devel/geany-plugin-pg/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	geany-plugin-pg
 PORTVERSION=	${GEANY_VER}
+PORTREVISION=	1
 CATEGORIES=	devel

 MAINTAINER=	madpilot@FreeBSD.org
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	kmymoney
 PORTVERSION=	4.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src

--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	qhacc
 PORTVERSION=	4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	GNU

--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	balsa
 PORTVERSION=	2.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/

--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pgp
-PORTREVISION=	0
+PORTREVISION=	1

 COMMENT=	PGP plugins for Claws Mail

--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	elmo
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}

--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mutt
 PORTVERSION=	1.7.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	neomutt
 PORTVERSION=	20161104
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail

 MAINTAINER=	bapt@FreeBSD.org
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	sylpheed
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/  \
 		LOCAL/ehaupt
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ayttm
 PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	SF

--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	centerim
 PORTVERSION=	4.22.10.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.centerim.org/download/mobshots/ \
 		ftp://ftp.centerim.org/mobshots/
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	centerim
 PORTVERSION=	4.22.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.centerim.org/download/releases/ \
 		ftp://ftp.centerim.org/releases/
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	base
 PORTVERSION=	${LICQ_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}

--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	mcabber
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/

--- a/net-im/profanity/Makefile
+++ b/net-im/profanity/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	profanity
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.profanity.im/

--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	retroshare
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p

--- a/net/kget/Makefile
+++ b/net/kget/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	kget
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net kde kde-kde4

 MAINTAINER=	kde@FreeBSD.org
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ekg2
 PORTVERSION=	0.3.1
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://pl.ekg2.org/
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	fwknop
 PORTVERSION=	2.6.8
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.cipherdyne.org/fwknop/download/

--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gpa
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/gpa

--- a/security/gpgme-cpp/Makefile
+++ b/security/gpgme-cpp/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-${SLAVEPORT}

 MAINTAINER=	jhale@FreeBSD.org
--- a/security/gpgme-cpp/pkg-plist
+++ b/security/gpgme-cpp/pkg-plist
@ -14,6 +14,7 @@ include/gpgme++/gpgadduserideditinteractor.h
 include/gpgme++/gpgagentgetinfoassuantransaction.h
 include/gpgme++/gpgmefw.h
 include/gpgme++/gpgmepp_export.h
+include/gpgme++/gpgmepp_version.h
 include/gpgme++/gpgsetexpirytimeeditinteractor.h
 include/gpgme++/gpgsetownertrusteditinteractor.h
 include/gpgme++/gpgsignkeyeditinteractor.h
@ -29,13 +30,13 @@ include/gpgme++/notation.h
 include/gpgme++/result.h
 include/gpgme++/scdgetinfoassuantransaction.h
 include/gpgme++/signingresult.h
+include/gpgme++/swdbresult.h
 include/gpgme++/tofuinfo.h
 include/gpgme++/trustitem.h
 include/gpgme++/verificationresult.h
 include/gpgme++/vfsmountresult.h
-include/gpgmepp_version.h
 lib/cmake/Gpgmepp/GpgmeppConfig.cmake
 lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
 lib/libgpgmepp.so
 lib/libgpgmepp.so.6
-lib/libgpgmepp.so.6.2.0
+lib/libgpgmepp.so.6.3.0
--- a/security/gpgme-qt5/Makefile
+++ b/security/gpgme-qt5/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-${SLAVEPORT}

 MAINTAINER=	jhale@FreeBSD.org
--- a/security/gpgme-qt5/pkg-plist
+++ b/security/gpgme-qt5/pkg-plist
@ -4,6 +4,7 @@ include/QGpgME/ChangeExpiryJob
 include/QGpgME/ChangeOwnerTrustJob
 include/QGpgME/ChangePasswdJob
 include/QGpgME/CryptoConfig
+include/QGpgME/DN
 include/QGpgME/DataProvider
 include/QGpgME/DecryptJob
 include/QGpgME/DecryptVerifyJob
@ -43,6 +44,7 @@ include/qgpgme/decryptjob.h
 include/qgpgme/decryptverifyjob.h
 include/qgpgme/defaultkeygenerationjob.h
 include/qgpgme/deletejob.h
+include/qgpgme/dn.h
 include/qgpgme/downloadjob.h
 include/qgpgme/encryptjob.h
 include/qgpgme/exportjob.h
@ -57,6 +59,7 @@ 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/refreshkeysjob.h
 include/qgpgme/signencryptjob.h
@ -67,9 +70,8 @@ include/qgpgme/tofupolicyjob.h
 include/qgpgme/verifydetachedjob.h
 include/qgpgme/verifyopaquejob.h
 include/qgpgme/wkspublishjob.h
-include/qgpgme_version.h
-lib/cmake/Gpgmepp/QGpgmeConfig.cmake
-lib/cmake/Gpgmepp/QGpgmeConfigVersion.cmake
+lib/cmake/QGpgme/QGpgmeConfig.cmake
+lib/cmake/QGpgme/QGpgmeConfigVersion.cmake
 lib/libqgpgme.so
 lib/libqgpgme.so.7
-lib/libqgpgme.so.7.0.0
+lib/libqgpgme.so.7.1.0
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gpgme
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.0
 PORTREVISION?=	0
 CATEGORIES?=	security
 MASTER_SITES=	GNUPG/gpgme
@ -80,7 +80,6 @@ USES+=		python
 USE_PYTHON=	py3kplist
 CONFIGURE_ENV+=	SWIG=${LOCALBASE}/bin/swig3.0
 PLIST_SUB+=	VERSION=${PORTVERSION}
-CONFLICTS_INSTALL=	py*-pyme-[0-9]*
 .  endif
 .endif

--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1476904242
-SHA256 (gpgme-1.7.1.tar.bz2) = d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6
-SIZE (gpgme-1.7.1.tar.bz2) = 1285809
+TIMESTAMP = 1480065717
+SHA256 (gpgme-1.8.0.tar.bz2) = 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33
+SIZE (gpgme-1.8.0.tar.bz2) = 1298407
--- a/security/gpgme/files/patch-git_572c1aa
+++ b/security/gpgme/files/patch-git_572c1aa
@ -0,0 +1,26 @@
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 Nov 2016 22:09:45 +0000 (+0100)
+Subject: Remove a forgotten instance of @libsuffix@
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=572c1aac107125ce62230251713349348373db5a;hp=af79327021b5b3a5c4accd5d4e9f0124199bfdcc
+
+Remove a forgotten instance of @libsuffix@
+
+* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
+instance of @libsuffix@.
+--
+
+b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
+cmake config files, but missed one instance.
+
+Signed-off-by: Heiko Becker <heirecka@exherbo.org>
+--- lang/cpp/src/GpgmeppConfig.cmake.in.in.orig	2016-11-16 09:17:20 UTC
+++ lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
+  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )
+ 
--- a/security/gpgme/files/patch-git_b4658f6a1
+++ b/security/gpgme/files/patch-git_b4658f6a1
@ -1,35 +0,0 @@
-From: Andras Mantia <andras@kdab.com>
-Date: Wed, 2 Nov 2016 09:23:42 +0000 (+0200)
-Subject: qt: Fix build with g++ 4.8.x
-X-Git-Tag: gpgme-1.8.0~36
-X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=b4658f6a1110bb0b54bd5dfc9df8e8b390e38d61
-
-qt: Fix build with g++ 4.8.x
-
-* lang/qt/src/defaultkeygenerationjob.cpp
-(DefaultKeyGenerationJob::start): Explicitly connect pointer
-in the QPointer.
-
--
-Commit message written by Andre Heinecke <aheinecke@intevation.de>
---
-
-diff --git a/lang/qt/src/defaultkeygenerationjob.cpp b/lang/qt/src/defaultkeygenerationjob.cpp
-index d26e824..020f4d2 100644
--- lang/qt/src/defaultkeygenerationjob.cpp
-+++ lang/qt/src/defaultkeygenerationjob.cpp
-@@ -105,11 +105,11 @@ GpgME::Error DefaultKeyGenerationJob::start(const QString &email, const QString
- 
-     d->job = openpgp()->keyGenerationJob();
-     d->job->installEventFilter(this);
-    connect(d->job, &KeyGenerationJob::result,
-+    connect(d->job.data(), &KeyGenerationJob::result,
-             this, &DefaultKeyGenerationJob::result);
-    connect(d->job, &KeyGenerationJob::done,
-+    connect(d->job.data(), &KeyGenerationJob::done,
-             this, &DefaultKeyGenerationJob::done);
-    connect(d->job, &KeyGenerationJob::done,
-+    connect(d->job.data(), &KeyGenerationJob::done,
-             this, &QObject::deleteLater);
-     return d->job->start(args);
- }
--- a/security/gpgme/files/patch-lang_python_Makefile.in
+++ b/security/gpgme/files/patch-lang_python_Makefile.in
@ -1,6 +1,6 @@
--- lang/python/Makefile.in.orig	2016-10-18 17:27:17 UTC
+--- lang/python/Makefile.in.orig	2016-11-16 12:46:35 UTC
 +++ lang/python/Makefile.in
-@@ -753,7 +753,7 @@ config.h:
+@@ -756,7 +756,7 @@ config.h:
 all-local: copystamp
 	for PYTHON in $(PYTHONS); do \
 	  CFLAGS="$(CFLAGS)" \
@ -8,8 +8,8 @@
 +	    $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \
 	done
 
- dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
-@@ -789,7 +789,8 @@ install-exec-local:
+ dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp
+@@ -792,7 +792,8 @@ install-exec-local:
 	rm -f install_files.txt
 	for PYTHON in $(PYTHONS); do \
 	  $$PYTHON setup.py install \
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@ -4,10 +4,7 @@ include/gpgme.h
 lib/common-lisp/gpgme/gpgme-package.lisp
 lib/common-lisp/gpgme/gpgme.asd
 lib/common-lisp/gpgme/gpgme.lisp
-lib/libgpgme-pthread.so
-lib/libgpgme-pthread.so.11
-lib/libgpgme-pthread.so.11.16.0
 lib/libgpgme.so
 lib/libgpgme.so.11
-lib/libgpgme.so.11.16.0
+lib/libgpgme.so.11.17.0
 share/aclocal/gpgme.m4
--- a/security/libcryptui/Makefile
+++ b/security/libcryptui/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libcryptui
 PORTVERSION=	3.12.2
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	openvas-libraries
 PORTVERSION=	8.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/2291/

--- a/security/openvas-manager/Makefile
+++ b/security/openvas-manager/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	openvas-manager
 PORTVERSION=	6.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/2295/

--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gnupg
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
--- a/security/py-gpgme/Makefile
+++ b/security/py-gpgme/Makefile
@ -13,6 +13,6 @@ BINDING_NAME=	python
 PLIST=		${.CURDIR}/pkg-plist

 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/pyme/_gpgme.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/gpg/_gpgme.so

 .include "${MASTERDIR}/Makefile"
--- a/security/py-gpgme/pkg-plist
+++ b/security/py-gpgme/pkg-plist
@ -1,72 +1,75 @@
-%%PYTHON_SITELIBDIR%%/pyme/__init__.py
-%%PYTHON_SITELIBDIR%%/pyme/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyme/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyme/_gpgme.so
-%%PYTHON_SITELIBDIR%%/pyme/callbacks.py
-%%PYTHON_SITELIBDIR%%/pyme/callbacks.pyc
-%%PYTHON_SITELIBDIR%%/pyme/callbacks.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/__init__.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/data/__init__.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/data/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/data/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/data/encoding.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/data/encoding.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/data/encoding.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/event.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/event.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/event.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/import.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/import.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/import.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/keylist/__init__.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/keylist/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/keylist/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/keylist/mode.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/keylist/mode.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/keylist/mode.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/md.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/md.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/md.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/pk.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/pk.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/pk.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/protocol.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/protocol.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/protocol.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/sig/__init__.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/sig/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/sig/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/sig/mode.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/sig/mode.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/sig/mode.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/sigsum.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/sigsum.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/sigsum.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/status.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/status.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/status.pyo
-%%PYTHON_SITELIBDIR%%/pyme/constants/validity.py
-%%PYTHON_SITELIBDIR%%/pyme/constants/validity.pyc
-%%PYTHON_SITELIBDIR%%/pyme/constants/validity.pyo
-%%PYTHON_SITELIBDIR%%/pyme/core.py
-%%PYTHON_SITELIBDIR%%/pyme/core.pyc
-%%PYTHON_SITELIBDIR%%/pyme/core.pyo
-%%PYTHON_SITELIBDIR%%/pyme/errors.py
-%%PYTHON_SITELIBDIR%%/pyme/errors.pyc
-%%PYTHON_SITELIBDIR%%/pyme/errors.pyo
-%%PYTHON_SITELIBDIR%%/pyme/gpgme.py
-%%PYTHON_SITELIBDIR%%/pyme/gpgme.pyc
-%%PYTHON_SITELIBDIR%%/pyme/gpgme.pyo
-%%PYTHON_SITELIBDIR%%/pyme/install_files.txt
-%%PYTHON_SITELIBDIR%%/pyme/results.py
-%%PYTHON_SITELIBDIR%%/pyme/results.pyc
-%%PYTHON_SITELIBDIR%%/pyme/results.pyo
-%%PYTHON_SITELIBDIR%%/pyme/util.py
-%%PYTHON_SITELIBDIR%%/pyme/util.pyc
-%%PYTHON_SITELIBDIR%%/pyme/util.pyo
-%%PYTHON_SITELIBDIR%%/pyme/version.py
-%%PYTHON_SITELIBDIR%%/pyme/version.pyc
-%%PYTHON_SITELIBDIR%%/pyme/version.pyo
-%%PYTHON_SITELIBDIR%%/pyme3-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%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/_gpgme.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/data/__init__.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyo
+%%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.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/import.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/import.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/mode.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.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/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/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/install_files.txt
+%%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
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pyme
 PORTVERSION=	0.8.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	seahorse
 PORTVERSION=	3.18.0
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	dar
 PORTVERSION=	2.5.5
+PORTREVISION=	1
 CATEGORIES=	sysutils archivers
 MASTER_SITES=	SF

--- a/sysutils/kf5-kwallet/Makefile
+++ b/sysutils/kf5-kwallet/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kwallet
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-frameworks

 MAINTAINER=	kde@FreeBSD.org
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pacman
 PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.archlinux.org/other/pacman/ \
 		http://mirror.amdmi3.ru/distfiles/