From 12b00adc9ade8c2b760e6b77efc6ef7fce1f3070 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Wed, 24 Aug 2011 20:39:51 +0000 Subject: [PATCH] Warn about problems in GTK+, bug 292471. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- app-emacs/emacs-daemon/ChangeLog | 5 +++- app-emacs/emacs-daemon/Manifest | 12 ++++---- .../emacs-daemon/emacs-daemon-0.18.ebuild | 28 ++++++++++++++----- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app-emacs/emacs-daemon/ChangeLog b/app-emacs/emacs-daemon/ChangeLog index bed10541d7e5..532bdda227ac 100644 --- a/app-emacs/emacs-daemon/ChangeLog +++ b/app-emacs/emacs-daemon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emacs/emacs-daemon # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/ChangeLog,v 1.47 2011/07/17 20:25:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/ChangeLog,v 1.48 2011/08/24 20:39:51 ulm Exp $ + + 24 Aug 2011; Ulrich Mueller emacs-daemon-0.18.ebuild: + Warn about problems in GTK+, bug 292471. 17 Jul 2011; Ulrich Mueller -emacs-daemon-0.17.ebuild: Remove old. diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest index 61316892583c..1ca3930ef034 100644 --- a/app-emacs/emacs-daemon/Manifest +++ b/app-emacs/emacs-daemon/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST emacs-daemon-0.18.tar.bz2 5074 RMD160 4c9b5e9a1c6dd1d9145aa8085f3929187e51e07b SHA1 bfeb0a74ecf4aaa818975174e60f3e7f442cefc4 SHA256 6c5f32e71e220fe0bac089af1fda75b1412ff4902e08740d093bc79b7a75450c -EBUILD emacs-daemon-0.18.ebuild 1181 RMD160 1f602d1c4a8dedfa4f446b8d56311c4c32b08eb4 SHA1 02d3aa26e2bec7994464d055c4f77eb7df98ea0c SHA256 32d4df6add7b030b43d200a90e3ed1df65ad3c4a86c9f1258a7fd107919f0bbe -MISC ChangeLog 5875 RMD160 933acd21b84561a81539125983624c1b96b9273a SHA1 259943c4436392ecc8ef51654793e952740f8235 SHA256 5a894a15b27ee8adae55ba452cc20c76cc0e19d5038e047250725819bbcf36c1 +EBUILD emacs-daemon-0.18.ebuild 1732 RMD160 c39f525ba3409e7c61045a433f47243d54204b45 SHA1 d92015ebfd1eba5b471d61e4349bf1f723fcbd79 SHA256 4cabfbb00152ce008720df4153716ae2d4193ee4cc7a7a8583dc4bd3bed11735 +MISC ChangeLog 5992 RMD160 39f4212bab55735ad0d8ef72a58969aa29a6cd6a SHA1 aa0e74aa6e95b65e8f4e739cb11bb3ddacc407f2 SHA256 43b38c288c6612fd6c8eeb0022393bd7c6a76e650755c38c8968c1a570640326 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4jRmIACgkQOeoy/oIi7uws1ACgpmUnAF5GOk6q2lQQC/79QXFh -TFMAoORg4laGhFmDu5BvUkx8PD/NkQ4+ -=5iq2 +iEYEARECAAYFAk5VYvoACgkQOeoy/oIi7uxSCQCgk7wZQqFhUiL3Hm+B2/Vc+5sm +s/gAoNrLuIisL7au0qRV4fiAZbqoTevq +=3jDe -----END PGP SIGNATURE----- diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild index 7e4d46d73bb7..5193200dc29d 100644 --- a/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild +++ b/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.18.ebuild,v 1.7 2011/07/17 20:04:53 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild,v 1.8 2011/08/24 20:39:51 ulm Exp $ inherit elisp @@ -19,12 +19,26 @@ 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 + echo + 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: + + 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 + echo fi } -- 2.26.2