gentoo resync : 03.01.2018

3 files changed, 72 insertions, 3 deletions

diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 38372b6093c4..8fbcb88bada1 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,5 +1,6 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
-EBUILD gnuserv-3.12.8-r2.ebuild 1757 BLAKE2B 4146689dc1a4c52f1da804effc3e472aa5047a868b9e870fcf2e6b9562ae9de1380670180338549ab817798d7f9bc8adff05eac38b21d7876fabbc99a29e20c3 SHA512 d0575ecc171957e65a1826f795b2eaae144ce5b35dcec8baad6f4e875b2f611c0a2418e8613403a52c222fce3ef8cb3c4f27901620bbf56d2fe480957832c24b
+EBUILD gnuserv-3.12.8-r2.ebuild 1765 BLAKE2B 59e4a4ce86ded0d90d629260bf259fb864d7005f437b62d34254ba00128181dc87fe241c3031f7dfa9b5c6ae98f41d69550494d5f1d09ae535fbb17fae0f1388 SHA512 53f7528b9eb3d07c1c5b4da048f0e1c32e98bfb495191fb8d66018df77112f52bf48304e7c0daf2c79c59c8102467c57dde25e3ff05bac6ba5d0a1ab693b4fd3
+EBUILD gnuserv-3.12.8-r3.ebuild 1521 BLAKE2B 7242cc3fb0d7af9ef3ac910702313a554003a9351be7708f32a37a22daef279ae6b851efb1a160ff4ac3b31717d80e7df6d3430c02cb1907b8883f89a7f4eec0 SHA512 a44b5263194d10d514f0552fcd7e110199c1c1b5ae3a5b33706f457edac288c876be8ed4513fe3dcf53b3a590eba7dfd92a300a54e0a10b8e874f69de3525903
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
index 47823b7bd510..38b3c602b4da 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit elisp multilib fdo-mime
+inherit elisp multilib desktop fdo-mime
 
 DESCRIPTION="Attach to an already running Emacs"
 HOMEPAGE="http://meltin.net/hacks/emacs/"
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
new file mode 100644
index 000000000000..680dce5508d5
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
@@ -0,0 +1,68 @@
+# 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"
+
+DEPEND=">=app-eselect/eselect-emacs-1.15
+	X? ( x11-libs/libXau )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	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
+}