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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD48B15800F for ; Wed, 4 Jan 2023 08:51:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ED68E082B; Wed, 4 Jan 2023 08:51:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23D78E082B for ; Wed, 4 Jan 2023 08:51:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 381E9340EB2 for ; Wed, 4 Jan 2023 08:51:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BE3783C for ; Wed, 4 Jan 2023 08:51:20 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1672730638.68b35832817cc0e2868603504fc81288c93a5758.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/gnome-ssh-askpass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild X-VCS-Directories: net-misc/gnome-ssh-askpass/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 68b35832817cc0e2868603504fc81288c93a5758 X-VCS-Branch: master Date: Wed, 4 Jan 2023 08:51:20 +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: 64c392ed-acd5-4e39-b364-87e77668d1ff X-Archives-Hash: 1e8bb36ff557af10e6fde8d592f8a274 commit: 68b35832817cc0e2868603504fc81288c93a5758 Author: Tony Olagbaiye fron io> AuthorDate: Tue Jan 3 07:23:58 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Jan 3 07:23:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=68b35832 net-misc/gnome-ssh-askpass: minor corrections Signed-off-by: Tony Olagbaiye fron.io> .../gnome-ssh-askpass-9.1_p1.ebuild | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild index a17b5e22c..4de717ec4 100644 --- a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild +++ b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild @@ -22,10 +22,11 @@ REQUIRED_USE="|| ( gtk2 gtk3 )" RESTRICT="test" -DEPEND=" +RDEPEND=" gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) " +DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-openssh ) @@ -43,22 +44,24 @@ src_configure() { } src_compile() { - pushd contrib + pushd contrib || die use gtk2 && emake gnome-ssh-askpass2 use gtk3 && emake gnome-ssh-askpass3 - popd + popd || die } src_install() { - use gtk2 && ( dobin contrib/gnome-ssh-askpass2; \ - echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass2'" > "${T}/99gnome_ssh_askpass" \ - || die "envd file creation failed" ) + if use gtk2; then + dobin contrib/gnome-ssh-askpass2; + fi - use gtk3 && ( dobin contrib/gnome-ssh-askpass3; \ - echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass3'" > "${T}/99gnome_ssh_askpass" \ - || die "envd file creation failed" ) + if use gtk3; then + dobin contrib/gnome-ssh-askpass3; + fi - doenvd "${T}"/99gnome_ssh_askpass + newenvd - 99gnome_ssh_askpass <<-EOF + export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass$(usex gtk3 3 2)' + EOF }