1 |
commit: f376136cf3ddc4d59e3e74dddbe01581349eaed3 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 16 03:19:01 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 16 03:28:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f376136c |
7 |
|
8 |
gnome-base/gnome-keyring: Version bump to 40.0 |
9 |
|
10 |
* Try removing pinentry[gnome-keyring] from PDEPEND (bug #717434) |
11 |
|
12 |
Closes: https://bugs.gentoo.org/717434 |
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
gnome-base/gnome-keyring/Manifest | 1 + |
16 |
gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild | 81 ++++++++++++++++++++++ |
17 |
2 files changed, 82 insertions(+) |
18 |
|
19 |
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest |
20 |
index 399c87fc5ee..a210168cacd 100644 |
21 |
--- a/gnome-base/gnome-keyring/Manifest |
22 |
+++ b/gnome-base/gnome-keyring/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed |
25 |
+DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e |
26 |
|
27 |
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..000f89b856a |
30 |
--- /dev/null |
31 |
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild |
32 |
@@ -0,0 +1,81 @@ |
33 |
+# Copyright 1999-2021 Gentoo Authors |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=7 |
37 |
+PYTHON_COMPAT=( python3_{7..9} ) |
38 |
+ |
39 |
+inherit fcaps gnome2 pam python-any-r1 virtualx |
40 |
+ |
41 |
+DESCRIPTION="Password and keyring managing daemon" |
42 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" |
43 |
+ |
44 |
+LICENSE="GPL-2+ LGPL-2+" |
45 |
+SLOT="0" |
46 |
+IUSE="+caps pam selinux +ssh-agent test" |
47 |
+RESTRICT="!test? ( test )" |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
49 |
+ |
50 |
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 |
51 |
+RDEPEND=" |
52 |
+ >=app-crypt/gcr-3.27.90:=[gtk] |
53 |
+ >=app-crypt/gnupg-2.0.28:= |
54 |
+ >=app-eselect/eselect-pinentry-0.5 |
55 |
+ app-misc/ca-certificates |
56 |
+ >=dev-libs/glib-2.44:2 |
57 |
+ >=dev-libs/libgcrypt-1.2.2:0= |
58 |
+ caps? ( sys-libs/libcap-ng ) |
59 |
+ pam? ( sys-libs/pam ) |
60 |
+ selinux? ( sec-policy/selinux-gnome ) |
61 |
+ ssh-agent? ( net-misc/openssh ) |
62 |
+" |
63 |
+DEPEND="${RDEPEND}" |
64 |
+BDEPEND=" |
65 |
+ >=app-eselect/eselect-pinentry-0.5 |
66 |
+ app-text/docbook-xml-dtd:4.3 |
67 |
+ dev-libs/libxslt |
68 |
+ >=sys-devel/gettext-0.19.8 |
69 |
+ virtual/pkgconfig |
70 |
+ test? ( ${PYTHON_DEPS} ) |
71 |
+" |
72 |
+ |
73 |
+pkg_setup() { |
74 |
+ use test && python-any-r1_pkg_setup |
75 |
+} |
76 |
+ |
77 |
+src_prepare() { |
78 |
+ # Disable stupid CFLAGS with debug enabled |
79 |
+ sed -e 's/CFLAGS="$CFLAGS -g"//' \ |
80 |
+ -e 's/CFLAGS="$CFLAGS -O0"//' \ |
81 |
+ -i configure.ac configure || die |
82 |
+ |
83 |
+ gnome2_src_prepare |
84 |
+} |
85 |
+ |
86 |
+src_configure() { |
87 |
+ gnome2_src_configure \ |
88 |
+ $(use_with caps libcap-ng) \ |
89 |
+ $(use_enable pam) \ |
90 |
+ $(use_with pam pam-dir $(getpam_mod_dir)) \ |
91 |
+ $(use_enable selinux) \ |
92 |
+ $(use_enable ssh-agent) \ |
93 |
+ --enable-doc |
94 |
+} |
95 |
+ |
96 |
+src_test() { |
97 |
+ # Needs dbus-run-session to not get: |
98 |
+ # ERROR: test-dbus-search process failed: -6 |
99 |
+ "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die |
100 |
+ GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check |
101 |
+} |
102 |
+ |
103 |
+pkg_postinst() { |
104 |
+ # cap_ipc_lock only needed if building --with-libcap-ng |
105 |
+ # Never install as suid root, this breaks dbus activation, see bug #513870 |
106 |
+ use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon |
107 |
+ gnome2_pkg_postinst |
108 |
+ |
109 |
+ if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then |
110 |
+ ewarn "Please select pinentry-gnome3 as default pinentry provider:" |
111 |
+ ewarn " # eselect pinentry set pinentry-gnome3" |
112 |
+ fi |
113 |
+} |