- Update security/gpgme to 1.7.0

- Convert to master port and add several slave ports for the newly added
  c++, Qt5, and python bindings (security/gpgme-cpp, security/gpgme-qt5,
  and security/py-gpgme, respectively)
- The Qt bindings currently provided by deskutils/kdepimlibs4
  cannot currently coexist with these new bindings, but will be phased out
  in the future
- The python bindings are an updated version of the ones provided by
  security/py-pyme and are now being maintained as part of the gpgme project.
  They work with both python 2.x and 3.x.

PR:		212886

11 files changed, 323 insertions, 13 deletions

diff --git a/security/Makefile b/security/Makefile
index 4176da43dd33..6a4824251037 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -180,6 +180,8 @@
     SUBDIR += gpass
     SUBDIR += gpgdir
     SUBDIR += gpgme
+    SUBDIR += gpgme-cpp
+    SUBDIR += gpgme-qt5
     SUBDIR += gputty
     SUBDIR += greenbone-security-assistant
     SUBDIR += gringotts
@@ -848,6 +850,7 @@
     SUBDIR += py-flask-httpauth
     SUBDIR += py-gnupg
     SUBDIR += py-gnutls
+    SUBDIR += py-gpgme
     SUBDIR += py-gpsoauth
     SUBDIR += py-halberd
     SUBDIR += py-hkdf
diff --git a/security/gpgme-cpp/Makefile b/security/gpgme-cpp/Makefile
new file mode 100644
index 000000000000..4ebbb431c472
--- /dev/null
+++ b/security/gpgme-cpp/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-${SLAVEPORT}
+
+MAINTAINER=	jhale@FreeBSD.org
+COMMENT=	Gpgme C++ bindings
+
+MASTERDIR=	${.CURDIR}/../../security/gpgme
+SLAVEPORT=	cpp
+BINDING_NAME=	cpp
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist
new file mode 100644
index 000000000000..370fd18a670e
--- /dev/null
+++ b/security/gpgme-cpp/pkg-plist
@@ -0,0 +1,41 @@
+include/gpgme++/configuration.h
+include/gpgme++/context.h
+include/gpgme++/data.h
+include/gpgme++/decryptionresult.h
+include/gpgme++/defaultassuantransaction.h
+include/gpgme++/editinteractor.h
+include/gpgme++/encryptionresult.h
+include/gpgme++/engineinfo.h
+include/gpgme++/error.h
+include/gpgme++/eventloopinteractor.h
+include/gpgme++/exception.h
+include/gpgme++/global.h
+include/gpgme++/gpgadduserideditinteractor.h
+include/gpgme++/gpgagentgetinfoassuantransaction.h
+include/gpgme++/gpgmefw.h
+include/gpgme++/gpgmepp_export.h
+include/gpgme++/gpgsetexpirytimeeditinteractor.h
+include/gpgme++/gpgsetownertrusteditinteractor.h
+include/gpgme++/gpgsignkeyeditinteractor.h
+include/gpgme++/importresult.h
+include/gpgme++/interfaces/assuantransaction.h
+include/gpgme++/interfaces/dataprovider.h
+include/gpgme++/interfaces/passphraseprovider.h
+include/gpgme++/interfaces/progressprovider.h
+include/gpgme++/key.h
+include/gpgme++/keygenerationresult.h
+include/gpgme++/keylistresult.h
+include/gpgme++/notation.h
+include/gpgme++/result.h
+include/gpgme++/scdgetinfoassuantransaction.h
+include/gpgme++/signingresult.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.0.1
diff --git a/security/gpgme-qt5/Makefile b/security/gpgme-qt5/Makefile
new file mode 100644
index 000000000000..8bd755d000a0
--- /dev/null
+++ b/security/gpgme-qt5/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-${SLAVEPORT}
+
+MAINTAINER=	jhale@FreeBSD.org
+COMMENT=	Gpgme Qt5 bindings
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+MASTERDIR=	${.CURDIR}/../../security/gpgme
+SLAVEPORT=	qt5
+BINDING_NAME=	qt
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/gpgme-qt5/pkg-plist b/security/gpgme-qt5/pkg-plist
new file mode 100644
index 000000000000..eaf5cb5e4ed3
--- /dev/null
+++ b/security/gpgme-qt5/pkg-plist
@@ -0,0 +1,71 @@
+include/QGpgME/AddUserIDJob
+include/QGpgME/ChangeExpiryJob
+include/QGpgME/ChangeOwnerTrustJob
+include/QGpgME/ChangePasswdJob
+include/QGpgME/CryptoConfig
+include/QGpgME/DataProvider
+include/QGpgME/DecryptJob
+include/QGpgME/DecryptVerifyJob
+include/QGpgME/DefaultKeyGenerationJob
+include/QGpgME/DeleteJob
+include/QGpgME/DownloadJob
+include/QGpgME/EncryptJob
+include/QGpgME/ExportJob
+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/RefreshKeysJob
+include/QGpgME/SignEncryptJob
+include/QGpgME/SignJob
+include/QGpgME/SignKeyJob
+include/QGpgME/TofuPolicyJob
+include/QGpgME/VerifyDetachedJob
+include/QGpgME/VerifyOpaqueJob
+include/QGpgME/WKSPublishJob
+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/decryptjob.h
+include/qgpgme/decryptverifyjob.h
+include/qgpgme/defaultkeygenerationjob.h
+include/qgpgme/deletejob.h
+include/qgpgme/downloadjob.h
+include/qgpgme/encryptjob.h
+include/qgpgme/exportjob.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/qgpgmenewcryptoconfig.h
+include/qgpgme/refreshkeysjob.h
+include/qgpgme/signencryptjob.h
+include/qgpgme/signjob.h
+include/qgpgme/signkeyjob.h
+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/libqgpgme.so
+lib/libqgpgme.so.6
+lib/libqgpgme.so.6.0.1
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 62c5314b00f2..a606059eb900 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -2,27 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	gpgme
-PORTVERSION=	1.6.0
-PORTREVISION=	1
-CATEGORIES=	security
+PORTVERSION=	1.7.0
+PORTREVISION?=	0
+CATEGORIES?=	security
 MASTER_SITES=	GNUPG/gpgme
 
 MAINTAINER=	jhale@FreeBSD.org
-COMMENT=	Library to make access to GnuPG easier
+COMMENT?=	Library to make access to GnuPG easier
 
-LICENSE=	LGPL21
+LICENSE?=	LGPL21
+LICENSE_FILE?=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error
 
 GNU_CONFIGURE=	yes
-USES=		cpe gmake libtool tar:bzip2
+USES=		cpe gmake libtool localbase:ldflags tar:bzip2
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	gnu
 
+.if !defined(SLAVEPORT)
+CONFIGURE_ARGS+=--enable-languages="cl"
+
 INFO=		gpgme
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
 
@@ -41,6 +45,7 @@ GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
 
 UISERVER_DESC=			GnuPG UI server support
 UISERVER_CONFIGURE_ENABLE=	fd-passing
+.endif
 
 .include <bsd.port.options.mk>
 
@@ -48,12 +53,59 @@ UISERVER_CONFIGURE_ENABLE=	fd-passing
 CONFIGURE_ARGS+=	--disable-gpgsm-test
 .endif
 
+.if defined(SLAVEPORT)
+LIB_DEPENDS+=	libgpgme.so:security/gpgme
+BUILD_WRKSRC=	${WRKSRC}/lang
+INSTALL_WRKSRC=	${WRKSRC}/lang/${BINDING_NAME}
+
+.  if ${SLAVEPORT} == "cpp"
+CONFIGURE_ARGS+=--enable-languages="cpp"
+.  endif
+
+.  if ${SLAVEPORT} == "qt5"
+LIB_DEPENDS+=	libgpgmepp.so:security/gpgme-cpp
+CONFIGURE_ARGS+=--enable-languages="cpp qt"
+USES+=		pkgconfig
+USE_QT5=	buildtools_build core testlib
+CONFLICTS_INSTALL=	kdepimlibs-4.*
+.  endif
+
+.  if ${SLAVEPORT} == "python"
+BUILD_DEPENDS+=	swig3.0:devel/swig30 \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+USES+=		python
+USE_PYTHON=	py3kplist
+BUILD_WRKSRC=	${WRKSRC}/lang/${BINDING_NAME}
+CONFIGURE_ENV+=	SWIG=${LOCALBASE}/bin/swig3.0
+PLIST_SUB+=	VERSION=${PORTVERSION}
+CONFLICTS_INSTALL=	py*-pyme-[0-9]*
+.  endif
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(SLAVEPORT)
+.  if ${SLAVEPORT} == "python"
+.    if ${PYTHON_REL} >= 3000
+CONFIGURE_ARGS+=--enable-languages="python3"
+.    else
+CONFIGURE_ARGS+=--enable-languages="python2"
+.    endif
+.  endif
+.endif
+
 post-patch:
+.if defined(SLAVEPORT)
+	@${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \
+	${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g'
+.endif
 	@${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \
 					${WRKSRC}/lang/cl/Makefile.in
-
-post-install:
+.if !defined(SLAVEPORT)
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index d7c9df2def36..068981041d18 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gpgme-1.6.0.tar.bz2) = b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
-SIZE (gpgme-1.6.0.tar.bz2) = 983573
+TIMESTAMP = 1474521991
+SHA256 (gpgme-1.7.0.tar.bz2) = 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48
+SIZE (gpgme-1.7.0.tar.bz2) = 1281708
diff --git a/security/gpgme/files/patch-lang_python_Makefile.in b/security/gpgme/files/patch-lang_python_Makefile.in
new file mode 100644
index 000000000000..10598a2bf0de
--- /dev/null
+++ b/security/gpgme/files/patch-lang_python_Makefile.in
@@ -0,0 +1,21 @@
+--- lang/python/Makefile.in.orig	2016-10-16 12:54:58 UTC
++++ lang/python/Makefile.in
+@@ -747,7 +747,7 @@ copystamp: $(COPY_FILES) $(COPY_FILES_PY
+ all-local: copystamp
+ 	for PYTHON in $(PYTHONS); do \
+ 	  CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
+-	    $$PYTHON setup.py build --verbose ; \
++	    $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \
+ 	done
+ 
+ dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
+@@ -780,7 +780,8 @@ install-exec-local:
+ 	rm -f install_files.txt
+ 	for PYTHON in $(PYTHONS); do \
+ 	  $$PYTHON setup.py install \
+-	  --prefix $(DESTDIR)$(prefix) \
++	  -c -O1 --prefix=$(prefix) \
++	  --root=$(DESTDIR) \
+ 	  --record files.txt \
+ 	  --verbose ; \
+ 	  cat files.txt >> install_files.txt ; \
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index 08161c24f1d8..2c5de39ecfa4 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -6,8 +6,8 @@ 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.14.0
+lib/libgpgme-pthread.so.11.15.0
 lib/libgpgme.so
 lib/libgpgme.so.11
-lib/libgpgme.so.11.14.0
+lib/libgpgme.so.11.15.0
 share/aclocal/gpgme.m4
diff --git a/security/py-gpgme/Makefile b/security/py-gpgme/Makefile
new file mode 100644
index 000000000000..a1d5ae6db603
--- /dev/null
+++ b/security/py-gpgme/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+CATEGORIES=	security python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	jhale@FreeBSD.org
+COMMENT=	Gpgme Python bindings
+
+MASTERDIR=	${.CURDIR}/../../security/gpgme
+SLAVEPORT=	python
+BINDING_NAME=	python
+PLIST=		${.CURDIR}/pkg-plist
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/pyme/_gpgme.so
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/py-gpgme/pkg-plist b/security/py-gpgme/pkg-plist
new file mode 100644
index 000000000000..5da985f0feb2
--- /dev/null
+++ b/security/py-gpgme/pkg-plist
@@ -0,0 +1,72 @@
+%%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