diff options
author | Alon Bar-Lev <alonbl@gentoo.org> | 2016-10-19 08:27:28 +0300 |
---|---|---|
committer | Alon Bar-Lev <alonbl@gentoo.org> | 2016-10-19 08:27:43 +0300 |
commit | 1490afc44c41e3937255c1da52b59f35937a3754 (patch) | |
tree | c56642cebaaedf22d627920770faccda2804b1b3 /app-crypt | |
parent | app-crypt/gpgme: fix minor issues (diff) | |
download | gentoo-1490afc44c41e3937255c1da52b59f35937a3754.tar.gz gentoo-1490afc44c41e3937255c1da52b59f35937a3754.tar.bz2 gentoo-1490afc44c41e3937255c1da52b59f35937a3754.zip |
app-crypt/gpgme: cleanup
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-crypt')
-rw-r--r-- | app-crypt/gpgme/Manifest | 2 | ||||
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch | 115 | ||||
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch | 40 | ||||
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch | 82 | ||||
-rw-r--r-- | app-crypt/gpgme/gpgme-1.7.0.ebuild | 95 |
5 files changed, 0 insertions, 334 deletions
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index f8e4ec8a780c..ab41d700f5b0 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,5 +1,3 @@ DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041 DIST gpgme-1.6.0.tar.bz2 983573 SHA256 b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d SHA512 b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b WHIRLPOOL 4e753156474097dba9db2905954d1754ca408066996a01cbc7266a24654eb7c2323043f40495cc3c227d8eef540eeca47de4c23bb329a2d34604d5a4d3828970 -DIST gpgme-1.7.0-build-32bit.patch 31933 SHA256 933eb074334b3f241290e2ff11b16165a028062b543395de4592a4678656153c SHA512 04be159ea211ed3bc921a65fb7a489e22c98c8e03dfe2457c38045bf8be335db8d2d56ab16de4bab49f62af40cd19dfd53bfb373a77db10853d011ec583c1dde WHIRLPOOL c69c7b0e8cfea89ff6490857790dec6cda06cc43d0d6ff6546c29c99c9bef3b7c4a377daf2949d9669169a35570dc9a859e9ab604c02c89c9e9768bd5347fe4c -DIST gpgme-1.7.0.tar.bz2 1281708 SHA256 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 SHA512 8c5891104bd531d555fc4c22086cfdea9f18be6885200f02e087d695d0518e311527a227f2c41e0dc1156cc0985265d0bee6c4504de7e2d2de0bc543a1036b5a WHIRLPOOL aaf60c5a30f9161bf8edb24e583e6a83e4a6e28abe7d9878d1d36b5ab34507ff2a47695dc4856c4fdad59463a5d56de1d8d35dee3315dfa54758c8445d9f706e DIST gpgme-1.7.1.tar.bz2 1285809 SHA256 d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6 SHA512 b8c2e2aa1f413748dc8b0f9f63ef5d1ddbb00dfd82f63a28b7162cf5d8af2a33f7ba29a309da5244ad6e23a561b99716d47d02956d03ece16d06af6ff77f200c WHIRLPOOL a7eea63ba23bf034c18565c171353ed01464f814d6d8cddb4047df402a2bd4830dd719cd4f7feb41038dd8871f3064d5b7e4ffaa6e5a9bf204d42618eb7b0788 diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch deleted file mode 100644 index d37d29770367..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch +++ /dev/null @@ -1,115 +0,0 @@ -From e5bccea346379a70fd9cb910c4ead9642227747f Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Sat, 24 Sep 2016 01:26:19 +0300 -Subject: [PATCH] build: lang: python: cleanups - -1. Make setup.py executable when generated. - -2. Add prepare target to enable prepare the source tree without building - anything. This is handy to enable standard distutils build outside of - gpgme build system. - -3. Treat data.h in similar manner as other VPATH issues, just symlink it - to the srcdir to simplify build, remove the CFLAGS requirement of - distutils. - -The above does not alter the behavior of current build but supports the -following sequence: - -$ mkdir build -$ cd build -$ ../configure --enable-languages= -$ make -$ cd lang/python -$ make prepare -$ ./setup.py build -$ ./setup.py install - -Notice the standard use of distutils which is required for package -manager to control the python selection and build process. - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - configure.ac | 2 +- - lang/python/Makefile.am | 16 ++++++++++------ - lang/python/gpgme.i | 2 +- - 3 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4a29f2f..efa1f19 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -886,9 +886,9 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) - AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([lang/qt/doc/Doxyfile])]) - AC_CONFIG_FILES(lang/qt/doc/Makefile) - AC_CONFIG_FILES([lang/python/Makefile -- lang/python/setup.py - lang/python/pyme/version.py - lang/python/tests/Makefile]) -+AC_CONFIG_FILES([lang/python/setup.py], [chmod a+x lang/python/setup.py]) - AC_OUTPUT - - echo " -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 2271ce0..9866f53 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -46,24 +46,28 @@ COPY_FILES_PYME = \ - - # For VPATH builds we need to copy some files because Python's - # distutils are not VPATH-aware. --copystamp: $(COPY_FILES) $(COPY_FILES_PYME) -+copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h - if test "$(srcdir)" != "$(builddir)" ; then \ - cp -R $(COPY_FILES) . ; \ - cp -R $(COPY_FILES_PYME) pyme ; \ - fi - touch $@ - -+data.h: -+ ln -s "$(top_srcdir)/src/data.h" -+ - all-local: copystamp - for PYTHON in $(PYTHONS); do \ -- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ -- $$PYTHON setup.py build --verbose ; \ -+ $$PYTHON setup.py build --verbose ; \ - done - - dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp -- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ -- $(PYTHON) setup.py sdist --verbose -+ $(PYTHON) setup.py sdist --verbose - gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz - -+.PHONY: prepare -+prepare: copystamp -+ - .PHONY: sdist - sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc - -@@ -72,7 +76,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc - twine upload $^ - - CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \ -- copystamp -+ data.h copystamp - - # Remove the rest. - # -diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i -index 84addae..ac666f4 100644 ---- a/lang/python/gpgme.i -+++ b/lang/python/gpgme.i -@@ -183,7 +183,7 @@ - representation of struct gpgme_data for an very efficient check if - the buffer has been modified. */ - %{ --#include "src/data.h" /* For struct gpgme_data. */ -+#include "data.h" /* For struct gpgme_data. */ - %} - #endif - --- -2.7.3 - diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch deleted file mode 100644 index 7d56ad32d6fc..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 516022b0cd1a43973a467bb5b7e6813b9444d608 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Fri, 23 Sep 2016 22:46:39 +0300 -Subject: [PATCH] build: tests: remove non working - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - lang/qt/tests/Makefile.am | 2 +- - tests/gpg/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am -index a41dc8c..e05c8a3 100644 ---- a/lang/qt/tests/Makefile.am -+++ b/lang/qt/tests/Makefile.am -@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) - EXTRA_DIST = initial.test - - TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \ -- t-encrypt t-wkspublish -+ t-wkspublish - - moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \ - t-encrypt.moc t-support.hmoc t-wkspublish.moc -diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am -index 9877843..90a1dfd 100644 ---- a/tests/gpg/Makefile.am -+++ b/tests/gpg/Makefile.am -@@ -36,7 +36,7 @@ endif - - c_tests = \ - t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ -- t-decrypt t-verify t-decrypt-verify t-sig-notation t-export \ -+ t-decrypt t-verify t-decrypt-verify t-export \ - t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait \ - t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix) - --- -2.7.3 - diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch deleted file mode 100644 index 719ddac16258..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c2f352363615a4581e01999eb4230f4921cc6f9f Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Fri, 23 Sep 2016 23:05:35 +0300 -Subject: [PATCH] build: avoid build tests if not required - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - lang/qt/tests/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - tests/gpg/Makefile.am | 2 +- - tests/gpgsm/Makefile.am | 2 +- - tests/opassuan/Makefile.am | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am -index 36ecfe4..63186e7 100644 ---- a/lang/qt/tests/Makefile.am -+++ b/lang/qt/tests/Makefile.am -@@ -62,7 +62,7 @@ nodist_t_keylist_SOURCES = $(moc_files) - - BUILT_SOURCES = $(moc_files) - --noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \ -+check_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \ - run-keyformailboxjob t-wkspublish - - CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index c71914f..b698e11 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -31,7 +31,7 @@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@ - - noinst_HEADERS = run-support.h - --noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \ -+check_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \ - run-verify run-encrypt run-identify run-decrypt run-genkey \ - run-keysign run-tofu - -diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am -index 90a1dfd..671a2f3 100644 ---- a/tests/gpg/Makefile.am -+++ b/tests/gpg/Makefile.am -@@ -64,7 +64,7 @@ LDADD = ../../src/libgpgme.la - t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread - - # We don't run t-genkey in the test suite, because it takes too long --noinst_PROGRAMS = $(c_tests) t-genkey -+check_PROGRAMS = $(c_tests) t-genkey - - clean-local: - -$(top_srcdir)/tests/start-stop-agent --stop -diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am -index 41645b6..1bdb712 100644 ---- a/tests/gpgsm/Makefile.am -+++ b/tests/gpgsm/Makefile.am -@@ -40,7 +40,7 @@ LDADD = ../../src/libgpgme.la - - # We don't run t-genkey in the test suite, because it takes too long - # and needs a working pinentry. --noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt -+check_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt - - key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 - -diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am -index 31d26ed..608b608 100644 ---- a/tests/opassuan/Makefile.am -+++ b/tests/opassuan/Makefile.am -@@ -27,7 +27,7 @@ EXTRA_DIST = - AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ - LDADD = ../../src/libgpgme.la - --noinst_PROGRAMS = $(TESTS) t-command -+check_PROGRAMS = $(TESTS) t-command - - DISTCLEANFILES = - --- -2.7.3 - diff --git a/app-crypt/gpgme/gpgme-1.7.0.ebuild b/app-crypt/gpgme/gpgme-1.7.0.ebuild deleted file mode 100644 index 16eaa6e41447..000000000000 --- a/app-crypt/gpgme/gpgme-1.7.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools distutils-r1 eutils qmake-utils - -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 - https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=a142f187b7ddb2728ec3e1743da4a0c4538ab40a -> gpgme-1.7.0-build-32bit.patch" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="1/11" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp static-libs cxx python qt5 test" - -RDEPEND="app-crypt/gnupg - >=dev-libs/libassuan-2.0.2 - >=dev-libs/libgpg-error-1.11 - qt5? ( - dev-qt/qtcore:5 - !kde-apps/gpgmepp:4 - !kde-apps/kdepimlibs:4 - ) - python? ( ${PYTHON_DEPS} )" - #doc? ( app-doc/doxygen[dot] ) -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - qt5? ( - test? ( dev-qt/qttest:5 ) - )" - -REQUIRED_USE="qt5? ( cxx )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.8-et_EE.patch - "${FILESDIR}"/${P}-build-tests.patch - "${FILESDIR}"/${P}-build-tests-disable.patch - "${FILESDIR}"/${P}-build-python.patch -) - -do_python() { - if use python; then - pushd lang/python > /dev/null || die - distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null - fi -} - -src_prepare() { - sed -e '/a\/lang\/cpp\/src\/context_glib.cpp/,+30d' "${DISTDIR}/gpgme-1.7.0-build-32bit.patch" > "${T}/gpgme-1.7.0-build-32bit.patch" - PATCHES+=( - "${T}"/${P}-build-32bit.patch - ) - default - eautoreconf - do_python -} - -src_configure() { - local languages=() - use common-lisp && languages+=( "cl" ) - use cxx && languages+=( "cpp" ) - if use qt5; then - languages+=( "qt" ) - #use doc || - export DOXYGEN= - export MOC="$(qt5_get_bindir)/moc" - fi - - econf \ - --includedir="${EPREFIX}/usr/include/gpgme" \ - --enable-languages="${languages[*]}" \ - $(use_enable static-libs static) - - use python && make -C lang/python prepare - - do_python -} - -src_compile() { - default - do_python -} - -src_install() { - default - do_python - prune_libtool_files -} |