From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- app-crypt/gcr/Manifest | 4 + .../files/3.38.0-avoid-gnupg-circular-dep.patch | 52 +++++++++++++ app-crypt/gcr/files/3.38.0-optional-vapi.patch | 88 ++++++++++++++++++++++ app-crypt/gcr/gcr-3.38.0.ebuild | 84 +++++++++++++++++++++ 4 files changed, 228 insertions(+) create mode 100644 app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch create mode 100644 app-crypt/gcr/files/3.38.0-optional-vapi.patch create mode 100644 app-crypt/gcr/gcr-3.38.0.ebuild (limited to 'app-crypt/gcr') diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest index 8d6b4a147a9a..83ef6b0ad8fd 100644 --- a/app-crypt/gcr/Manifest +++ b/app-crypt/gcr/Manifest @@ -4,6 +4,10 @@ AUX 3.36.0-meson-enum-race.patch 870 BLAKE2B 66913d68fd8d5c6af776b90077070d126e9 AUX 3.36.0-meson-fix-gtk-doc-without-ui.patch 654 BLAKE2B b929e5112ec488bc70dd50c63d8e35bbfdb311833d2f896d8a79520e0e4334c6ea84f543f14ce7d03b0a1c86840274f2485cd4a1924eaf6ba67a82e5173b0083 SHA512 afea6074440a4763d54b5662adb2e934595d5e289a6d2e0f6d6e8440283abcf6b5ddf8ce0a6246fbfc75ffb3a66efd7d53b727b9b2c849cc72eea4f31405bdd3 AUX 3.36.0-meson-vapi-deps.patch 1658 BLAKE2B 98796051a8b2983dfa82ed6d56c033e70676988462cf3d8fdce255e729ffc6f7def12207e64079895b99af941655804fd1f06d861c950e0cccac3cfcffa585aa SHA512 6bda1adef741699271f55ac33644f5762f8a5ba6c9f15a12870c78a9cafd2e61f350e4732335b51e0f4969a7fc2aaea7f93fda32fe5fbfe2be7ec62f3deddb5f AUX 3.36.0-optional-vapi.patch 2278 BLAKE2B 3492fc70397ee07b04dc156070b153bacc50c9f4a641fba430a27b5b84d788b5f9e2528697bb36f0145607184f233d37676411558b5fc252e7284f46785b2f89 SHA512 f9dd41ee5b7e876f347c2d9130816d5203b64615400b331fd4b5abf95eba6c8bdb3ae59a0b2dacb34ceb7ae778ef7b32c08964f8a1bef1734fbb6522830ff480 +AUX 3.38.0-avoid-gnupg-circular-dep.patch 1994 BLAKE2B bcb5be508a5d0ef580197aa2405e18cb90f28b4c3edac7b80eea2fcff3585ee9d8373e2b8c19e4c6a845dc578ca591131aeec698e19d27cef1716e4cb350eb15 SHA512 5407ee82605a66d6f59b81c5ec17e8293f5d93d405fe474fecf0cb2645aecda2f06d61baea5ab9f477135651584552be613b0944d290e771fecf7e49f55025b5 +AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e DIST gcr-3.36.0.tar.xz 1025760 BLAKE2B 03f0d0ed40b600ed80e894111fedff3efcbbaaf6f261d6a44a3649a1acb50c4f35f3dc9a7ddb60f56cab241f68fef83aa5a02a94036e70a6556b35300f2c8fb5 SHA512 0431e7971b73accc62869c9497fcff7c111c453aa6a8ff25b42f19ceae1be0aec52e0e4eb504676f967c6e4f179198c15c521278690822e3457dbc5fe512fd5e +DIST gcr-3.38.0.tar.xz 1029784 BLAKE2B cf295a9f497d6c54067717e806439166965f90670ed5f7283802bb70c547465d9cc28d452970269d4315d02d24cc31f483a0a1fc1807f9b9720e70aa2b8249b9 SHA512 24c35ac514a67a1dee6a5738e829b55921a490b060ffa597421cea0abac3ddc62695370d2c7b3504c0adfd55b1ade878ad3ca5e6cb869428b4a19f4a11563bc6 EBUILD gcr-3.36.0.ebuild 1962 BLAKE2B 7fdb1e2ddf27c1815bd7946850c71c2822831115eee4e5302c3f40d4e6b2a1851af4bc8c6d9cba3750c974c0e8642165c94fc9b0a3a372cb603877ac8a687263 SHA512 bfea4b3a7d52ab80678c5d5d066e858f74a1e31e51e6e6ff4790226da4f1c3cac89cb79b50f28c424d675208bb2634ae152558a51d7fa188637776dfaa4960ee +EBUILD gcr-3.38.0.ebuild 1851 BLAKE2B a39c6ac256fb778c39a3941989a39e4b727dd04d0683a95f493c69772487733e2c8c59e8e178d0abc43118d2f8fe17f245725ef2e7bab456d5046a201897b70c SHA512 df788a616410eb52075b59e92eee39f4d5166af5aaecbbc342bcf6f1d2ec8d1c3e26eebf1d9da514b9ac7c5f18d2164e23804f43d8a423501e188132cd6297eb MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch b/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch new file mode 100644 index 000000000000..5bb7da0fa787 --- /dev/null +++ b/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch @@ -0,0 +1,52 @@ +From b938b0b658852c682ae17d56e0ad9322611e9516 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +Date: Wed, 11 Mar 2020 11:49:08 +0100 +Subject: [PATCH 1/2] meson: allow building without gpg(2) installed + +This avoids circular dependencies, such as gcr -> gpg2 -> pinentry -> gcr +--- + meson.build | 7 +++++-- + meson_options.txt | 5 +++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index a26a0f9..02b4c3c 100644 +--- a/meson.build ++++ b/meson.build +@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version) + gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version) + gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version) + glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ] +-gpg_bin = find_program('gpg2', 'gpg') ++gpg_path = get_option('gpg_path') ++if gpg_path == '' ++ gpg_path = find_program('gpg2', 'gpg').path() ++endif + libgcrypt_dep = dependency('libgcrypt', version: '>= 1') + p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0') + p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules') +@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true) + conf.set('HAVE_LOCALE_H', cc.has_header('locale.h')) + conf.set('HAVE_TIMEGM', cc.has_function('timegm')) + conf.set('HAVE_MLOCK', cc.has_function('mlock')) +-conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path()) ++conf.set_quoted('GPG_EXECUTABLE', gpg_path) + conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) + config_file = configure_file( + output: 'config.h', +diff --git a/meson_options.txt b/meson_options.txt +index bbdc8e3..ae0f524 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -13,3 +13,8 @@ option('gtk_doc', + value: true, + description: 'Build the reference documentation (requires gtk-doc)', + ) ++option('gpg_path', ++ type: 'string', ++ value: '', ++ description: 'Path to gpg, autodetected if not set', ++) +-- +2.26.2 + diff --git a/app-crypt/gcr/files/3.38.0-optional-vapi.patch b/app-crypt/gcr/files/3.38.0-optional-vapi.patch new file mode 100644 index 000000000000..d565884994fd --- /dev/null +++ b/app-crypt/gcr/files/3.38.0-optional-vapi.patch @@ -0,0 +1,88 @@ +From 6d61774b8556eb4acfa5e7613ee25893d2a7e565 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Tue, 18 Aug 2020 09:36:19 +0300 +Subject: [PATCH 2/2] build: Make vapi optional + +--- + gck/meson.build | 2 ++ + gcr/meson.build | 2 ++ + meson_options.txt | 5 +++++ + ui/meson.build | 2 ++ + 4 files changed, 11 insertions(+) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a15f4ed 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -142,6 +142,7 @@ if get_option('introspection') + install: true, + ) + ++if get_option('vapi') + gck_vapi = gnome.generate_vapi('gck-@0@'.format(gck_major_version), + sources: gck_gir[0], + metadata_dirs: meson.current_source_dir(), +@@ -153,6 +154,7 @@ if get_option('introspection') + install_dir: get_option('datadir') / 'vala' / 'vapi', + ) + endif ++endif + + # pkg-config file + pkgconfig.generate(gck_lib, +diff --git a/gcr/meson.build b/gcr/meson.build +index 06c3a63..cc642cf 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -204,6 +204,7 @@ if get_option('introspection') + install: true, + ) + ++if get_option('vapi') + gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), + sources: gcr_gir[0], + packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], +@@ -217,6 +218,7 @@ if get_option('introspection') + install: true, + ) + endif ++endif + + # pkg-config file + pkgconfig.generate(gcr_base_lib, +diff --git a/meson_options.txt b/meson_options.txt +index ae0f524..f68cb95 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,8 @@ option('gpg_path', + value: '', + description: 'Path to gpg, autodetected if not set', + ) ++option('vapi', ++ type: 'boolean', ++ value: true, ++ description: 'Generate vapi data (requires vapigen and introspection option)', ++) +diff --git a/ui/meson.build b/ui/meson.build +index 477412d..0b89b24 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -169,6 +169,7 @@ if get_option('introspection') + install: true, + ) + ++if get_option('vapi') + gcr_ui_vapi = gnome.generate_vapi('gcr-ui-@0@'.format(gcr_major_version), + sources: gcr_ui_gir[0], + packages: [ +@@ -190,6 +191,7 @@ if get_option('introspection') + install: true, + ) + endif ++endif + + # gcr-viewer + gcr_viewer = executable('gcr-viewer', +-- +2.26.2 + diff --git a/app-crypt/gcr/gcr-3.38.0.ebuild b/app-crypt/gcr/gcr-3.38.0.ebuild new file mode 100644 index 000000000000..1328f530c41d --- /dev/null +++ b/app-crypt/gcr/gcr-3.38.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{6..9} ) + +inherit gnome.org gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0/1" # subslot = suffix of libgcr-base-3 and co + +IUSE="gtk gtk-doc +introspection test +vala" +REQUIRED_USE="vala? ( introspection )" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +DEPEND=" + >=dev-libs/glib-2.44.0:2 + >=dev-libs/libgcrypt-1.2.2:0= + >=app-crypt/p11-kit-0.19.0 + gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) + >=sys-apps/dbus-1 + introspection? ( >=dev-libs/gobject-introspection-1.58:= ) +" +RDEPEND="${DEPEND}" +PDEPEND="app-crypt/gnupg" +BDEPEND=" + ${PYTHON_DEPS} + gtk? ( dev-libs/libxml2:2 ) + dev-util/gdbus-codegen + dev-util/glib-utils + gtk-doc? ( + >=dev-util/gtk-doc-1.9 + app-text/docbook-xml-dtd:4.1.2 + ) + >=sys-devel/gettext-0.19.8 + test? ( app-crypt/gnupg ) + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-avoid-gnupg-circular-dep.patch + "${FILESDIR}"/${PV}-optional-vapi.patch +) + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use introspection) + $(meson_use gtk) + $(meson_use gtk-doc gtk_doc) + -Dgpg_path="${EPREFIX}"/usr/bin/gpg + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} -- cgit v1.2.3