commit:     f376136cf3ddc4d59e3e74dddbe01581349eaed3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 03:19:01 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 03:28:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f376136c

gnome-base/gnome-keyring: Version bump to 40.0

* Try removing pinentry[gnome-keyring] from PDEPEND (bug #717434)

Closes: https://bugs.gentoo.org/717434
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-base/gnome-keyring/Manifest                  |  1 +
 gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild | 81 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/gnome-base/gnome-keyring/Manifest 
b/gnome-base/gnome-keyring/Manifest
index 399c87fc5ee..a210168cacd 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1 +1,2 @@
 DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B 
f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194
 SHA512 
e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
+DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 
4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef
 SHA512 
c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e

diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild 
b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
new file mode 100644
index 00000000000..000f89b856a
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
@@ -0,0 +1,81 @@
+# 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 ~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
+}

Reply via email to