summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2015-07-02 16:11:04 +0000
committerUlrich Müller <ulm@gentoo.org>2015-07-02 16:11:04 +0000
commit11a207b69076b5e4f401b6dd1c0d630a0ad1a63f (patch)
tree2820a4574de153b590a940b40df5c646670a3348 /app-editors/emacs
parentStable for ia64, wrt bug #551010 (diff)
downloadhistorical-11a207b69076b5e4f401b6dd1c0d630a0ad1a63f.tar.gz
historical-11a207b69076b5e4f401b6dd1c0d630a0ad1a63f.tar.bz2
historical-11a207b69076b5e4f401b6dd1c0d630a0ad1a63f.zip
Repeat the warning from upstream's configure about GTK+ breakage, and display it more prominently using ewarn.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/Manifest21
-rw-r--r--app-editors/emacs/emacs-24.5.ebuild11
3 files changed, 17 insertions, 21 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index b1af74c7bc91..5a976181a349 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.681 2015/04/17 11:51:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.682 2015/07/02 16:10:59 ulm Exp $
+
+ 02 Jul 2015; Ulrich Müller <ulm@gentoo.org> emacs-24.5.ebuild:
+ Repeat the warning from upstream's configure about GTK+ breakage, and display
+ it more prominently using ewarn.
17 Apr 2015; Ulrich Müller <ulm@gentoo.org> -emacs-23.4-r11.ebuild,
-emacs-24.3-r6.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7465855f0e40..0a94db0c50d8 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
@@ -13,20 +10,6 @@ DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0
EBUILD emacs-18.59-r10.ebuild 4211 SHA256 cb9d6d427e6a21c9b1f1826552cf114622715417ad225204fc8ed414b3602126 SHA512 04117c94aa6be849df6a649f36aceaecc0962c8b9ac4c1d842bf0cb3540d61b391b88f8cf907236e19dfbff97972d3f03326c36c16893eb4c653ddd465dda359 WHIRLPOOL 0531faa261e02362c5c3c3e6d4691328cae6b65355aae45800d12d51c2d53c1864360b01dd314342d84f09d3d206d76d3e73fa37f83b3532059a63f6b220c0fa
EBUILD emacs-23.4-r13.ebuild 11308 SHA256 0a9980f31aff31393fa122d489100c66aa384ae04211740eb6bd1e07ef6c5f6e SHA512 97e75525e2d72b9612f77dcf1e815364bfb8f08aef2fc06a2a40f718eceee7fd2597216aacb8e405d88768b886773c19664a1af20b95177a637b5abc6cdc1a71 WHIRLPOOL 84b31cba3797cdf91338b7e62ee8560536e59f19f9d0421abc1f321db923f0e2c41efd426eca4bd7d5609cd2b5424ee6975ff11bed4e4d654e856ea3138dc40e
EBUILD emacs-24.4-r4.ebuild 10667 SHA256 565a8bd205cb6b5622e405c4897e1f28328262167d85ad65201223b0f1364841 SHA512 293e2332a7a0841341d4f514932506c12402151905957fd2d28fcb585eb0fce181d11a457a8a67521a780832486a0e4a016af6e15c270fc5557d52f9f8ceb5fe WHIRLPOOL 89b546ac302b5493b6770ce19360b71603c4039c0790fb4ecf90a489b75cca5a496b60f47708c28ba44eff461523eab7ff7b43719baf9d74a1cbbb03e3404b07
-EBUILD emacs-24.5.ebuild 10668 SHA256 cf427bf3d7f0b2e9aac5906a2cb93501a732465cf21d690f2cdfd8cc301ca88b SHA512 d4c206c860e75c4939a62de179733959d214bb43c87ad484ae60280174331f88d3a6949851849327fc3fb984a76a399274419ee069ee38c3275c211c5fadfbe2 WHIRLPOOL 5cb9aead9c5cad0545c30abe23e93ba4985af7a98239787accb1a6d31e29bb6c9917653d95a7b8cd1dee6d07d972d7bc2ff9dfe55a1b3ce91af99f455eb3e997
-MISC ChangeLog 93187 SHA256 a5af946f7f6ac6f038b742662f5258daaea2e9fdf46ff73d7aefaa876aff45eb SHA512 63d530b5a136521342f18e7be76dbf794c79e7d2bf7b85ca8135dd805bb718f60e7e1acb928c33ffd6023620170277de50a27dee9f7fd5bf36b10a5b2cbde009 WHIRLPOOL 2e2f1717a4a8645ae2eb0f9f738593a00efd955a957ba8f301974052954ea714ff037a16fb588df85ba85aede81672866f3e2eea9510984deb7aecc456805c08
+EBUILD emacs-24.5.ebuild 11145 SHA256 93aa009916e78ab1ee96f7b55e8985c0c2f7bc24f87fe8f2e9b36701832104bb SHA512 77237cfe4b0af55f411df3b07b4f733ff8b7081049282dfdfb5efa8eb163af4f1d4eed879a5aef04ee349c1c928761ed8148f3336211b951ca93ace5715fe2e2 WHIRLPOOL 973ebe7342ea12d5b8d0e9beefaeb187f804d358c29e9997e2c3b2e4bebd595fe6ee1b1ce9c83d826722575d75c0b8fe52067c3d0fc2f8e2593a00733dd525e5
+MISC ChangeLog 93369 SHA256 8573380ce782f31412f029baa90408169784e62342805abf249410f565716015 SHA512 8efe96278a52b5a6adab15f0e5e5d4577b0b7900309570dccd84faf20d35afae4a61128272d5ed4a71a336ae80e5dd8cd81993938e1d257caeb5a9db3d8a3f6a WHIRLPOOL 7d49f9f0cefb47d30af3ffb91afe445ef92d57e621beebddfc63692c12644fa3b86650295e8c05871c2369474bcb6d5d7caacec85fe2a0d2d8c296ed75ec9c51
MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQGcBAEBCAAGBQJVMPPAAAoJEJQzkH1pP7W4PE8MAJM3ZWMtwoYSnufSCXnymhu+
-zd1K5OC9UZKk9Lvbd8GFWQgYgBWav4AcmpHgYoc6Cr+bnox63FLZo9rynO6E95dm
-Td9V8c4NzqAygQ2zhCjN7Ai0R77UawUCW67Ou/nBpDk/f1v1SBBLrvVvB2zST/KD
-yo0aTTOq1+nmemqeUtyw5QzIkJkika3ukUzx7mVtaG45pP3btJBwMikudMygMdph
-UUSAKrSOOz8IWrNSUb+KEo1QdXbRTeNLo+daR8bfkSmmW7c6na3C4ouJDSAX5naI
-vg7372n7HG+UhCa+i+qfZEw2bDyZVbe6mgpMr7O9aBwAuZh8dxcMxjy3RY3JUGrq
-++OvP9622XgbP8frT4lqvJZl61TKPZ56darK8drmwtP9ejPSG1b7H9QDmDcgIlb9
-7IoSBkmgyNxmdQlXnurzjA7tUpuwS0ipAOFIfy+f9opKcap6xNlQ5d5UtY/3Qu7E
-RQzI0u+c1wMqnQvccMysgpDhQq0+E7bOvLB4xLsPqA==
-=s086
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.5.ebuild b/app-editors/emacs/emacs-24.5.ebuild
index 350f350f2388..a37ab145fd4e 100644
--- a/app-editors/emacs/emacs-24.5.ebuild
+++ b/app-editors/emacs/emacs-24.5.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/emacs-24.5.ebuild,v 1.1 2015/04/11 08:25:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.5.ebuild,v 1.2 2015/07/02 16:10:59 ulm Exp $
EAPI=5
@@ -146,6 +146,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 \