Change live ebuild to use Git. Update to EAPI 4.

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

3 files changed, 56 insertions, 18 deletions

diff --git a/app-emacs/emacs-daemon/ChangeLog b/app-emacs/emacs-daemon/ChangeLog
index 25973f4..6824a09 100644
--- a/app-emacs/emacs-daemon/ChangeLog
+++ b/app-emacs/emacs-daemon/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-emacs/emacs-daemon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jun 2012; Ulrich Müller <ulm@gentoo.org> emacs-daemon-9999.ebuild:
+  Change live ebuild to use Git. Update to EAPI 4.
+
   17 Jul 2009; Ulrich Mueller <ulm@gentoo.org> emacs-daemon-9999.ebuild:
   Remove OpenRC dependency, as the init script is now baselayout-1 compatible.
 
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index 750a0ba..d52cf59 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,3 +1,23 @@
-EBUILD emacs-daemon-9999.ebuild 1082 RMD160 5ba0827724f69e87a7f593d655bfcbe34f8d7527 SHA1 25bc6918cb82a52b8d724a1c4e4d7379b518ad81 SHA256 28b8652575d139de4868cd3af68e500c996e4a177877d570db3d60362f42768d
-MISC ChangeLog 2329 RMD160 54cfd2b9d6d478cbe7332bbe2c785b01954f9ac0 SHA1 67e0258021557a2f52ad32113152c93a9509f119 SHA256 a94dbdab033baa3f6c98293147184319ff7dae79c7d643d6163761648ff7c68a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD emacs-daemon-9999.ebuild 1669 RMD160 c5710aede17c47ccf9d9a6e3d8a90febd7224205 SHA1 b42c21c6cdd877ef644d5b697907af6ad538cbb3 SHA256 3e832f4bd9d7b034cad96e2fa1fc98062e635118565a95fabe074553a7164701
+MISC ChangeLog 2454 RMD160 980bc3614bd4a5c934e280975b72d4e2233c1db8 SHA1 d9dd2b9a0d4ae8782344676d1f5fac8697db1ca4 SHA256 9ac8be93621acb8a53fd071893760b743263e121ada507e88da01af34ca5afe3
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP005GAAoJEDxpGckxwJCB1WkP/2WfDhwkMX3NfV/H1CzorEbl
+Rym1LoNmOxmdwEjfUg3sLX3Hefpbip8eAS3V160TxtY1XOHsXFr3Libh7Wo7HNVZ
+RZsWG2L1LAY9yYUfM/qrACkq1JrM4OWa3X99MkvgfMPTjqcXwz+KXZGMxoFPv8uc
+YqbgwmX36JQC2/cHJ/TkKStZclTk3MFZcrFjt+DXJXAPXw5BuCa0Ha7zXnAskQjr
+8Efj1cybf0enkYaUhKfLWPCbuC74rLHk5HAQy7d76n4XuRnjXTUfHUL1D60AjZ9r
+w8c47pP+XQch44sr/2TmWzHOrCBzM7/E/9kQfKXvu3U6/A1VXBEKGyFj4zSFJZ5D
+TEzOD+82yasvS9QatqkME06Kq6aiYH4DZV10YOqMbH9Ay5ibR2+YLFgrAXZS20jy
+nWmp7gP0H2kPAlOfkAL59yBvBcvys3lxQ7MxnmQlVZTc+8pTqIFUDovezxJjwovh
+9jwey90FXFBX+mmNws3VZvIBRJ4l2oSkInI9cG/2vk3soMT77z+fqv1SPByJGXR7
++UQpesTQuVN63myz8p67NL5w6FvnRADDp+pVXeVFhs9OIn3hGdeJ3puiuW8cip9G
+/etobAlZlfCoDbQKqAXvTUX5cR6kUU8epPRMiiF2UUZGvSDVhz2dUgZgM/AoTLUX
+yWyvRf2pSVUgJNduBzcv
+=5pC9
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-daemon/emacs-daemon-9999.ebuild b/app-emacs/emacs-daemon/emacs-daemon-9999.ebuild
index 914e152..4ce00cf 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-9999.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-9999.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit elisp subversion
+EAPI=4
+
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/emacs-tools.git"
+EGIT_BRANCH="${PN}"
+
+inherit elisp git-2
 
-ESVN_REPO_URI="svn://anonsvn.gentoo.org/emacs/${PN}"
 DESCRIPTION="Gentoo support for Emacs running as a server in the background"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=virtual/emacs-23"
@@ -20,23 +24,34 @@ RDEPEND="${DEPEND}"
 SITEFILE="10${PN}-gentoo.el"
 
 pkg_setup() {
-	local has_daemon=$(${EMACS} ${EMACSFLAGS} \
-		--eval "(princ (fboundp 'daemonp))")
-	if [ "${has_daemon}" != t ]; then
-		ewarn "Your current Emacs version does not support running as a daemon"
-		ewarn "which is required for ${CATEGORY}/${PN}."
-		ewarn "Use \"eselect emacs\" to select an Emacs version >= 23."
+	local has_daemon has_gtk line
+	has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
+	has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
+
+	if [[ ${has_daemon} != t ]]; then
+		while read line; do ewarn "${line}"; done <<-EOF
+		Your current Emacs version does not support running as a daemon
+		which is required for ${CATEGORY}/${PN}.
+		Use "eselect emacs" to select an Emacs version >= 23.
+		EOF
+	elif [[ ${has_gtk} == t ]]; then
+		while read line; do ewarn "${line}"; done <<-EOF
+		Your current Emacs is compiled with GTK+. There is a long-standing
+		bug in GTK+ that prevents Emacs from recovering from X disconnects:
+		<http://bugzilla.gnome.org/show_bug.cgi?id=85715>
+		If you run Emacs as a daemon, then it is strongly recommended that
+		you compile it with the Lucid toolkit, i.e. with USE="Xaw3d -gtk".
+		EOF
 	fi
 }
 
 src_compile() { :; }
 
 src_install() {
-	newinitd emacs.rc emacs || die
-	newconfd emacs.conf emacs || die
+	newinitd emacs.rc emacs
+	newconfd emacs.conf emacs
 	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh || die
+	doexe emacs-wrapper.sh emacs-stop.sh
 	elisp-site-file-install "${SITEFILE}" || die
-	keepdir /var/run/emacs || die
-	dodoc README ChangeLog || die
+	dodoc README ChangeLog
 }