Recent XEmacs includes a gnuserv that is no longer compatible with this standalone version. Install binary programs, instead of splitting them off to app-emacs/gnuserv-programs. Add blockers against that package and against app-editors/xemacs.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 69 insertions, 22 deletions

diff --git a/app-emacs/gnuserv/ChangeLog b/app-emacs/gnuserv/ChangeLog
index cbeb566fef37..70cf22bf3ee1 100644
--- a/app-emacs/gnuserv/ChangeLog
+++ b/app-emacs/gnuserv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/gnuserv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/ChangeLog,v 1.29 2010/04/30 14:15:19 grobian Exp $
+# 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 $
+
+*gnuserv-3.12.8-r1 (15 Feb 2014)
+
+  15 Feb 2014; Ulrich Müller <ulm@gentoo.org> +gnuserv-3.12.8-r1.ebuild:
+  Recent XEmacs includes a gnuserv that is no longer compatible with this
+  standalone version. Install binary programs, instead of splitting them off
+  to app-emacs/gnuserv-programs. Add blockers against that package and against
+  app-editors/xemacs.
 
   30 Apr 2010; Fabian Groffen <grobian@gentoo.org> gnuserv-3.12.8.ebuild:
   Marked ~x86-linux and ~ppc-macos
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 88d24c4c7e48..dd1c3791d3aa 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50gnuserv-gentoo.el 223 SHA256 7db9aad5982c44067867572e5c6eb4f3e73aedcd722299a59953b87a9e4662ba SHA512 5e8edbd27d6d346c93f3123f712dd8cc460b5e50af4182504c38083e44a699e7f8ad7cebb3e2d5e55c812a8b91a33a76fed284712f14ad8949a6205af78420b8 WHIRLPOOL eb3653719b8a4ebaa16409046cc20c362a8033363e8870f98de2d08f6f7514c64d3e95f639447f6266354a7aea6247e73067a082eed32cee2d8cbc10f13fc4e4
+AUX 50gnuserv-gentoo.el 185 SHA256 0ced7c445535213d2cda391b7afc338bd16958c6a36fdc9c6869e3862d69595d SHA512 d839fcbc59a072e94a104302e5c59f00020627ef2b659fc7e62e4c9fbee27467e2a00536993a83543e5a7fd543c2304f218f9967fcfe41bc2477cc71590937d6 WHIRLPOOL f4ea37f866803842d8c94a04dd102f99577bb67e2d5805fb17490c717461d57a7e63f30bd456bfa887f7a021264fa0f1ce81f0a150f257e5f175e9a000e0efd0
 AUX gnuserv-3.12.7-path-xemacs.patch 794 SHA256 51b251ca679419945a2585dd1e3313db6b7b1957f8d5b86e9f7e2f3a2c742e10 SHA512 825fc7ddbaafe9764eb0d3af6280f16adc353ad7150907f59b8e74b38403097eec605c0638b69ec758c299c6803b3fcd288f2374f23273f7d0c8722058c0c0cd WHIRLPOOL ee454dba7217fd882371f68af94e5069c94dc87383995a5e6c157ce92344dd72db3ed9a199bad33bb8960da5bf423915a8114cd5d11eab502ace1ac1140e3a7d
 DIST gnuserv-3.12.8.tar.gz 124070 SHA256 c9ba560e7d773c175ef1cbced8fae17d7a921b050a11457971a7b7a6216aeed9 SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31 WHIRLPOOL 56203ac84fe967f8c602ac5eaf9d3e9ad5f2b0feb68c8719ff3ca7b61d44c676e0c52f42c7919eed39ffaa25683f28b558a0b55b23ef8a11bdbf3665f8017616
+EBUILD gnuserv-3.12.8-r1.ebuild 1013 SHA256 7b3e0c8040d60ab2b26faf8ab588aa0b303f53d53fd105e6f25b376183bc1c7f SHA512 714101657ce05a13ef6d34ee35d26c6582b7d98745e4898bdcf82960fe986a6252db03b0d13ff4d9da230197cad00ea5f0a176804acfa38b40086c409e8c78c9 WHIRLPOOL d7290aa54ceb5dde8da4138ea996b6109cd8c76dbaba1717c8b277375ad470d83ea5b18267a0e46d7f547549526e8ab96c9dafb0de3a80fdb3e7d3bb0a37c1a2
 EBUILD gnuserv-3.12.8.ebuild 661 SHA256 7783f1f783bf4a30f0af616d28b9e804ad885edb18b776c896389142d25dd409 SHA512 7558ff9e4fef9223aee714b48a413a8e1be659fd4d9440b68d2657065eefbf5671507a684a689bb0a0f4fa5c74bbdbb6ca041318bbf4ae7696b9ee1cb6f544c9 WHIRLPOOL 160bdfa582667cc3d5500fc56cc3c343319f2c6e1e8a3d83f104268ed486a2cba5d3053b43d067fd5de5125aee01de9590782dede400469ac854349789d30a73
-MISC ChangeLog 3915 SHA256 b81d10dcc6ab103155b640090b07d5b79bbd2c06d1ea38a8ce2d152c01091eb4 SHA512 e6eb4bfa7dd49c3bf67d4c397f6074f2d1320dc437b0e08c6f47a50faf54e8ff6a7ebc49cfce3be7e53689267cbf32c6a877055a747d2bc2ab5fae3a834a21cc WHIRLPOOL c39e5c05ebc4d26f157d93d8fbde029242a2fce79adbf14b436a036d40af3354844a5dfe8df5a69caf0bf85b2988d3ff36151e2cbdcbcdd76fd241904538fc60
+MISC ChangeLog 4272 SHA256 7e0ab6042d5873b19373263de2bae1e8059c2d7282ef5f652bb9b3e08552effa SHA512 42eeb7f85842dafffcbcec982d5ae875eae82c8aca6f40d92035dc1867a12b224489d9d1d4561464fa2df9c7a55e257f85faacf503924189e9e89f6afb03bcdc WHIRLPOOL 827399c32ae84dc07f90cd303aae4421d97c99aa83b46f79409eae8c943e9a6a6f0f5243395760a229a5395ab11e6da8e7422eb20ec1ca14e678b019585cb4a0
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e7DAAoJEDxpGckxwJCBsLsP/1TVxD+v0GLQnl9agUmjNjbl
-42Y0bbDwGrxDv0VFtSTcPqVdXbLDO2MWz+dGEZjjw61E9hSGHSD6CVg07REtCG+x
-JTOZu+NTHy8KTu1Dh+f+13lVNq1nAZDXhWj64toWgrm0vx/cyFli6j7sqRUp4p6e
-bEbs+JQzEichPDIDU2VGZQy9MuYObIJSgnLgSTInTZ1OkZ0eHc0zE/c4ToursNL3
-BJEmEWdNcXFYpGTHwjt9gwZ7t+e7nEs1RwA8t7BJnPqD+5asWs4aQGG8Toq0gbyD
-5CNjWCpTdIIQzoTwtmm1dOv0a6CwxGlHxhK5W63pE8BnzTB2xG6uhGyWEnDwUFA6
-yghJrKr3MnEU7aQj4KiupKriEclJhVoefe83a5t1/2J5d1Z0gEUvJOa1Qt4E4CgP
-NFrZQYD0Mw61juOY1TPExQYuoZYX+W5vJD+8ybRaXU3UxQnChDJcNEnMFPgTKM76
-H7uywLaN0kUOw9AgqGFhYo90h8S1A2lAA8aaBnMZjzvwlAxmND7uSk6RtYmkLfTK
-bRZ7GYP4ypE9BmwwFTClAxRQeYjntJbvFi0jn4R7TVCvv1/MSaQ3F1qe19TjqnzE
-nJlwj8+yx0ylzTraAt19I64Lnzezsw/1v4B0XrV66ZuzIr6LWLb1Xq/klZBjmDvk
-T4UEb/YaBoC0WoKwd+9W
-=qKXi
+iQGcBAEBCAAGBQJS/2OlAAoJEJQzkH1pP7W4Bv0L/2EpNRN+KNogtEMF7Fti5/zS
+/03kz3p8TUzrbpgMCrzI5Pg6dFClQrljLG0z+KyXbmGXIaeRQVVu2tSbMWCvgptQ
+cmTbAvkXvaIz7mjOREUanWAtBIpiyaTU9/tp0JBiO3b6D4HN/onMEy4zQeGageoe
+n3Jvyvx8QQgR37n57ZYq+XJWs8m0imFnYXzEsGeLNQMcteVlynxUSR6qR+P33Wko
+GK6QaWd7/RUJkdDdcuj+NTwRlkDnTR4LUBeLHjg3Zvj0Qe+yjtqgCKqMv5Gb29r6
+dP91cj7lpswjSlXdImA4IHr6Ca5REHCoFBJQY8POvCYCEvaFiZ2bY49h3p+zG55F
+koYZnscNH4LSIbiy2QZ2go5Hsq4yJIglIJx/bDFWgJ0fGuc/WqXng5zHpVznBS/h
+mYa8/uFXsN5cVM+uH0yAKGdEYunTNAplwx8L5e+T33yS88RvHtTD/2ndOhe2C6kP
+oKiwtc+dkSAZagmJIwBI5QnisF+224EPGg5Q5At49w==
+=4U1L
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gnuserv/files/50gnuserv-gentoo.el b/app-emacs/gnuserv/files/50gnuserv-gentoo.el
index a54932d0d6f3..22f8778e50bd 100644
--- a/app-emacs/gnuserv/files/50gnuserv-gentoo.el
+++ b/app-emacs/gnuserv/files/50gnuserv-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; gnuserv site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 ;; necessary for FSF GNU Emacs only
 (autoload 'gnuserv-start "gnuserv-compat"
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild
new file mode 100644
index 000000000000..c7867ca88487
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r1.ebuild
@@ -0,0 +1,44 @@
+# 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
+}