public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2016-09-23 23:27 Alon Bar-Lev
  0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2016-09-23 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     8642c015c4c6d689766cce9f0e626d08b1478a53
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 23:26:37 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 23:26:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8642c015

app-crypt/gpgme: add python bindings

 .../gpgme/files/gpgme-1.7.0-build-python.patch     | 136 +++++++++++++++++++++
 app-crypt/gpgme/gpgme-1.7.0.ebuild                 |  37 +++++-
 2 files changed, 170 insertions(+), 3 deletions(-)

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
new file mode 100644
index 00000000..950813f
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
@@ -0,0 +1,136 @@
+From a46cd3926d629da23b365b70b7bf24201c25d430 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 copy it to
+   the srcdir to simplify build, remove the CFLAGS requirement of
+   distutils.
+
+4. Add environment variable (binary_builddir) for setup to use alternate
+   build directory so that for multiple targets same binaries may be
+   used without rebuilding the C part.
+
+The above does not alter the behavior of current build but supports the
+following sequence:
+
+$ mkdir common
+$ cd common
+$ ../configure --enable-languages=
+$ make
+$ cd ..
+$ mkdir python
+$ cd python
+$ ../configure --enable-languages=
+$ cd lang/python
+$ make prepare
+$ binary_builddir="../../../common" ./setup.py build
+$ binary_builddir="../../../common" ./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 | 11 ++++++-----
+ lang/python/gpgme.i     |  2 +-
+ lang/python/setup.py.in |  9 +++++----
+ 4 files changed, 13 insertions(+), 11 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..fb1eebf 100644
+--- a/lang/python/Makefile.am
++++ b/lang/python/Makefile.am
+@@ -51,17 +51,18 @@ copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
+ 	  cp -R $(COPY_FILES) . ; \
+ 	  cp -R $(COPY_FILES_PYME) pyme ; \
+ 	fi
++	cp "$(top_srcdir)/src/data.h" .
+ 	touch $@
+ 
++prepare: copystamp
++
+ 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: sdist
+@@ -72,7 +73,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
+ 
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 31892c1..ce06758 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
+@@ -32,13 +32,14 @@ library_dirs = []
+ in_tree = False
+ extra_swig_opts = []
+ extra_macros = dict()
++binary_builddir=os.environ.get('binary_builddir', '../..')
+ 
+-if os.path.exists("../../src/gpgme-config"):
++if os.path.exists(os.path.join(binary_builddir, "src/gpgme-config")):
+     # In-tree build.
+     in_tree = True
+-    gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags
+-    gpgme_h = "../../src/gpgme.h"
+-    library_dirs = ["../../src/.libs"] # XXX uses libtool internals
++    gpgme_config = [os.path.join(binary_builddir, "src/gpgme-config")] + gpgme_config_flags
++    gpgme_h = os.path.join(binary_builddir, "src/gpgme.h")
++    library_dirs = [os.path.join(binary_builddir, "src/.libs")] # XXX uses libtool internals
+     extra_macros.update(
+         HAVE_DATA_H=1,
+         IN_TREE_BUILD=1,
+-- 
+2.7.3
+

diff --git a/app-crypt/gpgme/gpgme-1.7.0.ebuild b/app-crypt/gpgme/gpgme-1.7.0.ebuild
index 2d507d5..7ea80be 100644
--- a/app-crypt/gpgme/gpgme-1.7.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.7.0.ebuild
@@ -4,7 +4,10 @@
 
 EAPI="6"
 
-inherit autotools eutils
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 eutils
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
@@ -13,7 +16,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 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 qt5 test"
+IUSE="common-lisp static-libs cxx python qt5 test"
 
 RDEPEND="app-crypt/gnupg
 	>=dev-libs/libassuan-2.0.2
@@ -22,7 +25,8 @@ RDEPEND="app-crypt/gnupg
 		dev-qt/qtcore:5
 		!kde-apps/gpgmepp:4
 		!kde-apps/kdepimlibs:4
-	)"
+	)
+	python? ( ${PYTHON_DEPS} )"
 		#doc? ( app-doc/doxygen[dot] )
 DEPEND="${RDEPEND}
 	qt5? (
@@ -35,11 +39,21 @@ 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
+		binary_builddir="${S}" distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
 src_prepare() {
 	default
 	eautoreconf
+	do_python
 }
 
 src_configure() {
@@ -56,9 +70,26 @@ src_configure() {
 		--includedir="${EPREFIX}/usr/include/gpgme" \
 		--enable-languages="${languages[*]}" \
 		$(use_enable static-libs static)
+
+	python_conf() {
+		econf --enable-languages=
+	}
+	use python && python_foreach_impl python_conf
+	do_python
+}
+
+src_compile() {
+	default
+
+	python_build() {
+		make -C lang/python prepare
+	}
+	use python && python_foreach_impl python_build
+	do_python
 }
 
 src_install() {
 	default
+	do_python
 	prune_libtool_files
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2016-11-21 17:43 Alon Bar-Lev
  0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2016-11-21 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     64e040c2925857e9adb4bed0ac61d07197ff39dd
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 17:36:11 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 17:43:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e040c2

app-crypt/gpgme: fix cmake issue

Bug: 600418

Package-Manager: portage-2.3.0

 app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch      | 33 ++++++++++++++++++++++
 .../{gpgme-1.8.0.ebuild => gpgme-1.8.0-r1.ebuild}  |  1 +
 2 files changed, 34 insertions(+)

diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch
new file mode 100644
index 00000000..09775b8
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch
@@ -0,0 +1,33 @@
+From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 Nov 2016 23:09:45 +0100
+Subject: [PATCH] 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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/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"
+ )
+ 
+-- 
+2.8.0.rc3
+

diff --git a/app-crypt/gpgme/gpgme-1.8.0.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r1.ebuild
similarity index 98%
rename from app-crypt/gpgme/gpgme-1.8.0.ebuild
rename to app-crypt/gpgme/gpgme-1.8.0-r1.ebuild
index 593dc92..1015b3c 100644
--- a/app-crypt/gpgme/gpgme-1.8.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.8.0-r1.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="qt5? ( cxx )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+	"${FILESDIR}"/${P}-cmake.patch
 )
 
 do_python() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2018-04-18 21:16 Alon Bar-Lev
  0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2018-04-18 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     7f3f21c8722bbcbfdd218b19d176a4c8f7be85c0
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 21:14:25 2018 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 21:15:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3f21c8

app-crypt/gpgme: version bump

disabled as need to understand why t-verify is failing

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/gpgme/Manifest                       |   1 +
 app-crypt/gpgme/files/gpgme-1.11.0-build.patch |  34 +++++++
 app-crypt/gpgme/files/gpgme-1.11.0-tests.patch |  25 +++++
 app-crypt/gpgme/gpgme-1.11.0.ebuild            | 124 +++++++++++++++++++++++++
 4 files changed, 184 insertions(+)

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 862624a6439..58d8139788a 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,2 +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.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
new file mode 100644
index 00000000000..7477a0ae8e8
--- /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 00000000000..1acb71af442
--- /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 00000000000..1b4ceae45e9
--- /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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2018-05-20 20:31 Alon Bar-Lev
  0 siblings, 0 replies; 9+ messages in thread
From: Alon Bar-Lev @ 2018-05-20 20:31 UTC (permalink / raw
  To: gentoo-commits

commit:     d957051d08922ad15c75910e630343a5c3906378
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 20:31:04 2018 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sun May 20 20:31:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d957051d

app-crypt/gpgme: cleanup

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/gpgme/Manifest                      |   1 -
 app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch |  11 ---
 app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch |  33 --------
 app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch |  16 ----
 app-crypt/gpgme/gpgme-1.8.0-r2.ebuild         | 104 -------------------------
 app-crypt/gpgme/gpgme-1.8.0-r3.ebuild         | 107 --------------------------
 6 files changed, 272 deletions(-)

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index ec409d46cfe..3ef61eb628f 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,3 +1,2 @@
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 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.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
deleted file mode 100644
index 293debb5b91..00000000000
--- a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpgme-1.1.8/src/gpgme-config.in	2009-03-08 10:25:48.000000000 +1100
-+++ gpgme-1.1.8/src/gpgme-config.in	2009-03-08 10:35:53.000000000 +1100
-@@ -64,7 +64,7 @@
- while test $# -gt 0; do
-     case "$1" in
- 	-*=*)
--	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
-+	    optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'`
- 	    ;;
- 	*)
- 	    optarg=

diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch
deleted file mode 100644
index 09775b868eb..00000000000
--- a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 16 Nov 2016 23:09:45 +0100
-Subject: [PATCH] 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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
-index 928d19f..cbe9713 100644
---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
-+++ b/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"
- )
- 
--- 
-2.8.0.rc3
-

diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch
deleted file mode 100644
index 9dd3e85cbfb..00000000000
--- a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
-index eb3af56..af47594 100644
---- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
-+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
-@@ -51,2 +51,3 @@
- #include <cassert>
-+#include <functional> /* std::mem_fn */
- 
-diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
-index 32b23db..c4f85c2 100644
---- a/lang/qt/src/threadedjobmixin.h
-+++ b/lang/qt/src/threadedjobmixin.h
-@@ -53,2 +53,3 @@
- #include <cassert>
-+#include <functional> /* std::function */
- 

diff --git a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
deleted file mode 100644
index ce9c2e52374..00000000000
--- a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic ltprune 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"
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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.17
-	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
-		!kde-apps/kdepimlibs:4
-	)"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-do_python() {
-	if use python; then
-		pushd lang/python > /dev/null || die
-		distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	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=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# FIXME: I don't know how to select on C++11 (libc++) here, but
-		# I do know all Darwin users are using C++11.  This should also
-		# apply to GCC 4.7+ with libc++, and basically anyone targetting
-		# it.
-
-		# The C-standard doesn't define strdup, and C++11 drops it
-		# resulting in an implicit declaration of strdup error.  Since
-		# it is in POSIX raise the feature set to that.
-		append-cxxflags -D_POSIX_C_SOURCE=200112L
-
-		# Work around bug 601834
-		use python && append-cflags -D_DARWIN_C_SOURCE
-	fi
-
-	econf \
-		--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
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}

diff --git a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
deleted file mode 100644
index c0b8989bec8..00000000000
--- a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 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 ltprune 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"
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp cxx python qt5 static-libs"
-
-COMMON_DEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.0.2
-	>=dev-libs/libgpg-error-1.17
-	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}"/${PN}-1.1.8-et_EE.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-)
-
-do_python() {
-	if use python; then
-		pushd lang/python > /dev/null || die
-		distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	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=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# FIXME: I don't know how to select on C++11 (libc++) here, but
-		# I do know all Darwin users are using C++11.  This should also
-		# apply to GCC 4.7+ with libc++, and basically anyone targetting
-		# it.
-
-		# The C-standard doesn't define strdup, and C++11 drops it
-		# resulting in an implicit declaration of strdup error.  Since
-		# it is in POSIX raise the feature set to that.
-		append-cxxflags -D_POSIX_C_SOURCE=200112L
-
-		# Work around bug 601834
-		use python && append-cflags -D_DARWIN_C_SOURCE
-	fi
-
-	econf \
-		--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
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2021-09-05 23:58 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-09-05 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     87834abded7c46005d3e53d0cfc1282c1d03507c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 23:58:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 23:58:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87834abd

app-crypt/gpgme: backport glibc-2.34 patch

Maintainer timeout.

Closes: https://bugs.gentoo.org/803557
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gpgme/files/gpgme-1.16.0-glibc-2.34.patch      | 33 ++++++++++++++++++++++
 app-crypt/gpgme/gpgme-1.16.0.ebuild                |  4 +++
 2 files changed, 37 insertions(+)

diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
new file mode 100644
index 00000000000..f328e4540ae
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/803557
+https://dev.gnupg.org/T5587
+
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 5 Sep 2021 00:05:00 +0200
+Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34
+
+Fix the following build failure with glibc >= 2.34 raised because
+closefrom doesn't return an int but a void since its addition with
+https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c
+
+```
+posix-io.c: In function '_gpgme_io_spawn':
+posix-io.c:577:23: error: void value not ignored as it ought to be
+  577 |             while ((i = closefrom (fd)) && errno == EINTR)
+      |                       ^
+```
+
+Fixes:
+ - http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+--- a/src/posix-io.c
++++ b/src/posix-io.c
+@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+               if (fd_list[i].fd > fd)
+                 fd = fd_list[i].fd;
+             fd++;
+-#if defined(__sun) || defined(__FreeBSD__)
++#if defined(__sun) || defined(__FreeBSD__) || (defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
+             closefrom (fd);
+             max_fds = fd;
+ #else /*!__sun */

diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index ed9a1cc7e57..d8df58daf47 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -29,6 +29,10 @@ BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc-2.34.patch
+)
+
 do_python() {
 	if use python; then
 		pushd "lang/python" > /dev/null || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2021-09-06  7:18 Lars Wendler
  0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-09-06  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     e4f93d3d9d0608a84aaa8afcafc410a1b705e71a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  6 07:17:18 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep  6 07:18:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f93d3d

Revert "app-crypt/gpgme: backport glibc-2.34 patch"

This reverts commit 87834abded7c46005d3e53d0cfc1282c1d03507c.
Commit done without maintainer consent.

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../gpgme/files/gpgme-1.16.0-glibc-2.34.patch      | 33 ----------------------
 app-crypt/gpgme/gpgme-1.16.0.ebuild                |  4 ---
 2 files changed, 37 deletions(-)

diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
deleted file mode 100644
index f328e4540ae..00000000000
--- a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/803557
-https://dev.gnupg.org/T5587
-
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 5 Sep 2021 00:05:00 +0200
-Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34
-
-Fix the following build failure with glibc >= 2.34 raised because
-closefrom doesn't return an int but a void since its addition with
-https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c
-
-```
-posix-io.c: In function '_gpgme_io_spawn':
-posix-io.c:577:23: error: void value not ignored as it ought to be
-  577 |             while ((i = closefrom (fd)) && errno == EINTR)
-      |                       ^
-```
-
-Fixes:
- - http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---- a/src/posix-io.c
-+++ b/src/posix-io.c
-@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
-               if (fd_list[i].fd > fd)
-                 fd = fd_list[i].fd;
-             fd++;
--#if defined(__sun) || defined(__FreeBSD__)
-+#if defined(__sun) || defined(__FreeBSD__) || (defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
-             closefrom (fd);
-             max_fds = fd;
- #else /*!__sun */

diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index d8df58daf47..ed9a1cc7e57 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -29,10 +29,6 @@ BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.34.patch
-)
-
 do_python() {
 	if use python; then
 		pushd "lang/python" > /dev/null || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2021-09-06 15:58 David Seifert
  0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2021-09-06 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     5fac28c428be08a81a1c08ab2967f2afee45bdd6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  6 15:58:49 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep  6 15:58:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fac28c4

app-crypt/gpgme: [QA] revert e4f93d3d9d0608a84aaa8afcafc410a1b705e71a

* The revert was done without technical reason, over three weeks
  after the initial request, and the corresponding bug was not
  re-opened.

Bug: https://bugs.gentoo.org/803557
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../gpgme/files/gpgme-1.16.0-glibc-2.34.patch      | 33 ++++++++++++++++++++++
 app-crypt/gpgme/gpgme-1.16.0.ebuild                |  4 +++
 2 files changed, 37 insertions(+)

diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
new file mode 100644
index 00000000000..f328e4540ae
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/803557
+https://dev.gnupg.org/T5587
+
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 5 Sep 2021 00:05:00 +0200
+Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34
+
+Fix the following build failure with glibc >= 2.34 raised because
+closefrom doesn't return an int but a void since its addition with
+https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c
+
+```
+posix-io.c: In function '_gpgme_io_spawn':
+posix-io.c:577:23: error: void value not ignored as it ought to be
+  577 |             while ((i = closefrom (fd)) && errno == EINTR)
+      |                       ^
+```
+
+Fixes:
+ - http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+--- a/src/posix-io.c
++++ b/src/posix-io.c
+@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+               if (fd_list[i].fd > fd)
+                 fd = fd_list[i].fd;
+             fd++;
+-#if defined(__sun) || defined(__FreeBSD__)
++#if defined(__sun) || defined(__FreeBSD__) || (defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
+             closefrom (fd);
+             max_fds = fd;
+ #else /*!__sun */

diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index ed9a1cc7e57..d8df58daf47 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -29,6 +29,10 @@ BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc-2.34.patch
+)
+
 do_python() {
 	if use python; then
 		pushd "lang/python" > /dev/null || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2022-08-15 18:49 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-08-15 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     192671d48deba04dbc032db5bfc65c0ea48158a2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 18:49:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 18:49:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192671d4

app-crypt/gpgme: add 1.18.0

Broke ABI again.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-crypt/gpgme/Manifest                           |   2 +
 ...18.0-tests-start-stop-agent-use-command-v.patch |  27 +++++
 app-crypt/gpgme/gpgme-1.18.0.ebuild                | 132 +++++++++++++++++++++
 3 files changed, 161 insertions(+)

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 228275f1e483..fb1c045a3555 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,2 +1,4 @@
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
+DIST gpgme-1.18.0.tar.bz2 1762323 BLAKE2B a071b839eb75455378514f003920cd387320e9fae416e71151cf6ac1b4a058b58ed054450b79e3eeaf820ff5324ea14efa003612867477b7379a776942d62be6 SHA512 c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
+DIST gpgme-1.18.0.tar.bz2.sig 119 BLAKE2B 968f8b24ec71b4157214dd026aed83c96894ef353a9cb171f268d640a62fe464ba43540f318abf95dcfc19dffab177a0c3ad8a6e9937dc80e4ececbc8ceb3203 SHA512 02958d86cc037fffc787c6611ace8676d4e04cc1f65fd117eb911d3bfd665dddb7849bcd838af598465be78960f54883eac09c29c42f891f2e4b9713095aed7d

diff --git a/app-crypt/gpgme/files/gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch b/app-crypt/gpgme/files/gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch
new file mode 100644
index 000000000000..aeae35f45636
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch
@@ -0,0 +1,27 @@
+Sent upstream to gnupg-devel@ but not yet in archive.
+
+From: Sam James <sam@gentoo.org>
+Date: Mon, 15 Aug 2022 19:29:06 +0100
+Subject: [PATCH] tests/start-stop-agent: use 'command -v' instead of 'which'
+
+`which` is an external command which isn't required by POSIX.
+
+Debian and other distributions (like Gentoo!) are looking
+to drop it from their base set of packages.
+
+Switch to `command -v` which should always work instead.
+
+Note we already use `command -v` at the start of this test anyway.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/tests/start-stop-agent
++++ b/tests/start-stop-agent
+@@ -15,7 +15,7 @@ fi
+ 
+ GPG_AGENT_INFO=
+ export GPG_AGENT_INFO
+-GPG_AGENT=$(which gpg-agent)
++GPG_AGENT=$(command -v gpg-agent)
+ 
+ token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
+ 

diff --git a/app-crypt/gpgme/gpgme-1.18.0.ebuild b/app-crypt/gpgme/gpgme-1.18.0.ebuild
new file mode 100644
index 000000000000..4338e7b48226
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.18.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
+# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
+SLOT="1/11.6.15.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)"
+BDEPEND="python? ( dev-lang/swig )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.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 || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	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
+
+	# bug #847955
+	append-lfs-flags
+
+	# bug #811933 for libassuan prefix
+	econf \
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \
+		--enable-languages="${languages[*]}" \
+		--with-libassuan-prefix="${ESYSROOT}"/usr \
+		$(use_enable static-libs static)
+
+	use python && emake -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	default
+
+	use python && distutils-r1_src_test
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+	default
+
+	do_python
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/
@ 2024-09-10  1:37 Eli Schwartz
  0 siblings, 0 replies; 9+ messages in thread
From: Eli Schwartz @ 2024-09-10  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2ad1ddf9b8b0e0b1f91fc3dd9412ad2f9c1346c3
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 00:49:28 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 01:07:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad1ddf9

app-crypt/gpgme: fix broken build with setuptools 72.2

It's totally broken with the only setuptools we have in-tree. Revbump
directly to stable.

Bug: https://github.com/pypa/setuptools/issues/4642
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 .../ecd0c86d62351d267bdc9566286c532a394c711b.patch | 40 ++++++++++++++++++++++
 ...{gpgme-1.23.2.ebuild => gpgme-1.23.2-r1.ebuild} |  2 ++
 2 files changed, 42 insertions(+)

diff --git a/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch b/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch
new file mode 100644
index 000000000000..5e7a37d9ff01
--- /dev/null
+++ b/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch
@@ -0,0 +1,40 @@
+From ecd0c86d62351d267bdc9566286c532a394c711b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Mon, 2 Sep 2024 15:33:25 +0200
+Subject: [PATCH] build,python: Fix build with setuptools 72.2.0+
+
+* lang/python/setup.py.in (BuildExtFirstHack.run): Extend members of the
+extension instead of lists that were passed to the extension.
+--
+
+setuptools 72.2.0 integrated changes in distutils which included
+"Support for Pathlike objects in data files and extensions". With this
+change the extensions now take a copy of the sources list passed to the
+constructor instead of keeping a reference to the passed list. Hence,
+modifying the sources list that was passed to the extension didn't
+change the sources list of the extension anymore. This is fixed by
+modifying the sources list of the extension directly. For consistency
+we do the same for the swig_opts list.
+
+GnuPG-bug-id: 7281
+---
+ lang/python/setup.py.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 7b64ba7b..d6f537e0 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
+@@ -217,9 +217,9 @@ class BuildExtFirstHack(build):
+     def run(self):
+         self._generate()
+ 
+-        swig_sources.extend((self._in_build_base('gpgme.i'),
+-                             self._in_build_base('helpers.c')))
+-        swig_opts.extend([
++        swige.sources.extend((self._in_build_base('gpgme.i'),
++                              self._in_build_base('helpers.c')))
++        swige.swig_opts.extend([
+             '-I' + self.build_base, '-outdir',
+             os.path.join(self.build_lib, 'gpg')
+         ])

diff --git a/app-crypt/gpgme/gpgme-1.23.2.ebuild b/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
similarity index 98%
rename from app-crypt/gpgme/gpgme-1.23.2.ebuild
rename to app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
index 729e18d1df98..043a8992cf5c 100644
--- a/app-crypt/gpgme/gpgme-1.23.2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
 	"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+	# backport fix for setuptools 72.2 breakage
+	"${FILESDIR}"/ecd0c86d62351d267bdc9566286c532a394c711b.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-09-10  1:37 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-18 21:16 [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/ Alon Bar-Lev
  -- strict thread matches above, loose matches on Subject: below --
2024-09-10  1:37 Eli Schwartz
2022-08-15 18:49 Sam James
2021-09-06 15:58 David Seifert
2021-09-06  7:18 Lars Wendler
2021-09-05 23:58 Sam James
2018-05-20 20:31 Alon Bar-Lev
2016-11-21 17:43 Alon Bar-Lev
2016-09-23 23:27 Alon Bar-Lev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox