Repeat the warning from upstream's configure about GTK+ breakage, and display it more prominently using ewarn.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 26 insertions, 3 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 35ea88e2d855..6e81a4f9d48c 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.195 2015/06/01 06:31:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.196 2015/07/02 16:16:47 ulm Exp $
+
+  02 Jul 2015; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.5.9999.ebuild,
+  emacs-vcs-25.0.9999-r1.ebuild:
+  Repeat the warning from upstream's configure about GTK+ breakage, and display
+  it more prominently using ewarn.
 
 *emacs-vcs-25.0.50_pre20150531 (01 Jun 2015)
 
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
index 4f204033721e..ee58a1a74983 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild,v 1.3 2015/04/11 11:50:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild,v 1.4 2015/07/02 16:16:47 ulm Exp $
 
 EAPI=5
 
@@ -168,6 +168,15 @@ src_configure() {
 		local f
 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <http://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
 			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
index 212440cdb4bb..d6afa88a904e 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.7 2015/03/31 17:25:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.8 2015/07/02 16:16:47 ulm Exp $
 
 EAPI=5
 
@@ -168,6 +168,15 @@ src_configure() {
 		local f
 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <http://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
 			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \