10 files changed, 94 insertions, 20 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index ad3de5c4da21..77c62947be49 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/pinentry/Manifest b/app-emacs/pinentry/Manifest
new file mode 100644
index 000000000000..de354a377eed
--- /dev/null
+++ b/app-emacs/pinentry/Manifest
@@ -0,0 +1,6 @@
+AUX 50pinentry-gentoo.el 342 BLAKE2B 21469340b3e79bdb538ec25ff12354584bed217160a60e6c048f6d8f0bc8111601755fbafef9e41bfb65ae6b6e251f46bfc408745b3bacdeb8e380264311ca65 SHA512 b9ffb15ad48389f48a9602aed0b473c0f78f9d6be317867c8b4f3fcd73ee07ca066e2e0932ee4030a5df6cb5f1fddfa4f9874e0aa7170d166e5296e303cad18c
+AUX README.gentoo 445 BLAKE2B 7d899ae7b209e2031157c9a2da24040765eab4bad0e21899550e52529c2a50b4fd7c7f6b48f92223b2c06dbf8fac4cf993e22e6560fa69171757d7d54241b65a SHA512 a0fbb67fc1438b1ff6c55897153c62571e34357c5a30f1d8fad932e3a6a6556f1ed8542a061542459157f8c335174b1cef6bf13a1c534f97824c9021bd0b3dd5
+AUX pinentry-emacs-29.patch 897 BLAKE2B 6d24413a630fccd9695bbf856dd3149a1131548309203aed87838af6e34acd48de89a60f5c2af4a8d5b1ec4dd9e3e762c5e646bc9c18a695f3f3e8a6aaa1e1df SHA512 758908177278907652f6de7bf13b6738016ed8dd338c088168aa4b0e5c28818b732f26523dd082573e5f8f2586852da9a9d40b8e716d8a35b8678719eb64ad58
+DIST pinentry-0.1_p20170913.el.xz 4792 BLAKE2B b2c301720a42f43ad5d1986c427e972cfb197d98bd5bd878106a591e1d54800843f3e607c8d6933bd50b695ae8447d8d2aed772615846a5ce5acf6a67c009a8a SHA512 d582328e64abcc8ef964b4e4b136b9814ecc92edc930a922012809313f7dfdbf407890f9592d37b784f50fda44cf8acf5500881cf33966a1160c8496c201ac33
+EBUILD pinentry-0.1_p20170913.ebuild 553 BLAKE2B ca5b1a528e7c7f8881bf728c874087ebf0b3e6be4d7af2df31f4c9296d7b96e4d15b0bf25727ac88cb5e31a055161795c1be59c9b62edabf58a6ecefa187eb61 SHA512 bd66d0528c82a002284703e9dcef36014f3afb1cbe5fa7f03a4b389d7e1afa18f23ce28d80d17a9f2a632d676ba7fe1c45200123a682ac3ec670fa5e2517ffdd
+MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/pinentry/files/50pinentry-gentoo.el b/app-emacs/pinentry/files/50pinentry-gentoo.el
new file mode 100644
index 000000000000..7d62354a886f
--- /dev/null
+++ b/app-emacs/pinentry/files/50pinentry-gentoo.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'pinentry-start "pinentry"
+  "Start a Pinentry service.
+
+Once the environment is properly set, subsequent invocations of
+the gpg command will interact with Emacs for passphrase input.
+
+If the optional QUIET argument is non-nil, messages at startup
+will not be shown.
+
+\(fn &optional QUIET)" t)
diff --git a/app-emacs/pinentry/files/README.gentoo b/app-emacs/pinentry/files/README.gentoo
new file mode 100644
index 000000000000..30eff9ad23c0
--- /dev/null
+++ b/app-emacs/pinentry/files/README.gentoo
@@ -0,0 +1,14 @@
+This package (and corresponding support in app-crypt/pinentry)
+provides a way to input a passphrase through the Emacs minibuffer.
+
+To use it, add the line
+
+    allow-emacs-pinentry
+
+to your gpg-agent.conf configuration file, which can usually be found
+in the ~/.gnupg/ directory.
+
+The pinentry server can be started with the command "pinentry-start".
+You may add the following line to your Emacs configuration file:
+
+    (pinentry-start 'quiet)
diff --git a/app-emacs/pinentry/files/pinentry-emacs-29.patch b/app-emacs/pinentry/files/pinentry-emacs-29.patch
new file mode 100644
index 000000000000..e737a81538aa
--- /dev/null
+++ b/app-emacs/pinentry/files/pinentry-emacs-29.patch
@@ -0,0 +1,32 @@
+Fix byte-compile warnings in Emacs 29.
+Drop cl-lib which was needed only for cl-letf.
+
+--- a/pinentry.el
++++ b/pinentry.el
+@@ -49,8 +49,6 @@
+ 
+ ;;; Code:
+ 
+-(eval-when-compile (require 'cl-lib))
+-
+ (defgroup pinentry nil
+   "The Pinentry server"
+   :version "25.1"
+@@ -92,7 +90,7 @@
+ 
+ ;; These error codes are defined in libgpg-error/src/err-codes.h.in.
+ (defmacro pinentry--error-code (code)
+-  (logior (lsh 5 24) code))
++  (logior (ash 5 24) code))
+ (defconst pinentry--error-not-implemented
+   (cons (pinentry--error-code 69) "not implemented"))
+ (defconst pinentry--error-cancelled
+@@ -174,7 +172,7 @@
+       (ignore-errors
+         (let (delete-by-moving-to-trash)
+           (delete-file server-file)))
+-      (cl-letf (((default-file-modes) ?\700))
++      (with-file-modes ?\700
+         (setq pinentry--server-process
+               (make-network-process
+                :name "pinentry"
diff --git a/app-emacs/pinentry/metadata.xml b/app-emacs/pinentry/metadata.xml
new file mode 100644
index 000000000000..986088003fe1
--- /dev/null
+++ b/app-emacs/pinentry/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/pinentry/pinentry-0.1_p20170913.ebuild b/app-emacs/pinentry/pinentry-0.1_p20170913.ebuild
new file mode 100644
index 000000000000..75567ef64167
--- /dev/null
+++ b/app-emacs/pinentry/pinentry-0.1_p20170913.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="GnuPG Pinentry server implementation for Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/EasyPG"
+# taken from lisp/net/pinentry.el in GNU Emacs repo (commit bc511a64f6da)
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/pinentry[emacs]"
+
+PATCHES=( "${FILESDIR}"/${PN}-emacs-29.patch )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/uboat/Manifest b/app-emacs/uboat/Manifest
index de907263486f..0c0358e9100b 100644
--- a/app-emacs/uboat/Manifest
+++ b/app-emacs/uboat/Manifest
@@ -1,6 +1,5 @@
 AUX 50uboat-gentoo.el 84 BLAKE2B a4fa581b5fc4982886363b0c823b9ea497e1450666f5878104976b6ba82d7248685e7421601847a9d9929fdeb56d6febd9399a9b780d998887685d0136e5b3ce SHA512 fc349a5f8751437d03975fe2dd93c754ea29a164b626726f724e26b8bfd0f1c96098f471086443e46d95fa9fd4d06da12174305c0327fb06396362fa847a0574
 AUX uboat-1.2-iap.patch 365 BLAKE2B b73cc23f63b6f3ca3c11cefc30b45c21c0f48565a199973504843b4019737fb22d8c36e83433082548b8b626f3742698b30f82f7afe86585d638bfa95b1ad244 SHA512 da72547562a880f0969e483c88a424fba2342a9ce3665ec78a6ea867fb3fa1576767b350e5f1137e8e8cde5462fd1d091ab8eecd99c75a12289278f7fd7c6d81
 DIST uboat-1.2.tar.bz2 1978 BLAKE2B c40c054863d5d13a415355144d216bb03e34205ba65853669758d8e2c44de34534a8460f1c5f6a4dd25543e9d2d0c2f3df5ec3b7146348b616ed2a88ca6b5cd6 SHA512 f77de2c0859a5eb8c09f03aea5be068e2f61f96e10c72d9f18ec6c3fdcc19ab7ca62d606d06aa669b07a89e9f677f5bcb6d3e211b7b7710840cacf9d4f3e307c
-EBUILD uboat-1.2-r1.ebuild 541 BLAKE2B 370610c294759bc22a112e948895380aecb3b8693d846e25bd3a4533f4cd7a34791999f8f40fda133e7f8bb3bc4a2c9d99dea4ac8585ab3395aefd7b62268482 SHA512 5c451cbf33aba3969fc31dac2e3a46c47d67ece67141f0b171db7e5358b7f08b1d437e334dad9d604f303f25a50e1825502e0d7dfa918008914099c0c6b31826
-EBUILD uboat-1.2.ebuild 475 BLAKE2B 76ab210bec562d832205edd7ed8906fb7de62b436c864d91a400942a6899a91bcaa89aca1c12c33d96ecaa4ce8ce40646058a77b7569c78ae7a8994ee0939605 SHA512 f414ec68385762fb28c7d673aff16acbd8072172b327de0aea38fd23d59503e7e7c46296774ca47959016ef698b20b353ca1388848a067026459a0135b599911
+EBUILD uboat-1.2-r1.ebuild 538 BLAKE2B c8d053abf24a27ce170cbeb4d0b2fdbc2955a5b7e948565bb9efc890930341179db1f1ba983b577cfdc65ff0d87f06f66a73b9b59045cb9d9ff8733ce98f6479 SHA512 90fdc5d3ba257d829488478b10c8541f08e208820ff1cd877310d8fc2c72c9b1bd1c9782793c204c4108690ffb7bd6b6fb262b8e4045f729a3f5a76eb44f9b60
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/uboat/uboat-1.2-r1.ebuild b/app-emacs/uboat/uboat-1.2-r1.ebuild
index c440e10ac069..5bc62c517fd6 100644
--- a/app-emacs/uboat/uboat-1.2-r1.ebuild
+++ b/app-emacs/uboat/uboat-1.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
 # Noah Friedman and Bob Manson have confirmed that this is in the public domain
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=( "${FILESDIR}/${P}-iap.patch" )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/uboat/uboat-1.2.ebuild b/app-emacs/uboat/uboat-1.2.ebuild
deleted file mode 100644
index 54d83286e69e..000000000000
--- a/app-emacs/uboat/uboat-1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Generate u-boat-death messages, patterned after Iron Coffins"
-HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-# Noah Friedman and Bob Manson have confirmed that this is in the public domain
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"