Revert change of 25 Feb 2009 wrt bug 266262.

Package-Manager: portage-2.2_rc30/cvs/Linux i686

4 files changed, 46 insertions, 12 deletions

diff --git a/app-emacs/emacs-daemon/ChangeLog b/app-emacs/emacs-daemon/ChangeLog
index 42ca8e26a41c..baa1748996ec 100644
--- a/app-emacs/emacs-daemon/ChangeLog
+++ b/app-emacs/emacs-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/emacs-daemon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/ChangeLog,v 1.12 2009/04/10 18:37:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/ChangeLog,v 1.13 2009/04/15 22:51:11 ulm Exp $
+
+  15 Apr 2009; Ulrich Mueller <ulm@gentoo.org> emacs-daemon-0.13.ebuild,
+  emacs-daemon-0.14.ebuild:
+  Revert change of 25 Feb 2009 wrt bug 266262.
 
   10 Apr 2009; Raúl Porcel <armin76@gentoo.org> emacs-daemon-0.14.ebuild:
   Add ~arm/~ia64/~s390/~sh wrt #263222
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index f9831018176e..baf74f1eb51e 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST emacs-daemon-0.13.tar.bz2 4420 RMD160 e8251e7dee06ca3829f889bdb695416d98500166 SHA1 0b1ac340aed9ef8d21e82d2cd1fca2d2e4b95399 SHA256 4e6394d090e7c84f6d681f1afcea073567029e79726a8602b779a3fb4d5b2ebd
 DIST emacs-daemon-0.14.tar.bz2 4382 RMD160 6a0bc51d09a41f1453e086665c1a8a888d56753b SHA1 7636edab4a34232df6d3f87143a0db82a3cec517 SHA256 4d261a05228505bf8d5a3c07936e5aeabd44a0558fb1b06de491ee5db173e317
-EBUILD emacs-daemon-0.13.ebuild 820 RMD160 398bcb5293a63e7cf9564e8e7d13ec06289c569b SHA1 63061619a996a9390deb1c3e3b72f9202d6cfc1d SHA256 ffce59bbb002d8a5540c3cb528ac15c9d88ab4d28503012bab9f10d79298df2e
-EBUILD emacs-daemon-0.14.ebuild 1119 RMD160 97c0eb2b53cdbed2641ce30a594c5b616155b679 SHA1 f1c2dd49e39587db6c16445446df1eac6b3733e8 SHA256 1675cfdccbd010adb2184160f6e97f2412136904977ba44143b56e00f84f8edf
-MISC ChangeLog 1967 RMD160 329110b9357ad0ed39fb16e7bd69496f3d0f85a1 SHA1 fe788b93749b223e1e992d33a50c0cea38df5c84 SHA256 c7b82c59585a1759bf7a97271b2cc65d843c9d60ed36e68e95491688005a0597
+EBUILD emacs-daemon-0.13.ebuild 1175 RMD160 098817afb5c2f4fab149df88c87eedbc8f913210 SHA1 9b2289781d6156b650d675ecad3b009fb3c10505 SHA256 deea373555b786dce9d29e2027e317189f4189a6b716d223e1a94c38c769a998
+EBUILD emacs-daemon-0.14.ebuild 1470 RMD160 2abc015991133d3cab237ee4873460284540aeb5 SHA1 296662453f1725d7b9726b8039c3388cbe119ff3 SHA256 c48d32683c1cb6da757826cfa8da1c925605558c5e1f1c74e43940917665f854
+MISC ChangeLog 2112 RMD160 203af8c2910595b114e5530637bbfb896f1ff2fc SHA1 41143d24e982986d2510675d9838e694ded48a23 SHA256 0ebfbf8870496ed50879eaef4dbd20fbef7503a0c47d0df1b6768509fac45688
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAknmZTkACgkQOeoy/oIi7uzCDACgr5EnkAxOm9fnL5YOyDrX2YhE
+XYMAn2TQdoqkln8Gy1F3+nFH45zuNTG5
+=7uFH
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild
index 5b67aebf258e..b11367fde1ec 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild,v 1.2 2009/02/25 08:57:50 ulm Exp $
-
-NEED_EMACS=23
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild,v 1.3 2009/04/15 22:51:11 ulm Exp $
 
 inherit elisp
 
@@ -15,10 +13,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=sys-apps/openrc-0.4"
+DEPEND=">=virtual/emacs-23"
+RDEPEND="${DEPEND}
+	>=sys-apps/openrc-0.4"
 
 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."
+	fi
+}
+
 src_compile() { :; }
 
 src_install() {
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild
index 30d4847a3e09..3a6fb9fae3e6 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild,v 1.4 2009/04/10 18:37:42 armin76 Exp $
-
-NEED_EMACS=23
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild,v 1.5 2009/04/15 22:51:11 ulm Exp $
 
 inherit elisp
 
@@ -15,10 +13,22 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=sys-apps/openrc-0.4"
+DEPEND=">=virtual/emacs-23"
+RDEPEND="${DEPEND}
+	>=sys-apps/openrc-0.4"
 
 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."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"