Remove old.

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

6 files changed, 9 insertions, 49 deletions

diff --git a/app-emacs/gnuserv/ChangeLog b/app-emacs/gnuserv/ChangeLog
index fb38566c2b6a..b01bad67e7da 100644
--- a/app-emacs/gnuserv/ChangeLog
+++ b/app-emacs/gnuserv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2014/03/23 10:01:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/ChangeLog,v 1.36 2014/03/23 13:02:48 ulm Exp $
+
+  23 Mar 2014; Ulrich Müller <ulm@gentoo.org> -gnuserv-3.12.8.ebuild,
+  gnuserv-3.12.8-r2.ebuild, -files/gnuserv-3.12.7-path-xemacs.patch,
+  -files/50gnuserv-gentoo-3.12.8-r2.el, files/50gnuserv-gentoo.el:
+  Remove old.
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> gnuserv-3.12.8-r2.ebuild:
   Stable for x86, wrt bug #503110
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
deleted file mode 100644
index 12bf743e2f66..000000000000
--- a/app-emacs/gnuserv/files/50gnuserv-gentoo-3.12.8-r2.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(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/50gnuserv-gentoo.el b/app-emacs/gnuserv/files/50gnuserv-gentoo.el
index 22f8778e50bd..12bf743e2f66 100644
--- a/app-emacs/gnuserv/files/50gnuserv-gentoo.el
+++ b/app-emacs/gnuserv/files/50gnuserv-gentoo.el
@@ -1,4 +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/gnuserv-3.12.7-path-xemacs.patch b/app-emacs/gnuserv/files/gnuserv-3.12.7-path-xemacs.patch
deleted file mode 100644
index 2e7299ca17c9..000000000000
--- a/app-emacs/gnuserv/files/gnuserv-3.12.7-path-xemacs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnuserv.el~	2004-10-19 10:50:01.000000000 +0200
-+++ gnuserv.el	2007-05-25 22:49:01.000000000 +0200
-@@ -733,7 +733,16 @@
-   (unless leave-dead
-     (setq gnuserv-string ""
- 	  gnuserv-current-client nil)
--    (let ((process-connection-type t))
-+    (let* ((process-connection-type t)
-+	   (xe-sysconf
-+	    ;; XEmacs uses i*86-pc-linux instead of i*86-pc-linux-gnu
-+	    ;; Do they want to be deliberately incompatible? :-(
-+	    (replace-regexp-in-string
-+	     "^\\([^-]+-[^-]+-[^-]+\\)-.*$" "\\1" system-configuration))
-+	   (exec-path
-+	    (append exec-path
-+		    (file-expand-wildcards
-+		     (concat "/usr/lib/xemacs-*/" xe-sysconf)))))
-       (setq gnuserv-process
- 	    (start-process "gnuserv" nil gnuserv-program)))
-     (set-process-sentinel gnuserv-process 'gnuserv-sentinel)
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
index 1779b11ef0f5..2eb55ef5edd5 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2014/03/23 10:01:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild,v 1.7 2014/03/23 13:02:48 ulm Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	!!~app-editors/xemacs-21.5.31 !!~app-editors/xemacs-21.5.33
 	!!=app-editors/xemacs-21.5.34 !!=app-editors/xemacs-21.5.34-r1"
 
-SITEFILE="50${PN}-gentoo-${PVR}.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8.ebuild
deleted file mode 100644
index 58526b503f93..000000000000
--- a/app-emacs/gnuserv/gnuserv-3.12.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.7 2010/04/30 14:15:19 grobian Exp $
-
-inherit elisp
-
-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=""
-
-DEPEND=""
-RDEPEND="|| ( ~app-emacs/gnuserv-programs-${PV} app-editors/xemacs )"
-
-DOCS="ChangeLog README README.orig"
-ELISP_PATCHES="${PN}-3.12.7-path-xemacs.patch"
-SITEFILE="50${PN}-gentoo.el"