commit:     7a344fb5bd0548f3d7a7b4efeae517af30ff6472
Author:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  6 20:36:56 2025 +0000
Commit:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Tue Oct  7 06:14:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a344fb5

app-crypt/gnupg: fix systemd unit using now-renamed option in 2.5.12

See https://dev.gnupg.org/rGa019a0fcd8dfb9d1eae5bc991fdd54b7cf55641e for
discussion.  In the future, we will likely need to emulate this
functionality somehow.

Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>

 app-crypt/gnupg/{gnupg-2.5.12.ebuild => gnupg-2.5.12-r1.ebuild} | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app-crypt/gnupg/gnupg-2.5.12.ebuild 
b/app-crypt/gnupg/gnupg-2.5.12-r1.ebuild
similarity index 96%
rename from app-crypt/gnupg/gnupg-2.5.12.ebuild
rename to app-crypt/gnupg/gnupg-2.5.12-r1.ebuild
index 23e268a6fe6e..c281b4e7c30a 100644
--- a/app-crypt/gnupg/gnupg-2.5.12.ebuild
+++ b/app-crypt/gnupg/gnupg-2.5.12-r1.ebuild
@@ -93,6 +93,10 @@ src_prepare() {
        # which in turn requires discovery in Autoconf, something that upstream 
deeply resents.
        sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl 
--user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
                -i "${T}"/gpg-agent-ssh.socket || die
+
+       # Since 2.5.3, --supervised is called --deprecated-supervised.  See
+       # https://dev.gnupg.org/rGa019a0fcd8dfb9d1eae5bc991fdd54b7cf55641e
+       sed -i "s/--supervised/--deprecated-supervised/g" "${T}"/*.service || 
die
 }
 
 my_src_configure() {

Reply via email to