From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1469695-garchives=archives.gentoo.org@lists.gentoo.org>
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 3019B158020
	for <garchives@archives.gentoo.org>; Tue, 20 Dec 2022 18:53:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7B369E0998;
	Tue, 20 Dec 2022 18:53:23 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 63C4AE0998
	for <gentoo-commits@lists.gentoo.org>; Tue, 20 Dec 2022 18:53:23 +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 A5460341569
	for <gentoo-commits@lists.gentoo.org>; Tue, 20 Dec 2022 18:53:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A256771
	for <gentoo-commits@lists.gentoo.org>; Tue, 20 Dec 2022 18:53:21 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1671562390.ce0b4a32b86dc381929b002b722696b0b0810df9.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-crypt/gnupg/gnupg-2.2.41.ebuild app-crypt/gnupg/gnupg-2.4.0.ebuild
X-VCS-Directories: app-crypt/gnupg/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ce0b4a32b86dc381929b002b722696b0b0810df9
X-VCS-Branch: master
Date: Tue, 20 Dec 2022 18:53:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 40cb2830-4f23-474d-a009-c74544490a24
X-Archives-Hash: ea372f7c32e2b6f230d11cd820821f43

commit:     ce0b4a32b86dc381929b002b722696b0b0810df9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:52:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:53:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0b4a32

app-crypt/gnupg: fix build w/ USE=tools

Another victim of out of source migration.

Closes: https://bugs.gentoo.org/887465
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-crypt/gnupg/gnupg-2.2.41.ebuild | 10 +++++-----
 app-crypt/gnupg/gnupg-2.4.0.ebuild  |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app-crypt/gnupg/gnupg-2.2.41.ebuild b/app-crypt/gnupg/gnupg-2.2.41.ebuild
index ab8c34f65904..37e68bc395e3 100644
--- a/app-crypt/gnupg/gnupg-2.2.41.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.41.ebuild
@@ -150,11 +150,9 @@ my_src_test() {
 my_src_install() {
 	emake DESTDIR="${D}" install
 
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
+	use tools && dobin \
+		tools/{gpg-zip,gpgconf,gpgsplit,gpg-check-pattern} \
+		tools/make-dns-cert
 
 	dosym gpg /usr/bin/gpg2
 	dosym gpgv /usr/bin/gpgv2
@@ -170,6 +168,8 @@ my_src_install() {
 my_src_install_all() {
 	einstalldocs
 
+	use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
 	use doc && dodoc doc/*.png
 
 	systemd_douserunit doc/examples/systemd-user/*.{service,socket}

diff --git a/app-crypt/gnupg/gnupg-2.4.0.ebuild b/app-crypt/gnupg/gnupg-2.4.0.ebuild
index cd23acb62742..8c58fb2730da 100644
--- a/app-crypt/gnupg/gnupg-2.4.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.0.ebuild
@@ -154,11 +154,7 @@ my_src_test() {
 my_src_install() {
 	emake DESTDIR="${D}" install
 
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
+	use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert
 
 	dosym gpg /usr/bin/gpg2
 	dosym gpgv /usr/bin/gpgv2
@@ -174,6 +170,8 @@ my_src_install() {
 my_src_install_all() {
 	einstalldocs
 
+	use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
 	use doc && dodoc doc/*.png
 
 	systemd_douserunit doc/examples/systemd-user/*.{service,socket}