gentoo resync : 12.08.2018

4 files changed, 104 insertions, 0 deletions

diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index b25dd89a82a0..c62da5c9fe59 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,5 +1,8 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
+AUX gnuserv-3.12.8-backquotes.patch 521 BLAKE2B dd2d150bc56e5f7cdc699fb0876bdcff014cb456f1362c7f050224c359567d4235c056a7dce63b00301abcf70f44723c20e511b76b011f84cf4e329861cd031f SHA512 ae68d03e5cd7be4e178a7eecb581487e39b1fb1ea06ea1990054eb14e1b30be4123d6e2cc309ca96a47f71ad4c9351aec7dd6e4f7e6ace801da3b02d96cf0bbe
+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-r3.ebuild 1548 BLAKE2B 2e959c2585f0c3000fae5129cdef1f33c67f9cabbea1242ac71b8ce9d5087579232fd1afe24357adb407e0855318e47c735b6c36c15eff94370e8a4b02a2c219 SHA512 5f36aaa6cfc4e643b7a8ed019d3063bd58f0730a86120772af34e749f537680619014097336353a631902fc8ecffdda763b9ad3aa17f17c255b1663964c9be71
+EBUILD gnuserv-3.12.8-r4.ebuild 1641 BLAKE2B b835ed957c90b8734014039e2d8e2f68f00ed67d66fb7290f0be9f6c03d5b95e083c9a597ee945ea578bbe69ec61f740d3965006fe85e7caa4a0c1d817209baf SHA512 405540bb8612a87a923cfde83e0fceb1ef207a0d2948cceb5271ac515ea417ddc4541bc5adaa480813b2734dae862554a31970d6c3fef25d0d830b26454e9eca
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
new file mode 100644
index 000000000000..a16124821ddb
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
@@ -0,0 +1,16 @@
+Use new-style backquotes, to make it compile with Emacs 27.
+
+--- gnuserv-3.12.8-orig/gnuserv-compat.el
++++ gnuserv-3.12.8/gnuserv-compat.el
+@@ -193,9 +193,9 @@
+     (defmacro defgroup (&rest args)
+       nil)
+     (defmacro defcustom (var value doc &rest args)
+-      (` (defvar (, var) (, value) (, doc))))
++      `(defvar (, var) (, value) (, doc)))
+     (defmacro defface (var value doc &rest args)
+-      (` (make-face (, var))))
++      `(make-face (, var)))
+     (defmacro define-widget (&rest args)
+       nil)))
+ 
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch
new file mode 100644
index 000000000000..4fcbccc2b59b
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch
@@ -0,0 +1,14 @@
+Function process-kill-without-query is obsolete since 22.1 and no
+longer exists in 27.
+
+--- gnuserv-3.12.8-orig/gnuserv.el
++++ gnuserv-3.12.8/gnuserv.el
+@@ -738,7 +738,7 @@
+ 	    (start-process "gnuserv" nil gnuserv-program)))
+     (set-process-sentinel gnuserv-process 'gnuserv-sentinel)
+     (set-process-filter gnuserv-process 'gnuserv-process-filter)
+-    (process-kill-without-query gnuserv-process)
++    (set-process-query-on-exit-flag gnuserv-process nil)
+     (setq allow-deletion-of-last-visible-frame t)
+     (run-hooks 'gnuserv-init-hook)))
+ 
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
new file mode 100644
index 000000000000..935e23bd8c8f
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp multilib 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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND=">=app-eselect/eselect-emacs-1.15
+	X? ( x11-libs/libXau )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+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 \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	exeinto /usr/libexec/emacs
+	doexe gnuserv
+	newbin gnuclient gnuclient-emacs
+	newbin gnudoit gnudoit-emacs
+	# Don't install gnuattach, it is not functional with FSF GNU Emacs
+
+	newman gnuserv.1 gnuserv-emacs.1
+	echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
+	echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
+
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ChangeLog README README.orig
+
+	if use X; then
+		domenu "${FILESDIR}"/gnuclient.desktop || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	use X && xdg_desktop_database_update
+	eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	use X && xdg_desktop_database_update
+	eselect gnuclient update ifunset
+}