From 4392d53af7ce45ccfe6eb14146479ef0e2bd790a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Oct 2022 19:44:42 +0100 Subject: gentoo auto-resync : 14:10:2022 - 19:44:42 --- app-crypt/Manifest.gz | Bin 23767 -> 23781 bytes app-crypt/coolkey/Manifest | 3 +- app-crypt/coolkey/coolkey-1.1.0-r9.ebuild | 3 +- .../coolkey/files/coolkey-1.1.0-clang16.patch | 13 +++ app-crypt/gcr/Manifest | 6 -- .../gcr/files/gcr-3.40.0-meson-0.61-build.patch | 47 ----------- .../gcr-3.41.0-Unbreak-build-without-systemd.patch | 27 ------ app-crypt/gcr/gcr-3.41.0.ebuild | 89 -------------------- app-crypt/gcr/gcr-3.92.0.ebuild | 93 --------------------- app-crypt/seahorse/Manifest | 2 + app-crypt/seahorse/seahorse-43.0.ebuild | 79 +++++++++++++++++ 11 files changed, 98 insertions(+), 264 deletions(-) create mode 100644 app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch delete mode 100644 app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch delete mode 100644 app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch delete mode 100644 app-crypt/gcr/gcr-3.41.0.ebuild delete mode 100644 app-crypt/gcr/gcr-3.92.0.ebuild create mode 100644 app-crypt/seahorse/seahorse-43.0.ebuild (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index af06abd1e9c6..47376f756ff3 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest index 6068b0598d20..e36d873fb90b 100644 --- a/app-crypt/coolkey/Manifest +++ b/app-crypt/coolkey/Manifest @@ -1,4 +1,5 @@ +AUX coolkey-1.1.0-clang16.patch 359 BLAKE2B 9d30f8e44bd7b418c43970e7a1b5cef281d1f8dffc6ddd8491b7e5b1ec5c4428620f4aa11dab95a8d1dd23477b8517841601f69d1c1352e8bd2644a8b39b2f48 SHA512 a97d0419bc962ee112db89e78494423f3cd99a617bbce5406a7a74579fdc4367662555a9b7ba21d90b9d59910619345a93d1bdc412f1657a4e82956753f82d8c DIST coolkey-1.1.0-patches-003.tar.gz 21263 BLAKE2B 27025b8aa24df45f8efa872122a1c3699db6d0d627861182c7eb1d61b921d026d7e3355d1b3d12608747ed1d214eee764b53dbbc5599c452b347e191e1516eca SHA512 25a5fac68ca041fcf9e927d134d0179fa286e6de75019e7bbf205edeaf73222d9fb9fd3861a8f6e0d933d1a09229e3e727278c3a9b3cc63390ef07774c46390d DIST coolkey-1.1.0.tar.gz 432808 BLAKE2B 7e443cdb0dedcec5de32cf5c7cc5eb2d81f1d51fbc2e580fda302153d3f8a919bc89d2308b8799cf395c89d16150e09bd33bc76eacb8af855c54b961bb5d082a SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b -EBUILD coolkey-1.1.0-r9.ebuild 2096 BLAKE2B cf968723617586ea25279011bdf3cb2de557be52f68e90d71500094f0e134c9b8f4601ff97d95231b6b5a15de5f425806e4980cfe830226bb9be6963aed9ffb2 SHA512 833e5196d2da412686ac4c89203bea7206e806bb7022fb1e7fcf68800bf94dacbc30d5e54e5f1b28be16bfa46faeddc8757d5fc35eb4ea7da21892160a909afd +EBUILD coolkey-1.1.0-r9.ebuild 2130 BLAKE2B fac9ed57d9ba491e41e23f5ed631d9158966fa19df61c962bc2673d1d36eba62a15ee5f3a9880299f98358af5af1b228a1770cf8d657b3f46c3ab66a712ad673 SHA512 71430308fb70d8bb1b164a4dbb8d6e2c2d0e5b7e80d6789f89e766a496a2d33acaa2fe19282b1646345bf0ab78b5ae22ac0a787640cd511c83dec8c9038f2676 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild index cd3d7f1e434b..d388df3391b7 100644 --- a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild +++ b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${WORKDIR}/${PN}-patches" + "${FILESDIR}/${P}-clang16.patch" ) pkg_setup() { diff --git a/app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch b/app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch new file mode 100644 index 000000000000..88c3e11b53e8 --- /dev/null +++ b/app-crypt/coolkey/files/coolkey-1.1.0-clang16.patch @@ -0,0 +1,13 @@ +Declaration taken from nss sources' lib/softoken/pkcs11i.h. +Only needed with --enable-pk11install. + +https://bugs.gentoo.org/871585 +--- a/src/install/pk11install.c ++++ b/src/install/pk11install.c +@@ -23,4 +23,6 @@ + #include "pkcs11n.h" + ++char **NSC_ModuleDBFunc(unsigned long function, char *parameters, void *args); ++ + /* + * windows specific globing search diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest index c1c0019a5914..2adf3e7bc3fa 100644 --- a/app-crypt/gcr/Manifest +++ b/app-crypt/gcr/Manifest @@ -1,13 +1,7 @@ AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e -AUX gcr-3.40.0-meson-0.61-build.patch 1634 BLAKE2B 99593b9614831a4a2a47ff4890d1f3a92ceb3fe861bdcd3fa748b51b19645196392e6482dea8bb4330bd39484ecddb74dd8d6dea17beb26f87bb05727b506ee3 SHA512 343c02730611ac4792e572dbfbd14bee5525c9ac00f739b12ce1711b059f00a3c9869e60db33e0dd7010b78dd4bb5309c1cecb29052d97fe68429d0118b98ecc -AUX gcr-3.41.0-Unbreak-build-without-systemd.patch 766 BLAKE2B 005ba225708f0a676be937e809511e7e478ec16610d1bf068ca9e01c210e3d2567e8a3cdbf513c51b3cff57ad0834526e22f17490432dd7c6fa80a16dec4351a SHA512 2192e3556fb134ebbf0bab7e23f6d3b12da601286532e8a5c8fa52d69ac31a1ec3d8e941ff4d5d91737001306aa594996de58449498b2c93d07f53dec83a8401 -DIST gcr-3.41.0.tar.xz 1039744 BLAKE2B c646a04168310051d5b582a9d2f7ab9da89eef095e856e56b8d730600debead051ad8bb40eddb7457b1be2be3e092227dd886f647258a9c6a81d4bab728245f7 SHA512 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e DIST gcr-3.41.1.tar.xz 1030368 BLAKE2B 9d254b7f2ad864c45200e58b685db97c1ffbc83d29ba8cbda94d30ec565aa3dc5a2535305dc63b3264131b68ec9e48f37ac30d5ba08d0ce156f3b6091cd62dc1 SHA512 dd70d41636ede863d05824b26823a8f572902f7a9b6f09b0c70586ef0d4c046864e6956130b9231850a515a9fbfcd56faf20354c1cf8f697f005827c048a2325 -DIST gcr-3.92.0.tar.xz 719608 BLAKE2B 770946582ada19d4282b0adfe77c4eabf08439430b89397a16829259162a940df44a5abf7e2dddd6e13c075449c7b4e5529dd95b781f67b4437246bca8989100 SHA512 bd566c8846e1ee99f82eefd9f7fbc5959c09bf383fef9c7bdc82b6c2c9c7634faaddcf6d91b0eca10b69a99e8f954272c3decf0594864351a48a5473e2bb5db3 DIST gcr-4.0.0.tar.xz 715600 BLAKE2B 8f656cea44bc9c2ab710d33db61f26b7c7f1df73a59430945aa3c9e4acad503d7d93f916f90e2c4efb0e1379eabd9616e974a76c3d3564657b16cd46dd5954c6 SHA512 5d036710c9ae58016467e63b60ab18e461ec1db1740880dccf555dd8c555b382b1ceac3e3ee6fda22dce395e93ba8ecf0578d6c815d08c2790e618f7ca5bfd50 -EBUILD gcr-3.41.0.ebuild 2005 BLAKE2B 82b8133aac42ef6a0e17b431b4509043280eba6bccbf3df3a39901a7b8921dc54c01541f6cd943e8a88ac3c55071c9115337a2504387bca72d5b9735c2aea71b SHA512 596f577056f7dff17eded2334a6a44d0c94d26faca0aca047d4cd568b4bed6f3d8ea90ba93ddca2972211cdf80028648aa16fc36f24c27b803b2faafa3558345 EBUILD gcr-3.41.1-r1.ebuild 2345 BLAKE2B 3f6159f35643b42d19eb6e809dff86c532040d34b42350f4dd1695b67a370acbeed1fc92baca7cbaa2346580ee375b9c87ad3bfd700ef670d563f936df0e747b SHA512 d1704a569597b3cb7ff2479bc8f05a598e9c36346fb1666beb33521c13cc0c985d45f9d3aac7dc4183155f95f101b18826e6abb64ee4390c6e0dd9f1accb9540 EBUILD gcr-3.41.1.ebuild 2093 BLAKE2B 0790692215e78f89bdbbd7c88cc6be3745f9089f860ff8d3418e45b8b53548ec5261c4b3118d4eca4fb6348be0a89b17e7aaf1e7fd1abb57f2d1731d86f17c97 SHA512 d53bda6a7bc7ed1e9bc35be40c725722ea0b0137b3010788a98ca01b38777a32c40454aa3439f4b429fb0f05941c9d4f67b8ca8793f85cf3783bb5641da51c4a -EBUILD gcr-3.92.0.ebuild 2083 BLAKE2B 84888a6b93a722ce344e0ced8969dccccdced9dd3e3febf64699ad3d864ede72be30a648aa38aa0daf192b91c2fb651a557725e143ef6fbd33098e3f43c8a59d SHA512 057e0655d7037e99c0c0999b1e1345be6f4f0574c5a9b46d8e0290d2450441aeaaf211468effc608b90d45cbcb1d6ba25d1535b822fcd4659b7ab1e1168a4616 EBUILD gcr-4.0.0.ebuild 2083 BLAKE2B d5fef74e67683292de1d1efedfa1b67199bdd766df35f25ab1f2bf6827041104a5d210798e22ea0f72bdd1e5fcea02433b51af98063f02079ab37be1903454eb SHA512 f4d4627d35b63d8123da7849eea8b6090d75d25476dc811218484a55588a39680555bcf081b9b0787c11228f284dae44b20630c4bc622a02d7fcdaed52ba1105 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch b/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch deleted file mode 100644 index 4bf8efbb1d73..000000000000 --- a/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch -https://bugs.gentoo.org/831428 - -From: Jakub Jirutka -Date: Wed, 12 Jan 2022 00:24:20 +0100 -Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir - -This argument has been removed in Meson 0.61.0: - - gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" - -https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: - -> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. - -Fixes #89 ---- a/gck/meson.build -+++ b/gck/meson.build -@@ -131,7 +131,6 @@ if get_option('introspection') - sources: gck_gir_sources, - namespace: 'Gck', - nsversion: '@0@'.format(gck_major_version), -- packages: gck_deps, - export_packages: 'gck-@0@'.format(gck_major_version), - includes: [ 'GObject-2.0', 'Gio-2.0' ], - header: 'gck/gck.h', ---- a/gcr/meson.build -+++ b/gcr/meson.build -@@ -190,7 +190,6 @@ if get_option('introspection') - sources: [ gcr_base_public_sources, gcr_base_headers ], - namespace: 'Gcr', - nsversion: '@0@'.format(gcr_major_version), -- packages: gcr_base_deps, - export_packages: 'gcr-base-@0@'.format(gcr_major_version), - includes: [ - 'GObject-2.0', ---- a/ui/meson.build -+++ b/ui/meson.build -@@ -152,7 +152,6 @@ if get_option('introspection') - export_packages: 'gcr-ui-@0@'.format(gcr_major_version), - identifier_prefix: 'Gcr', - symbol_prefix: 'gcr', -- packages: gcr_ui_deps, - includes: [ - 'GObject-2.0', - 'Gio-2.0', -GitLab diff --git a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch deleted file mode 100644 index eac12c0a34a2..000000000000 --- a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 24 Oct 2021 10:26:03 +0200 -Subject: [PATCH] Unbreak build without systemd. - -This fixes the check for WITH_SYSTEMD and prevents a fatal error: -'systemd/sd-daemon.h' file not found when building with systemd disabled. ---- - gcr/gcr-ssh-agent-service.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c -index 3b5a4ca..b7e8928 100644 ---- a/gcr/gcr-ssh-agent-service.c -+++ b/gcr/gcr-ssh-agent-service.c -@@ -39,7 +39,7 @@ - #include - #include - --#ifdef WITH_SYSTEMD -+#if WITH_SYSTEMD - #include - #endif - --- -2.35.1 - diff --git a/app-crypt/gcr/gcr-3.41.0.ebuild b/app-crypt/gcr/gcr-3.41.0.ebuild deleted file mode 100644 index 94edd14c2573..000000000000 --- a/app-crypt/gcr/gcr-3.41.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) - -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 systemd test +vala" -REQUIRED_USE="vala? ( introspection )" -RESTRICT="!test? ( test )" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv 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 - >=app-crypt/libsecret-0.20 - systemd? ( sys-apps/systemd:= ) - gtk? ( >=x11-libs/gtk+-3.22:3[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-optional-vapi.patch - "${FILESDIR}"/${PN}-3.40.0-meson-0.61-build.patch - "${FILESDIR}"/${P}-Unbreak-build-without-systemd.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - use vala && vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_use gtk) - $(meson_use gtk-doc gtk_doc) - -Dgpg_path="${EPREFIX}"/usr/bin/gpg - -Dssh_agent=true - $(meson_feature systemd) - $(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.92.0.ebuild b/app-crypt/gcr/gcr-3.92.0.ebuild deleted file mode 100644 index fddcb8011df7..000000000000 --- a/app-crypt/gcr/gcr-3.92.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) - -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="4/gcr4.3-gck2.1" # subslot = soname and soversion of libgcr and libgck - -IUSE="gtk gtk-doc +introspection systemd test +vala" -REQUIRED_USE=" - gtk-doc? ( introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -DEPEND=" - >=dev-libs/glib-2.68.0:2 - >=dev-libs/libgcrypt-1.2.2:0= - >=app-crypt/p11-kit-0.19.0 - >=app-crypt/libsecret-0.20 - systemd? ( sys-apps/systemd:= ) - gtk? ( gui-libs/gtk:4[introspection?] ) - >=sys-apps/dbus-1 - introspection? ( >=dev-libs/gobject-introspection-1.58:= ) - !