From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- gnome-base/gnome-keyring/Manifest | 3 +- .../gnome-keyring/gnome-keyring-40.0-r1.ebuild | 4 +- gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild | 81 ---------------------- 3 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild (limited to 'gnome-base/gnome-keyring') diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest index 92a4b8afe1a2..03fbbab718ff 100644 --- a/gnome-base/gnome-keyring/Manifest +++ b/gnome-base/gnome-keyring/Manifest @@ -1,4 +1,3 @@ DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e -EBUILD gnome-keyring-40.0-r1.ebuild 2162 BLAKE2B 422663d6cdcf7eab1bcea2318af0f4d854542494448b7ec855b4133853c574c5fe371e88da04e93d9ecc4d964efb6b409e2579a222e3c5b8b6aa18aa959ce9c5 SHA512 e83fd59c871e579358843ee9f1f320e5eae63ff0fd3057f46ab8173bc8b9856d6486a55a638606ba614667abaf085657671f017210eda5360481d9b1a239582d -EBUILD gnome-keyring-40.0.ebuild 2240 BLAKE2B c79a2de4457666987941707a1fe784b504d2fe820661650039e22cf420597d239f8f6939233d7fb2198e5e537d7eb79cf298fb2448439acd6d4375271c9177e9 SHA512 3994d2754c8738f0630a88dad84a7ac62d0ded284c098173324361bb7224f387c1973e9f724b86875bb3cb6fcc1dab1379f228553d58f5256c6af0d3ef896d43 +EBUILD gnome-keyring-40.0-r1.ebuild 2155 BLAKE2B f4102f9c57695df35b0aa8231f3ea841a9ae5ecdf3b419b24b162543d75541ba919d6ffe915e342c7f16710c2c45a536ed23ccb88c6b679914cfa75733f33dfb SHA512 d7856e091ca949711909cae7e34357fc7cbadda2e100b44fde9f238fd415c20327b6d344f29910114f19795a6cb0e02286707c03a637c663a8cad84d6502014e MISC metadata.xml 884 BLAKE2B 7453133f82b652fce07202db1a10c488a32355dd9398847e3d2f7d1cc62ad466c25febb6713318ba6d77d006e3f87b15c593c5020d1f187e2d7704a4c676dade SHA512 d5419c6a5b09fc57cb877210e59f82717374ea5ca7914fe305b2f3625e190c4438f76b24503698dffd00633ba17bcd70a0068765284ccfab730c5b7e8c1b768d diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild index a6174f16178a..90ec97155fa5 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.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 @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" IUSE="pam selinux +ssh-agent test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 RDEPEND=" diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild deleted file mode 100644 index 3f1a2d876e2b..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit fcaps gnome2 pam python-any-r1 virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps pam selinux +ssh-agent test" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 -RDEPEND=" - >=app-crypt/gcr-3.27.90:=[gtk] - >=app-crypt/gnupg-2.0.28:= - >=app-eselect/eselect-pinentry-0.5 - app-misc/ca-certificates - >=dev-libs/glib-2.44:2 - >=dev-libs/libgcrypt-1.2.2:0= - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) - selinux? ( sec-policy/selinux-gnome ) - ssh-agent? ( net-misc/openssh ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=app-eselect/eselect-pinentry-0.5 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS with debug enabled - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - $(use_enable ssh-agent) \ - --enable-doc -} - -src_test() { - # Needs dbus-run-session to not get: - # ERROR: test-dbus-search process failed: -6 - "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check -} - -pkg_postinst() { - # cap_ipc_lock only needed if building --with-libcap-ng - # Never install as suid root, this breaks dbus activation, see bug #513870 - use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst - - if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then - ewarn "Please select pinentry-gnome3 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gnome3" - fi -} -- cgit v1.2.3