summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2018-04-20 13:33:34 +0300
committerAlon Bar-Lev <alonbl@gentoo.org>2018-04-20 13:34:14 +0300
commit35e05f97d850e9ff84236cd7680a8e2c0539f320 (patch)
tree1454cfb57afc0870b1ec491a4a729e2fc3947981 /app-crypt
parentkde-apps/ark: Fix build (missing header) (diff)
downloadgentoo-35e05f97d850e9ff84236cd7680a8e2c0539f320.tar.gz
gentoo-35e05f97d850e9ff84236cd7680a8e2c0539f320.tar.bz2
gentoo-35e05f97d850e9ff84236cd7680a8e2c0539f320.zip
app-crypt/gpgme: version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gpgme/Manifest2
-rw-r--r--app-crypt/gpgme/files/gpgme-1.11.0-build.patch34
-rw-r--r--app-crypt/gpgme/files/gpgme-1.11.0-tests.patch25
-rw-r--r--app-crypt/gpgme/gpgme-1.11.1.ebuild (renamed from app-crypt/gpgme/gpgme-1.11.0.ebuild)9
4 files changed, 2 insertions, 68 deletions
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 58d8139788a7..ec409d46cfeb 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,3 +1,3 @@
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.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
diff --git a/app-crypt/gpgme/files/gpgme-1.11.0-build.patch b/app-crypt/gpgme/files/gpgme-1.11.0-build.patch
deleted file mode 100644
index 7477a0ae8e84..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.11.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 1acb71af4429..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.11.0-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.1.ebuild
index 1b4ceae45e9c..764c52bd0163 100644
--- a/app-crypt/gpgme/gpgme-1.11.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -7,7 +7,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"
@@ -15,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1/11" # subslot = soname major version
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs cxx python qt5"
COMMON_DEPEND=">=app-crypt/gnupg-2
@@ -37,11 +36,6 @@ RDEPEND="${COMMON_DEPEND}
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
@@ -62,7 +56,6 @@ pkg_setup() {
src_prepare() {
default
- eautoreconf
elibtoolize
# Make best effort to allow longer PORTAGE_TMPDIR