From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE236138359 for ; Thu, 24 Sep 2020 14:24:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8EF9E07FE; Thu, 24 Sep 2020 14:24:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDCF0E07FE for ; Thu, 24 Sep 2020 14:24:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60036340CD7 for ; Thu, 24 Sep 2020 14:24:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1A13353 for ; Thu, 24 Sep 2020 14:24:43 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1600957480.b5beaa215016628bbd6f68654c90cf33d5325502.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: b5beaa215016628bbd6f68654c90cf33d5325502 X-VCS-Branch: master Date: Thu, 24 Sep 2020 14:24:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 707c7d02-c6c7-4706-8bae-8c9e6c8a4c16 X-Archives-Hash: 0b79f1e229f569446bbe363bd374ed87 commit: b5beaa215016628bbd6f68654c90cf33d5325502 Author: Pacho Ramos gentoo org> AuthorDate: Thu Sep 24 14:24:23 2020 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Sep 24 14:24:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5beaa21 gnome-base/gnome-keyring: Merge fixes I collided with a similar fix committed some hours before to -r0 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Pacho Ramos gentoo.org> .../gnome-keyring/gnome-keyring-3.36.0-r1.ebuild | 81 ---------------------- .../gnome-keyring/gnome-keyring-3.36.0.ebuild | 4 +- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild deleted file mode 100644 index aa54f87539b..00000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -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] - >=dev-libs/glib-2.44:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) - selinux? ( sec-policy/selinux-gnome ) - >=app-crypt/gnupg-2.0.28:= - ssh-agent? ( net-misc/openssh ) -" -DEPEND="${RDEPEND} - >=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} ) -" -PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 - -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 - "${EROOT}${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 -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild index 597152fa3d0..1f7e6cfbd50 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild @@ -62,8 +62,10 @@ src_configure() { } src_test() { + # Needs dbus-run-session to not get: + # ERROR: test-dbus-search process failed: -6 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check + GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check } pkg_postinst() {