Fix compilation failure with USE=-X.

Package-Manager: portage-2.1.3.12

4 files changed, 36 insertions, 13 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 4e61f424c6e2..0706f96cccd2 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.163 2007/10/12 23:31:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.164 2007/10/13 21:22:15 ulm Exp $
+
+  13 Oct 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-no-x-compile.patch, emacs-cvs-23.0.0_p20070920.ebuild:
+  Fix compilation failure with USE=-X.
 
 *emacs-cvs-23.0.60 (12 Oct 2007)
 
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 93884e0a6eeb..78d3bc6eb3a7 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -21,6 +21,10 @@ AUX emacs-cvs-makeinfo-regexp.patch 553 RMD160 7e80b9d61a4cd253449252c98a5da47e0
 MD5 84a60e6d41027b7446e49eba5f105734 files/emacs-cvs-makeinfo-regexp.patch 553
 RMD160 7e80b9d61a4cd253449252c98a5da47e0f717bd0 files/emacs-cvs-makeinfo-regexp.patch 553
 SHA256 4a4ecfa1223e80b78fae6bacf6dd981f0bfcdd2b5b29e392c61543abcc6d31db files/emacs-cvs-makeinfo-regexp.patch 553
+AUX emacs-cvs-no-x-compile.patch 452 RMD160 6c698c2ce80c496079810da7290315ff579c9194 SHA1 5501d6da55dace13027a327b331f2882d6c61a3d SHA256 cf6b5d8a48796618a98f3a66f85f0010290b277be1d605304e7d83f36cc69349
+MD5 392aef542450bf934474b9db79c4c0dc files/emacs-cvs-no-x-compile.patch 452
+RMD160 6c698c2ce80c496079810da7290315ff579c9194 files/emacs-cvs-no-x-compile.patch 452
+SHA256 cf6b5d8a48796618a98f3a66f85f0010290b277be1d605304e7d83f36cc69349 files/emacs-cvs-no-x-compile.patch 452
 DIST emacs-cvs-22.1.50_p20070829.tar.bz2 20915594 RMD160 47f3c1c543de65c49deadbcdf4e83236aaa68f1b SHA1 6223e5b4cde078814648306b095f6081f56eea77 SHA256 c27196e9359d5ad4f30e3552c7897c995798324a323a4b47060b98426a71891f
 DIST emacs-cvs-23.0.0_p20070920.tar.bz2 21944733 RMD160 4ca3f66530c44a82e1badba4dfc934b2e5e5b8d7 SHA1 7e8b99d695adaec619837a6eec22c04ac69cb7aa SHA256 c38d4be31e047f5a470b1664a2721b3dcb83b3876cb3490a86e05804aebf4f2a
 EBUILD emacs-cvs-22.1.50-r1.ebuild 7702 RMD160 7cd46d2e753a8f7f21dadf9073b2098006464963 SHA1 8b5aea9b06e557ca8ec7c57286f485462313bc68 SHA256 ad3b10e1ce35689c1c11c45b982c2efb99ea226c39f30bba2ba3be21a41af365
@@ -31,10 +35,10 @@ EBUILD emacs-cvs-22.1.50_p20070829-r1.ebuild 7312 RMD160 db0b3d29727bf66432aea4b
 MD5 7c1be318c4effdde3db9afb462a788f9 emacs-cvs-22.1.50_p20070829-r1.ebuild 7312
 RMD160 db0b3d29727bf66432aea4b8fabc7f4c3bef9e7e emacs-cvs-22.1.50_p20070829-r1.ebuild 7312
 SHA256 ed1849daf1f67e582053109c4b9a3abb33cd588c11f7fc2c565ce72168345fa5 emacs-cvs-22.1.50_p20070829-r1.ebuild 7312
-EBUILD emacs-cvs-23.0.0_p20070920.ebuild 7523 RMD160 fa86750e3241c6ffcd3db145d19e2e1c6d51f2fa SHA1 b413a718f703d47740040f5ac6c7c189f1fa263d SHA256 c023bfff84c93b2ff805b63922f2cf89374f549a8135a24583cb0c06ebf1ec6d
-MD5 c805281e91a5e14d37659a2cd3ca28a9 emacs-cvs-23.0.0_p20070920.ebuild 7523
-RMD160 fa86750e3241c6ffcd3db145d19e2e1c6d51f2fa emacs-cvs-23.0.0_p20070920.ebuild 7523
-SHA256 c023bfff84c93b2ff805b63922f2cf89374f549a8135a24583cb0c06ebf1ec6d emacs-cvs-23.0.0_p20070920.ebuild 7523
+EBUILD emacs-cvs-23.0.0_p20070920.ebuild 7570 RMD160 cca44779e208d93e5c4d5f9b1d8d61043444747f SHA1 a0d968817939a4d0ac65edc935e290d99a2f8443 SHA256 bf99c8bee5d21eabaea4b40b85f4c7c758df14b16bd0ce8f8151ca50c954d032
+MD5 4d16c53bf2d28528d015f3f1ee0e1701 emacs-cvs-23.0.0_p20070920.ebuild 7570
+RMD160 cca44779e208d93e5c4d5f9b1d8d61043444747f emacs-cvs-23.0.0_p20070920.ebuild 7570
+SHA256 bf99c8bee5d21eabaea4b40b85f4c7c758df14b16bd0ce8f8151ca50c954d032 emacs-cvs-23.0.0_p20070920.ebuild 7570
 EBUILD emacs-cvs-23.0.50.ebuild 7712 RMD160 f22e76910dc8106ed6b2d4334784fe2f0885a481 SHA1 bd43eb186b4c6497b66104940a8e79f57e8a80bc SHA256 59ab6922d9975f5f9f1272191643ad1c09ade36b19da30a2f596c859150fb9d6
 MD5 d0bfbc1a3a1a00515f030885fb8699a5 emacs-cvs-23.0.50.ebuild 7712
 RMD160 f22e76910dc8106ed6b2d4334784fe2f0885a481 emacs-cvs-23.0.50.ebuild 7712
@@ -43,10 +47,10 @@ EBUILD emacs-cvs-23.0.60.ebuild 7915 RMD160 dfd6d4da8e936dc143e1cd8874a15dd47c9f
 MD5 1552c7b9f466c9bbfea5b6435ac8b1e2 emacs-cvs-23.0.60.ebuild 7915
 RMD160 dfd6d4da8e936dc143e1cd8874a15dd47c9fb279 emacs-cvs-23.0.60.ebuild 7915
 SHA256 bb9621b7753be736f09549cc83f77cc221bf83f699c1552cec2a755cd1f4d413 emacs-cvs-23.0.60.ebuild 7915
-MISC ChangeLog 31512 RMD160 e1adbfaa9eb4ca153c0fe1589b1b59fbfa72e874 SHA1 9b19f43f6a95daf63fa0ea4802e50d5af10ae510 SHA256 ee2b4b75e225b9ab6e5ebb8c78b6cd94806bba9ef1c4cae1d9b328bda81d0a9e
-MD5 ca11fec1e9e42570a3923ed59ce1c163 ChangeLog 31512
-RMD160 e1adbfaa9eb4ca153c0fe1589b1b59fbfa72e874 ChangeLog 31512
-SHA256 ee2b4b75e225b9ab6e5ebb8c78b6cd94806bba9ef1c4cae1d9b328bda81d0a9e ChangeLog 31512
+MISC ChangeLog 31673 RMD160 48fb14e3e23fa1f6c39368faa3ab23c48565b2cd SHA1 09e8a947f43d2fc15999a3ff459d87038110ea76 SHA256 d5c2f23e484ce766729c6e7189fe782ac1b98a549893a5c5abcb397e10956f98
+MD5 301d81218b812ea79e03789f4eb2929d ChangeLog 31673
+RMD160 48fb14e3e23fa1f6c39368faa3ab23c48565b2cd ChangeLog 31673
+SHA256 d5c2f23e484ce766729c6e7189fe782ac1b98a549893a5c5abcb397e10956f98 ChangeLog 31673
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -69,7 +73,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHEAPQOeoy/oIi7uwRApFdAJ0fEIp+KfmAI61gePfoI6ebVS16+ACgm4E9
-7eQYI9Wrbj+abtI66I2Nd5g=
-=aXIk
+iD8DBQFHETcXOeoy/oIi7uwRAoKSAKDVOlV8s8CrN+5zQn5RhMHP7ocDPwCgmnMz
+gM0h87bit/Gi28aSnPOZWRo=
+=kkfj
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild
index 597cd214ce24..7be6aaeff1d8 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild,v 1.2 2007/10/12 16:42:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild,v 1.3 2007/10/13 21:22:15 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -71,6 +71,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
 	epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
 	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
+	epatch "${FILESDIR}/${PN}-no-x-compile.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch b/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch
new file mode 100644
index 000000000000..941cb3e9adeb
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch
@@ -0,0 +1,14 @@
+--- emacs-orig/src/dispextern.h	2007-09-13 10:50:51.000000000 +0000
++++ emacs/src/dispextern.h	2007-10-12 21:57:44.000000000 +0000
+@@ -853,9 +853,11 @@
+   /* Continuation lines width at the start of the row.  */
+   int continuation_lines_width;
+ 
++#ifdef HAVE_WINDOW_SYSTEM
+   /* Non-NULL means the current clipping area.  This is temporarily
+      set while exposing a region.  Coordinates are frame-relative.  */
+   XRectangle *clip;
++#endif
+ };
+ 
+