gentoo resync : 19.04.2018

4 files changed, 187 insertions, 0 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index d7bb9df6a56b..39a58bb2d0cb 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,9 +1,13 @@
 AUX gpgme-1.1.8-et_EE.patch 347 BLAKE2B 88afa9629af3249337361e69496c3662ba7320229b50db697045174c58bee15e7cd0841125b646aa4a934d01a7a4ed309b902f70c67146c66100e2a66a24b5aa SHA512 69577d0a1ae9061277cd502d72c2add13b61def4990c09c6181a14b4792745a4e2e467090019ab1ed8d3dc6df6f09b63230d2d21974e0a802a1e976fe5de18d5
+AUX gpgme-1.11.0-build.patch 1173 BLAKE2B 9a2f5163234340b4649b76b7218d7703e21a8a9a623122bda122ee0f2bfc7472c0e9f83decae2fb30563a39f9ce686562f56bdf717be2d6f36a2dcf5a0c69ed5 SHA512 6aef4fe44872a7250a180c55ef904061c37e63d4460a7eeb2b7e3bda55df27224cffcc86234766b3452cc5074165444acc89c3aab3ea6cbeb18c627369e3f09b
+AUX gpgme-1.11.0-tests.patch 570 BLAKE2B 1302192114b697940a780258696dce45bbe2972f5907fd2b1e4895563eb36d970abe4f081ab5297aa47fca828399f56a5f9e6dcac211a7b1bbec208439fa7e1c SHA512 9701dc175a33c652745649e5eb7560aa3a3abbf047ca78e781a491f7947cc4a2727271b1cd910c26f190bd4054b355077abc54cc1e0a7061fd5c27b6e5f4dc69
 AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450060dca31ffa10b00c53da0ce55405fc1eeb51ee6686f30f050337aaa3e978f1979cfe7151c5195d570f0a9432 SHA512 be2788db4a796fdd21524d20a8bc7ad52f7928fbd6e9945e5a2be048cc6251bf593a3d46623c589cbcd4491a3e5abdfc14b618098113c0e1ddcabdb4e7701f57
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
+DIST gpgme-1.11.0.tar.bz2 1414991 BLAKE2B 2ef78b9b6f1017f821d83c2a91775b19ff2a0705d3441105d4f6d2fce4edaec9b26a6ea6a79e94f623f2ed064dd311846f1c3b92a94fcb3e1c11c8d2bc90c80b SHA512 79d1e4bb7a0a15ae107dae8aab29aa0b62c47ea93b228429332bb7ed24fc742afcc7abf537319d5466dee5a3b83b3fba3cf90a8bad8c97c64d7215c6573eabb5
 DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
 EBUILD gpgme-1.10.0.ebuild 2857 BLAKE2B 153897aea5d31a1455824d42fddf446765a767ddd361a99e74a95b4011a150eb8069a4c23000ac4926209b204ed69f1248006b6775f1ffac70d08a2631c28b50 SHA512 d5dd6cb588b55cdd1514e46b0f27823b67e5427dd754945c8491beae2cc77c19091be3024f520c18c3e89d6b2967676d3eb7b2e755909852e5727439af425f3d
+EBUILD gpgme-1.11.0.ebuild 2781 BLAKE2B 614e3ba1ee17ff3d108dbb407f8d98fd2f64cfd1f51a55708472732f8a366eaec3377164dde3ca88e113b549dfe3489873e936cac0d5a8a5c6985668d2511388 SHA512 2be7e53d3cb4a2c26493408936a21e1f4016bc5f124dd19846812672c7a7102ec3fc1b1426415fa6e609176eabea3a69bf9b59da1c518c1861561556e198cdb5
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/files/gpgme-1.11.0-build.patch b/app-crypt/gpgme/files/gpgme-1.11.0-build.patch
new file mode 100644
index 000000000000..7477a0ae8e84
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.11.0-build.patch
@@ -0,0 +1,34 @@
+From 8b4fd18c98eab1287836c79ae4efc77541e7dc30 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 18 Apr 2018 23:53:01 +0300
+Subject: [PATCH GPGME] build: gpgme-json: install properly
+
+not installing properly using libtool result in:
+
+ * QA Notice: The following files contain insecure RUNPATHs
+ *  Please file a bug about this at https://bugs.gentoo.org/
+ *  with the maintainer of the package.
+ *   /var/tmp/portage/app-crypt/gpgme-1.11.0/image/usr/bin/gpgme-json
+ *     RPATH: /var/tmp/portage/app-crypt/gpgme-1.11.0/work/b/src/.libs
+---
+ src/Makefile.am | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c2d4a843..3d638b23 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -103,9 +103,7 @@ gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h
+ gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
+ 
+ gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h
+-gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS)
+-# We use -no-install temporary during development.
+-gpgme_json_LDFLAGS = -no-install
++gpgme_json_LDADD = -lm libgpgme.la @GPG_ERROR_LIBS@
+ 
+ 
+ if HAVE_W32_SYSTEM
+-- 
+2.16.1
+
diff --git a/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch b/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch
new file mode 100644
index 000000000000..1acb71af4429
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch
@@ -0,0 +1,25 @@
+From 82b2b2da2bf6f50fbc5481e106c010567665575d Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 18 Apr 2018 23:59:20 +0300
+Subject: [PATCH] tests: gpg: disable t-verify
+
+---
+ tests/gpg/t-verify.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
+index 7c23406f..315040e8 100644
+--- a/tests/gpg/t-verify.c
++++ b/tests/gpg/t-verify.c
+@@ -225,6 +225,8 @@ main (int argc, char *argv[])
+   gpgme_verify_result_t result;
+   const char *s;
+ 
++  exit(0);
++
+   (void)argc;
+   (void)argv;
+ 
+-- 
+2.16.1
+
diff --git a/app-crypt/gpgme/gpgme-1.11.0.ebuild b/app-crypt/gpgme/gpgme-1.11.0.ebuild
new file mode 100644
index 000000000000..1b4ceae45e9c
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.11.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs
+inherit autotools
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS=""
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.0.2:=
+	>=dev-libs/libgpg-error-1.29:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-lang/swig )
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	prune_libtool_files
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}