diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /app-crypt/seahorse | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'app-crypt/seahorse')
| -rw-r--r-- | app-crypt/seahorse/Manifest | 3 | ||||
| -rw-r--r-- | app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch | 29 | ||||
| -rw-r--r-- | app-crypt/seahorse/seahorse-41.0-r1.ebuild | 11 |
3 files changed, 40 insertions, 3 deletions
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest index 14b1f55d2606..46be25a1bb82 100644 --- a/app-crypt/seahorse/Manifest +++ b/app-crypt/seahorse/Manifest @@ -1,3 +1,4 @@ +AUX 41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch 1219 BLAKE2B ad27915be295cec6d8afb3019c8ba4054da7840d4b79f4725a770e15ee6cacf17052e17dddaf7d4a6a6cb8428aa1ff6e14f4f3fe4ddb0b4bae46675008ed2de3 SHA512 9d595508f9fc7b0ae0188f4fd832918869adfa7094f83eeb3d4eaa0c8ab30a813d792043e74ce7fe8b4177aa4ca8db182104483c63fff582f2033e369ed47e9b DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf -EBUILD seahorse-41.0-r1.ebuild 1626 BLAKE2B 8a1ae85a4f8918bf669eacb4ee79032bedae547f773e3e81b6dd82c93dbb1a6dd246659145ca7433b34d399015759304f6a4605cce1a7d08af8bbeeef49c832b SHA512 cad8007442c024645b08aef029f195c5c1087348f5f2a57e2700acdf161fe1e761620f3a109f9b712cc78637fbc50ad132505171f2487d29bc5f51e16eeb276a +EBUILD seahorse-41.0-r1.ebuild 1793 BLAKE2B 645023facb8b3c3bcb7eec6569396daacd086d45dfac6a8f7f75c2b0d5cf3cf5d9ed87f18433f5fdf198716d438c6a746cb4f00bb2954b00aaeae89789e8834c SHA512 c576865762a9e56d2dbbf46745e3b27e6abb6f4f8efa48a3e549a44d9bbf4f2f227deb741b5625ec172a621c65c0ca855d67a44be7b3190729f11b090e7175c5 MISC metadata.xml 743 BLAKE2B 90fed564b56f7e7a781f197eb09ebbca90ac0bd3c93ee1b65eec7e35420fcdd8bf0c0bf67cbf2109a55de590f32b48d3837a70844bb7e6e50819a8b67c868369 SHA512 99872b87aa52c0fe0584d11186fed74d0ade69e083395b030af3a22ba031a91467247c9c72e8cfa45b114192ebc13ed593a2634aec7db5a2b8efa1e2af6a0791 diff --git a/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch new file mode 100644 index 000000000000..2d205e49a43f --- /dev/null +++ b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch @@ -0,0 +1,29 @@ +From 38a82911f9c35617e96587e59f796e4616d62483 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Date: Tue, 22 Mar 2022 09:37:17 +0100 +Subject: [PATCH] meson: fix gpg version check for recent gnupg + +Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e3242323..12ce3d56 100644 +--- a/meson.build ++++ b/meson.build +@@ -51,7 +51,10 @@ gpgme_dep = dependency('gpgme', version: '>= 1.14.0', required: get_option('pgp- + + if get_option('pgp-support') + gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), accepted_gpg_versions ]) +- gpg_version = gpg_version_check.stdout() ++ # GnuPG now outputs e.g. 2.3.4-unknown so we need to drop this extra cruft ++ gpg_version_raw = gpg_version_check.stdout() ++ gpg_version_raw_split = gpg_version_raw.split('-') ++ gpg_version = gpg_version_raw_split[0] + message('GnuPG Version: @0@'.format(gpg_version)) + if get_option('check-compatible-gpg') and gpg_version_check.returncode() != 0 + error('Incompatible version of GnuPG. Accepted versions are: @0@'.format(accepted_gpg_versions)) +-- +2.35.1 + diff --git a/app-crypt/seahorse/seahorse-41.0-r1.ebuild b/app-crypt/seahorse/seahorse-41.0-r1.ebuild index bd31322686a1..aa0c3a9e03fe 100644 --- a/app-crypt/seahorse/seahorse-41.0-r1.ebuild +++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit gnome.org gnome2-utils meson xdg vala +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg vala DESCRIPTION="Manage your passwords and encryption keys" HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse" @@ -34,6 +35,7 @@ DEPEND="${RDEPEND} gui-libs/libhandy:1[vala] " BDEPEND=" + ${PYTHON_DEPS} app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib @@ -45,9 +47,14 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch +) + src_prepare() { - xdg_src_prepare + default vala_src_prepare + gnome2_environment_reset } src_configure() { |