gentoo auto-resync : 29:11:2023 - 22:58:59

4 files changed, 12 insertions, 40 deletions

diff --git a/app-emacs/pinentry/Manifest b/app-emacs/pinentry/Manifest
index 18b374c7b342..4d224be465ef 100644
--- a/app-emacs/pinentry/Manifest
+++ b/app-emacs/pinentry/Manifest
@@ -1,6 +1,5 @@
 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 616 BLAKE2B 801473cb13aa20e1bb95f13e722dadf1622e86ae958d5612845d011434e7e5f4ea6516f857ab0b684eeb21765df75a76a416afc1961e39b70063650e00591580 SHA512 03ebf072c87fe3244082d3a2c3bcdfd05b88fc27231844d3f49e7bbb39771638aa0e393e689342a0409784786be6e6aff70aa3f61a86c57f9ff90ff803bfee43
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+DIST pinentry-0.1_p20231126.tar.gz 5247 BLAKE2B cfc47b8444b211053148476dbfceb9c151323a5dec23f783f18aed85c7e248ac551a63f723dc69ee2929a76fed19a7cfe2cc721eb64a7115674d46f0d0c03f00 SHA512 bdb3ab192800ef817fd07cab77f7fccfd699165224e6df5b7d7099e712a1beca99c5d20388ff6b16edd1217c35da9a0f8ef2be4e1f8e72bbd8fd9b360c68e584
+EBUILD pinentry-0.1_p20231126.ebuild 641 BLAKE2B afe02ea79bd3259fa63a10cd2ca58ee94a741c9a28f1939d7dadad83adffdd3cbde951542d8cb2d521adee1531ea10a912c0522f860a72d34899fddace383544 SHA512 368d607d2fb61e7e9727815712c8495ba111ae9fee35f0fbcb808ed2b4cd639716d4e17d46eddac5134bbb0e834ad284491d62945a012c60a341908d0a934465
+MISC metadata.xml 362 BLAKE2B 98cc4beb03c21e66573ae4fe3f140e981f8cb7939b88aaec374dfeed4817d1fb0fc942cf479e0da7b09867098e1e6ee2cce2e781e8c5b5900d052494e6718173 SHA512 425cfd33e608458873082aabb0dab03c94c66fdbeb5103f1f517dc941118ecfdd409e5c9adfa841d20e9d88cb38607595eca81d9ff5f861029e40efc9ae15def
diff --git a/app-emacs/pinentry/files/pinentry-emacs-29.patch b/app-emacs/pinentry/files/pinentry-emacs-29.patch
deleted file mode 100644
index e737a81538aa..000000000000
--- a/app-emacs/pinentry/files/pinentry-emacs-29.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
index 986088003fe1..86802d71992a 100644
--- a/app-emacs/pinentry/metadata.xml
+++ b/app-emacs/pinentry/metadata.xml
@@ -6,4 +6,7 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
+<upstream>
+  <remote-id type="github">ueno/pinentry-el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/pinentry/pinentry-0.1_p20170913.ebuild b/app-emacs/pinentry/pinentry-0.1_p20231126.ebuild
index d54a5aa04a34..8b2b12b25e85 100644
--- a/app-emacs/pinentry/pinentry-0.1_p20170913.ebuild
+++ b/app-emacs/pinentry/pinentry-0.1_p20231126.ebuild
@@ -5,10 +5,13 @@ EAPI=8
 
 inherit elisp readme.gentoo-r1
 
+COMMIT="a6441224da04656370e993e2616185cc31afaff9"
 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"
+HOMEPAGE="https://github.com/ueno/pinentry-el
+	https://www.emacswiki.org/emacs/EasyPG"
+SRC_URI="https://github.com/ueno/${PN}-el/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-el-${COMMIT}"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -16,5 +19,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc
 
 RDEPEND="app-crypt/pinentry[emacs]"
 
-PATCHES=( "${FILESDIR}"/${PN}-emacs-29.patch )
 SITEFILE="50${PN}-gentoo.el"