Use proper distfile.

svn path=/emacs-overlay/; revision=1195

5 files changed, 8 insertions, 79 deletions

diff --git a/app-emacs/emacs-daemon/ChangeLog b/app-emacs/emacs-daemon/ChangeLog
index 3ef1c57..340521b 100644
--- a/app-emacs/emacs-daemon/ChangeLog
+++ b/app-emacs/emacs-daemon/ChangeLog
@@ -4,10 +4,9 @@
 
 *emacs-daemon-0.3 (02 Nov 2008)
 
-  02 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
-  +files/10emacs-daemon-gentoo.el, files/emacs-daemon.rc,
+  02 Nov 2008; Ulrich Mueller <ulm@gentoo.org> -files/emacs-daemon.rc,
   -emacs-daemon-0.2.ebuild, +emacs-daemon-0.3.ebuild:
-  Write process id to file.
+  Write process id to file. Use proper distfile.
 
 *emacs-daemon-0.2 (29 Oct 2008)
 
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index f3edf83..1626651 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,5 +1,4 @@
-AUX 10emacs-daemon-gentoo.el 310 RMD160 44d1732cc476e0e3b8f7db5b1fcf2535cc33341e SHA1 94c1488050e043a674dd95448383c9a8a9bd918d SHA256 f4437e9ec33c87a8bf8b54d37489efef4491fdeaa9558528d9ea5e0fdb9f7a5c
-AUX emacs-daemon.rc 1510 RMD160 c6ee30b530cf40b1f7eae8446637591a77c36db8 SHA1 7b28a96197e19018b03214f76987c6136feb3a21 SHA256 99af924ca961c2f21070312de041e6a21a9a38488603004048a8272bfafe1326
-EBUILD emacs-daemon-0.3.ebuild 903 RMD160 96bd56cd69bb3412616a6fc4675d4ee6e87bf5ef SHA1 e7a63b38b431c9d44decb54df6bef40c374623b9 SHA256 bee5ac4de829079620ab8a7f79721dda7671c49664f5e3b4edc3b8adba54f25d
-MISC ChangeLog 911 RMD160 a118a8d8df4717ef1591e01f94a76e71fabf429d SHA1 9fd103f3fbdd5b03b4c1a084f68dcd8c3b776fd9 SHA256 09db5d0a537936c15cdc64309d4775ab40d7c37b13ebec8681965faadd3c2da8
+DIST emacs-daemon-0.3.tar.bz2 1266 RMD160 67dffc7243fb7d92b1bd2b7f173efecf2fbcd5a9 SHA1 5c1a876302f91868a334a7ef62a31c89990bb0ce SHA256 a0d6ade0be6b780059d25d581138eb838892b199a27dcd43a9dd524877a9f8b5
+EBUILD emacs-daemon-0.3.ebuild 926 RMD160 8e24d1c91a491a4d51cce38f389f7013da293048 SHA1 bcd827d728dc65e098c7b29a6e3593f9c792da9a SHA256 fcd585e410306c4d0cee09a01eb4a6b8692ace71fb59349a34c6739f97bf8dc3
+MISC ChangeLog 898 RMD160 54f21cecbcb76ded39f7c75ea2db5b4e84794b3e SHA1 eee7fe52be407152fccf186debb4f7d5aee292be SHA256 d6fe8651b5fa6d13eacf15a7a12c3c8ff1740b391005f75a3cdfe81a55e9d47b
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.3.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.3.ebuild
index 1d6844a..21a627b 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.3.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.3.ebuild
@@ -6,7 +6,7 @@ inherit elisp-common
 
 DESCRIPTION="Support files for Emacs daemon started as rc service"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI=""
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,6 +30,6 @@ pkg_setup() {
 }
 
 src_install() {
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	newinitd "${FILESDIR}/emacs-daemon.rc" emacs-daemon || die
+	elisp-site-file-install "${SITEFILE}" || die
+	newinitd emacs-daemon.rc emacs-daemon || die
 }
diff --git a/app-emacs/emacs-daemon/files/10emacs-daemon-gentoo.el b/app-emacs/emacs-daemon/files/10emacs-daemon-gentoo.el
deleted file mode 100644
index ae29057..0000000
--- a/app-emacs/emacs-daemon/files/10emacs-daemon-gentoo.el
+++ /dev/null
@@ -1,12 +0,0 @@
-
-;;; emacs-daemon site-lisp configuration
-
-(and
- (fboundp 'daemonp)
- (daemonp)
- (let ((file (concat "/var/run/emacs-daemon/"
-		     (user-login-name) "/emacs.pid")))
-   (if (file-writable-p file)
-       ;; write process id to file
-       (with-temp-file file
-	 (insert (number-to-string (emacs-pid)) "\n")))))
diff --git a/app-emacs/emacs-daemon/files/emacs-daemon.rc b/app-emacs/emacs-daemon/files/emacs-daemon.rc
deleted file mode 100644
index 63d5a1b..0000000
--- a/app-emacs/emacs-daemon/files/emacs-daemon.rc
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# $Header: $
-# Copyright 2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EMACS="/usr/bin/emacs"
-USER="${RC_SVCNAME#*.}"
-PIDFILE_DIR="/var/run/emacs-daemon/${USER}"
-PIDFILE="${PIDFILE_DIR}/emacs.pid"
-
-checkconfig() {
-    if [ "${USER}" = "${RC_SVCNAME}" ]; then
-	eerror "You have to create an init script for each user:"
-	eerror "ln -s emacs-daemon /etc/init.d/emacs-daemon.<user>"
-	return 1
-    fi
-
-    if ! id -u "${USER}" >/dev/null; then
-	eerror "${USER}: No such user"
-	return 1
-    fi
-
-    # Executing Emacs here also ensures a warm cache, which later helps
-    # to create the pid file in a timely manner (within 0.5 seconds).
-    local has_daemon=$(${EMACS} -batch -q --no-site-file \
-	--eval "(princ (fboundp 'daemonp))")
-    if [ "${has_daemon}" != t ]; then
-	eerror "${EMACS} does not support running as a daemon"
-	return 1
-    fi
-
-    if [ ! -d "${PIDFILE_DIR}" ]; then
-	ewarn "${PIDFILE_DIR} does not exist - creating it"
-	mkdir -p "${PIDFILE_DIR}"
-	chown "${USER}" "${PIDFILE_DIR}"
-    fi
-
-    return 0
-}
-
-start() {
-    local home
-    checkconfig || return 1
-
-    ebegin "Starting Emacs daemon for ${USER}"
-    eval home="~${USER}"
-    start-stop-daemon --start --user "${USER}" --chdir "${home}" \
-	--quiet --pidfile "${PIDFILE}" --exec "${EMACS}" -- --daemon
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping Emacs daemon for ${USER}"
-    start-stop-daemon --stop --user "${USER}" \
-	--pidfile "${PIDFILE}" --exec "${EMACS}"
-    eend $?
-}