Drop X support for Emacs 18, See bug 260676 comment #14.

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

3 files changed, 27 insertions, 20 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ca58617cc4be..179657089601 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.358 2009/12/28 18:37:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.359 2009/12/30 14:24:57 ulm Exp $
+
+  30 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r6.ebuild:
+  Drop X support for Emacs 18, because libX11[-xcb] will go away.
+  See bug 260676 comment #14.
 
   28 Dec 2009; nixnut <nixnut@gentoo.org> emacs-22.3-r3.ebuild,
   emacs-23.1-r2.ebuild:
@@ -19,21 +23,17 @@
   emacs-23.1-r2.ebuild:
   Change X11 to MIT in LICENSE.
 
-  11 Dec 2009; Tiago Cunha <tcunha@gentoo.org> emacs-23.1-r2.ebuild:
-  stable sparc, bug 296159
-
-  11 Dec 2009; Tiago Cunha <tcunha@gentoo.org> emacs-22.3-r3.ebuild:
+  11 Dec 2009; Tiago Cunha <tcunha@gentoo.org> emacs-22.3-r3.ebuild,
+  emacs-23.1-r2.ebuild:
   stable sparc, bug 296159
 
   10 Dec 2009; Markus Meier <maekke@gentoo.org> emacs-22.3-r3.ebuild,
   emacs-23.1-r2.ebuild:
   amd64/x86 stable, bug #296159
 
-  09 Dec 2009; Brent Baude <ranger@gentoo.org> emacs-23.1-r2.ebuild:
-  Marking emacs-23.1-r2 ppc64 for bug 296159
-
-  09 Dec 2009; Brent Baude <ranger@gentoo.org> emacs-22.3-r3.ebuild:
-  Marking emacs-22.3-r3 ppc64 for bug 296159
+  09 Dec 2009; Brent Baude <ranger@gentoo.org> emacs-22.3-r3.ebuild,
+  emacs-23.1-r2.ebuild:
+  Marking emacs-22.3-r3 and emacs-23.1-r2 ppc64 for bug 296159
 
   09 Dec 2009; Jeroen Roovers <jer@gentoo.org> emacs-22.3-r3.ebuild:
   Remove obsolete replace-flags call. Stable for HPPA (bug #296159).
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e883b66c858d..fac3f2c7d40a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-4.tar.bz2 17690 RMD160 72d71f47616b51d3a82afd375585f614c0a188fb SHA1 c53d978d09e1ac326d0cdc094ff2b80ba102be48 SHA256 2172a28e5f7550e23f9aaa93281b1243e0c314dfe118e83864e09ec02aaef712
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
@@ -10,11 +13,18 @@ DIST emacs-23.1-patches-1.tar.bz2 589 RMD160 d19e9af04e3f84628d165c0fe6c39707627
 DIST emacs-23.1-patches-3.tar.bz2 3216 RMD160 192809f005d1d6ceea827aa3d3a62ced027b2587 SHA1 7fbe229086edd02bd8ecd30660c4737859c67460 SHA256 03cd67610cc7b69021e8a30672e92ce61fc3eb1d3a69f0fde993bde80fddadf7
 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r6.ebuild 2780 RMD160 7d858a366e6461c3061b10753733070764b3819d SHA1 2759b82bb2d0cffc98a7c6702e0f73914e86f6a6 SHA256 786c2f2388c0034534ce9d1c9a3d2b017026a66203f3943c542e5c6c30c75e0e
+EBUILD emacs-18.59-r6.ebuild 2734 RMD160 d90782f517d946ae3c3779ccd9e1c8e0a9f6aa4d SHA1 498de6224d9c4b1144cd9f94dd39f2566d5cf155 SHA256 325b1957d76d2ac9cb265014f27986000b5b7a8d5abb07387ab997190b34b1f6
 EBUILD emacs-21.4-r19.ebuild 5034 RMD160 ae3a81c91285e5fc52fea697df30ca368c4deaa9 SHA1 3f9a1d72b9d290a5d55011d22c55d204d58d4e58 SHA256 36063e90b7458ec118c97b848e1ee5d2482811af0e14920c5fe6f687c67b7df0
 EBUILD emacs-22.3-r2.ebuild 7848 RMD160 13d81514be06a136f57982c28ad83753b52492f7 SHA1 5766944f33fdfa073632e312c9321c53f7053b22 SHA256 efc8f53cbe9f5eb5ca842f5e07545b86b2663c5804fe9b935c9379514db684f1
 EBUILD emacs-22.3-r3.ebuild 7622 RMD160 3a886430d7df29a070f578abed9b6ce5d5ea02a3 SHA1 f15f2ad05f610a6b92ccd30bc5db542ae8bba102 SHA256 8e31e87dc06fa1c03cd5872d4f43105e8395fecd205acd51fc6bab4a05411464
 EBUILD emacs-23.1-r2.ebuild 9391 RMD160 8a8324570fd86abaed49fc7f9cc639287bf813e1 SHA1 944883b41cdb10c9faf58b93152f0c917e36f53a SHA256 d621abed5a0e727f2ea6567b45c9c2cefe5f38d1f9d2bf2e4b3ad0a4b961798c
 EBUILD emacs-23.1.ebuild 9381 RMD160 d940f3961da3fce5ff2758a9cb4a9d21552c3310 SHA1 0b5a3c06944c9a01890365b860fc9570bca0230d SHA256 c306c9e76baf3953e79b8aef3e06e05033dde1dc3fb824ea722f885027b7a40f
-MISC ChangeLog 50865 RMD160 49c9d0a027bc3032e78f58f84bf6ef3801857bbf SHA1 7a0934bc3fb590d82bafcb3c628d5f8a265d5443 SHA256 a24835714867f32cfb5545d00ee3073046be12758e66110aa8369da5ff6d3936
+MISC ChangeLog 50883 RMD160 4112120890699ba06600234a6cd5644a2f544bfb SHA1 9bb0382cf60295ae2f8f4f647b120499684ef3cd SHA256 3ee91cbbc98a9be8070ed790f352b2be43dbbd6e0e145ef25b4898c3beb74f14
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAks7Y2AACgkQOeoy/oIi7uw1aQCg58RUOPnoHRGUeOk1+/oYTR9p
+RacAn3Q0SYK7rsoSKR+H+l7NxOHG/+oj
+=3NIV
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
index 69763fccc9f0..4b8f00a4bea2 100644
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ b/app-editors/emacs/emacs-18.59-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.7 2009/12/27 19:00:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.8 2009/12/30 14:24:57 ulm Exp $
 
 EAPI=2
 
@@ -15,15 +15,12 @@ SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 LICENSE="GPL-1 GPL-2 BSD as-is"
 SLOT="18"
 KEYWORDS="amd64 x86"
-IUSE="X"
+IUSE=""
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
-	X? ( x11-libs/libX11[-xcb] )
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		X? ( app-emulation/emul-linux-x86-xlibs )
-	)"
+	amd64? ( app-emulation/emul-linux-x86-baselibs )"
+#	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}"
 
 MY_BASEDIR="/usr/share/emacs/${PV}"
@@ -43,7 +40,7 @@ src_configure() {
 		*)	   die "Architecture ${arch} not supported" ;;
 	esac
 	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
 	sed -e "${cmd}" src/config.h-dist >src/config.h
 
 	cat <<-END >src/paths.h