From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- app-crypt/gcr/Manifest | 5 +- .../files/3.38.0-avoid-gnupg-circular-dep.patch | 52 -------------- app-crypt/gcr/gcr-3.38.1.ebuild | 84 ---------------------- app-crypt/gcr/gcr-3.40.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 141 deletions(-) delete mode 100644 app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch delete mode 100644 app-crypt/gcr/gcr-3.38.1.ebuild (limited to 'app-crypt/gcr') diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest index 214591951964..5736913f39d7 100644 --- a/app-crypt/gcr/Manifest +++ b/app-crypt/gcr/Manifest @@ -1,7 +1,4 @@ -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.38.1.tar.xz 1030360 BLAKE2B 474b501a5f6c339b0b4fb460a094dec6d5a297ca44daf050c6c88bc05ee822358309f57490f92c42f84a1e9f36a1d3c09c4b2788d7142ee5e86e2acf7987ea14 SHA512 4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81 -EBUILD gcr-3.38.1.ebuild 1846 BLAKE2B 7a5b4eccdf711025139adfd05032899d9d3394a6ccdf2439a1bf1e16934de8205f3e7a4cc2e0ecf059ad27ba2da0a867dcd80d7f31d20464b67c769cb8bedb2b SHA512 9974e119a8292d4fe1a37d09a0d830089fab446366b472e91a5da849b482ac24c6f48580d747063b1f31acedc1731be717d1cab93998aa4b6d6eb0881ac62041 -EBUILD gcr-3.40.0.ebuild 1805 BLAKE2B 38ee16038a5a1e0917aa3632b71d7e2da565c4b4abf7d489e1e089375f9b2175ed7fd28d36620d0c74e95856d9d88ba8b5e5f103e9117355f2c749637f1fb493 SHA512 fd3c86fdb248f1acb549096379769b2260578a520b924781e6b6e8ec8eb571b3e21c4116039e241b36ce2084a89cf58794383774c4400c8723618e3c85056e31 +EBUILD gcr-3.40.0.ebuild 1798 BLAKE2B 9491586e1c0d8bb0f564296fb9d922bfae752867b2a33a6adcdfc957c7f70b48516dd876d074ed90f4cf53cc3b4e018d707152fd3365141acec563a12c5da3db SHA512 26f8dc75e6578c8c1de2c7d46c74e6f725fe0b69e28c766e7a3226f9d32efc290d633306e6c3ba84137ccac2b1be20a8c7c3b9a3117cb7058e77152f5f1feefe 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 deleted file mode 100644 index 5bb7da0fa787..000000000000 --- a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/gcr-3.38.1.ebuild b/app-crypt/gcr/gcr-3.38.1.ebuild deleted file mode 100644 index 0a9c7d827500..000000000000 --- a/app-crypt/gcr/gcr-3.38.1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# 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_{7..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}"/3.38.0-avoid-gnupg-circular-dep.patch - "${FILESDIR}"/3.38.0-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 -} diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild index 139bbe9e4c8a..781d04088abb 100644 --- a/app-crypt/gcr/gcr-3.40.0.ebuild +++ b/app-crypt/gcr/gcr-3.40.0.ebuild @@ -17,7 +17,7 @@ IUSE="gtk gtk-doc +introspection test +vala" REQUIRED_USE="vala? ( introspection )" RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" DEPEND=" >=dev-libs/glib-2.44.0:2 -- cgit v1.2.3