Install binaries with -emacs suffix to avoid file collisions with XEmacs; active versions of gnuclient and gnudoit can now be selected with the gnuclient eselect module, bug 177936. Install the gnuserv binary under /usr/libexec and set the path in the site-init file accordingly. Install a desktop entry with USE=X.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

5 files changed, 97 insertions, 45 deletions

diff --git a/app-emacs/gnuserv/ChangeLog b/app-emacs/gnuserv/ChangeLog
index 70cf22bf3ee1..cffff1d9a607 100644
--- a/app-emacs/gnuserv/ChangeLog
+++ b/app-emacs/gnuserv/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emacs/gnuserv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/ChangeLog,v 1.30 2014/02/15 12:54:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/ChangeLog,v 1.31 2014/02/17 20:22:23 ulm Exp $
+
+*gnuserv-3.12.8-r2 (17 Feb 2014)
+
+  17 Feb 2014; Ulrich Müller <ulm@gentoo.org> -gnuserv-3.12.8-r1.ebuild,
+  +gnuserv-3.12.8-r2.ebuild, +files/50gnuserv-gentoo-3.12.8-r2.el,
+  +files/gnuclient.desktop:
+  Install binaries with -emacs suffix to avoid file collisions with XEmacs;
+  active versions of gnuclient and gnudoit can now be selected with the
+  gnuclient eselect module, bug 177936. Install the gnuserv binary under
+  /usr/libexec and set the path in the site-init file accordingly. Install a
+  desktop entry with USE=X.
 
 *gnuserv-3.12.8-r1 (15 Feb 2014)
 
diff --git a/app-emacs/gnuserv/files/50gnuserv-gentoo-3.12.8-r2.el b/app-emacs/gnuserv/files/50gnuserv-gentoo-3.12.8-r2.el
new file mode 100644
index 000000000000..12bf743e2f66
--- /dev/null
+++ b/app-emacs/gnuserv/files/50gnuserv-gentoo-3.12.8-r2.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq gnuserv-program "/usr/libexec/emacs/gnuserv")
+;; necessary for FSF GNU Emacs only
+(autoload 'gnuserv-start "gnuserv-compat"
+  "Allow this Emacs process to be a server for client processes." t)
diff --git a/app-emacs/gnuserv/files/gnuclient.desktop b/app-emacs/gnuserv/files/gnuclient.desktop
new file mode 100644
index 000000000000..4f390394ddd3
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuclient.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Gnuclient
+NoDisplay=true
+Comment=Tell a running Emacs to visit a file
+Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen
+Comment[es]=Abrir un archivo en un Emacs corriente
+Comment[fr]=Ouvre un fichier dans une instance d'Emacs qui est déjà lancée
+TryExec=/usr/bin/gnuclient
+Exec=/usr/bin/gnuclient %F
+Terminal=false
+MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild
deleted file mode 100644
index c7867ca88487..000000000000
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild,v 1.1 2014/02/15 12:54:45 ulm Exp $
-
-EAPI=5
-
-inherit elisp multilib
-
-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="X? ( x11-libs/libXau )"
-RDEPEND="${DEPEND}
-	!app-editors/xemacs
-	!app-emacs/gnuserv-programs"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf $(use_enable X xauth) \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake -j1 \
-		prefix="${ED}"/usr \
-		man1dir="${ED}"/usr/share/man/man1 \
-		install
-
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ChangeLog README README.orig
-}
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
new file mode 100644
index 000000000000..8a40090f037f
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild,v 1.1 2014/02/17 20:22:23 ulm Exp $
+
+EAPI=5
+
+inherit elisp multilib fdo-mime
+
+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-admin/eselect-emacs-1.15
+	X? ( x11-libs/libXau )"
+RDEPEND="${DEPEND}
+	!app-emacs/gnuserv-programs"
+
+SITEFILE="50${PN}-gentoo-${PVR}.el"
+
+src_prepare() {
+	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
+}
+
+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() {
+	use X && fdo-mime_desktop_database_update
+	eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+	eselect gnuclient update ifunset
+}