gentoo resync : 06.04.2022

4 files changed, 63 insertions, 10 deletions

diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 5f4554e2a7f3..b797d08391b7 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,7 +1,9 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
 AUX gnuserv-3.12.8-backquotes.patch 509 BLAKE2B 4770c01e4650301d1922b2c87e5cd723feb016fb5d5224aec715761a81b4f66614c7a535101764432a80c26f8e9c13d2fc3cbd1ab8122b5e608d3aeea3de73b3 SHA512 9ccdf8b4fe0ce45528ecec67782785b5d1ec82e5fd14d444b3f091d9c76add8052de3384e0b54fff479f4bc5729966ce520e62343159a7e251fce1e3841b5229
+AUX gnuserv-3.12.8-emacs-28.patch 1300 BLAKE2B b74b904b37af0460682d6c7c5b0b0d79ec41feb646f69bbe38c0db2698d3e8d133b56eb831c6149b0f22725ef5f85c2b27d60100b18ce5c62ce30ec18a928403 SHA512 1cf554a682254ea8c84b8e81e76a2cb08cee18e3b919a9889b745ea97234aad4e3e0099e48fd13a57b881cb2d17a495e59a42d8fbda30d94b2391d0d11ae2ba5
+AUX gnuserv-3.12.8-gnudoit.patch 374 BLAKE2B 9c39f3fd1b881e4a2b4dde712b56824e99da89140d17b5a3996e35eb5d7c0a9d47933e041834c0249010c4932a69633aa93a38ce16bdd3158f52f22549f9db2f SHA512 ba3be5bee1bd23363dc41d77a45028497e1a4a8270358bf4c6eacacaca85e5b52717991885f8d4bb754c613f535d4934d0e199ccd088f78f15bcf78beaa524bd
 AUX gnuserv-3.12.8-process-query.patch 554 BLAKE2B 94f09a1e86ea787a05e51ed5e2742174067b7cca0fbe2fe83619b6f829048172a9e46f70f8e2c22f2787f43390730f07520553e7d659ccfd451869b1a074d707 SHA512 bc01b928003cf5050934972eeb7830b14957693c1484b061dbcf1809176388b75297b6884b7f5c963e59d8ec4a7cc4d9bf9ec265b414574a7de6bb5875f6b607
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
-EBUILD gnuserv-3.12.8-r5.ebuild 1608 BLAKE2B 3a36b4f87937c55c11c8b56f0a7e8dfda7cc3863aa92741c2a59c7509e6fc7f574c150b8634f1e209b3139fc39ff66b7d5f952bfcc40a954bfffd5c8bad8a2be SHA512 9352a1c4a6003527098aafa57c9c766e31e5c1b463f2fe1299b61b8b6c75ddfd8f47c40e261e5880312ae99e4051f6fe87814ef1ea5aa650b000c9c745380ada
+EBUILD gnuserv-3.12.8-r5.ebuild 1752 BLAKE2B affe2261d573ec8d003c89fe509cb52f0d6237db66ae25e8716819e9e097639cd8d96899b119d7bd6058b132ca3cf5375a50083a9dd2d78d90ba201544c89a16 SHA512 5a9ecfb745a7d70da2cf367330a8505654dd0f05f61e884cd086844214689bb7ed7f0ca4f020825483bab6a73ac6b259d928803ba4bb13b4aceeadd7570a5e06
 MISC metadata.xml 260 BLAKE2B a187a6020d68e0ac53c6bb25461b0988c938fb112a8a7e3a906b827269347d70f8366594d404329695b4fa52fff2cde7fbc51d501e674bf8adc821a4141ccfcf SHA512 2ff2d68bb3c552f006474e86ecab8ebbcfcb35588384c045a665d305f79c739c4d80c0ea639a71c39123b8c5c1b3a96977ee8c0c3e973449a732ac3ac8f2c3a3
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch
new file mode 100644
index 000000000000..dde9fdc38043
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/836892
+
+--- gnuserv-3.12.8/gnuserv.el
++++ gnuserv-3.12.8/gnuserv.el
+@@ -98,31 +98,6 @@
+   :group 'gnuserv)
+ 
+ 
+-;; Provide the old variables as aliases, to avoid breaking .emacs
+-;; files.  However, they are obsolete and should be converted to the
+-;; new forms.  This ugly crock must be before the variable
+-;; declaration, or the scheme fails.
+-
+-(define-obsolete-variable-alias 'server-frame 'gnuserv-frame)
+-(define-obsolete-variable-alias 'server-done-function
+-  'gnuserv-done-function)
+-(define-obsolete-variable-alias 'server-done-temp-file-function
+-  'gnuserv-done-temp-file-function)
+-(define-obsolete-variable-alias 'server-find-file-function
+-  'gnuserv-find-file-function)
+-(define-obsolete-variable-alias 'server-program
+-  'gnuserv-program)
+-(define-obsolete-variable-alias 'server-visit-hook
+-  'gnuserv-visit-hook)
+-(define-obsolete-variable-alias 'server-done-hook
+-  'gnuserv-done-hook)
+-(define-obsolete-variable-alias 'server-kill-quietly
+-  'gnuserv-kill-quietly)
+-(define-obsolete-variable-alias 'server-temp-file-regexp
+-  'gnuserv-temp-file-regexp)
+-(define-obsolete-variable-alias 'server-make-temp-file-backup
+-  'gnuserv-make-temp-file-backup)
+-
+ ;;;###autoload
+ (defcustom gnuserv-frame nil
+   "*The frame to be used to display all edited files.
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch
new file mode 100644
index 000000000000..bcb0fdeeaecc
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch
@@ -0,0 +1,15 @@
+--- gnuserv-3.12.8/gnudoit
++++ gnuserv-3.12.8/gnudoit
+@@ -27,10 +27,10 @@
+ 
+ if [ $# -eq 0 ]
+ then
+-    exec gnuclient $quick -batch 
++    exec gnuclient-emacs $quick -batch
+ else
+ # I use "$*" instead of "$@" intentionally -- I don't want to have the
+ # arguments split.
+-    exec gnuclient $quick -batch -eval "$*"
++    exec gnuclient-emacs $quick -batch -eval "$*"
+ fi
+ 
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
index fdd9b4a6d7ca..8c147acf559b 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
@@ -6,8 +6,9 @@ EAPI=7
 inherit elisp desktop xdg-utils
 
 DESCRIPTION="Attach to an already running Emacs"
-HOMEPAGE="http://meltin.net/hacks/emacs/"
-SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20160508134736/http://martin.meltin.net/hacks/emacs/
+	https://www.emacswiki.org/emacs/GnuClient"
+SRC_URI="https://web.archive.org/web/20150908031821/http://martin.meltin.net/sites/martin.meltin.net/files/hacks/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,15 +20,14 @@ RDEPEND=">=app-eselect/eselect-emacs-1.15
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-backquotes.patch
+	"${FILESDIR}"/${P}-process-query.patch
+	"${FILESDIR}"/${P}-gnudoit.patch
+	"${FILESDIR}"/${P}-emacs-28.patch
+)
 SITEFILE="50${PN}-gentoo.el"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-backquotes.patch
-	eapply "${FILESDIR}"/${P}-process-query.patch
-	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
-	eapply_user
-}
-
 src_configure() {
 	econf $(use_enable X xauth) \
 		--x-includes="${EPREFIX}"/usr/include \