diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-04-15 22:51:11 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-04-15 22:51:11 +0000 |
| commit | 91fa79cfcc439e20069f9879a645631c5644b9cf (patch) | |
| tree | 7ae374b3677068761eaf1059ab4f7ecdec414258 /app-emacs | |
| parent | last version which needs firefox-3.1 (diff) | |
| download | gentoo-2-91fa79cfcc439e20069f9879a645631c5644b9cf.tar.gz gentoo-2-91fa79cfcc439e20069f9879a645631c5644b9cf.tar.bz2 gentoo-2-91fa79cfcc439e20069f9879a645631c5644b9cf.zip | |
Revert change of 25 Feb 2009 wrt bug 266262.
(Portage version: 2.2_rc30/cvs/Linux i686)
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/emacs-daemon/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emacs/emacs-daemon/emacs-daemon-0.13.ebuild | 18 | ||||
| -rw-r--r-- | app-emacs/emacs-daemon/emacs-daemon-0.14.ebuild | 18 |
3 files changed, 33 insertions, 9 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/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}" |