Upstream patch for proper including of Xaw3d headers; #174453.

(Portage version: 2.1.2.4)

5 files changed, 96 insertions, 15 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index b0433eef42f4..a4772c3b43e7 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.108 2007/04/18 16:13:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.109 2007/04/19 05:56:14 ulm Exp $
+
+  19 Apr 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-Xaw3d-headers.patch, emacs-cvs-22.0.98.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Upstream patch for proper including of Xaw3d headers; removed build-time
+  dependency on x11-libs/libXaw; bug #174453.
 
   18 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.98.ebuild,
   emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild:
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
index fb9952de82fd..fbd6aa5c74c2 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.98.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-22.0.98.ebuild,v 1.5 2007/04/18 16:13:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.6 2007/04/19 05:56:14 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -35,7 +35,6 @@ RDEPEND="sys-libs/ncurses
 		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
 
 DEPEND="${RDEPEND}
-	X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) )
 	gzip-el? ( app-arch/gzip )"
 
 PROVIDE="virtual/emacs virtual/editor"
@@ -61,9 +60,10 @@ src_unpack() {
 		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
 	fi
 
+	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
-	# automagic check
+	# 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.patch"
 
 	eautoreconf
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index 67782a16087a..84fbfc879a83 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.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-22.0.9999-r10.ebuild,v 1.5 2007/04/18 16:13:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.6 2007/04/19 05:56:14 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -41,7 +41,6 @@ RDEPEND="sys-libs/ncurses
 		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
 
 DEPEND="${RDEPEND}
-	X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) )
 	gzip-el? ( app-arch/gzip )"
 
 PROVIDE="virtual/emacs virtual/editor"
@@ -73,9 +72,10 @@ src_unpack() {
 		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
 	fi
 
+	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
-	# automagic check
+	# 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.patch"
 
 	eautoreconf
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index 2aed89b560af..19141a61b8c9 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.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-r6.ebuild,v 1.4 2007/04/18 16:13:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.5 2007/04/19 05:56:14 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -42,7 +42,6 @@ RDEPEND="sys-libs/ncurses
 		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
 
 DEPEND="${RDEPEND}
-	X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) )
 	gzip-el? ( app-arch/gzip )"
 
 PROVIDE="virtual/emacs virtual/editor"
@@ -74,9 +73,10 @@ src_unpack() {
 		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
 	fi
 
+	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
-	# automagic check
+	# 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.patch"
 
 	eautoreconf
@@ -191,8 +191,7 @@ EOF
 		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
 	fi
 
-	dodoc AUTHORS BUGS CONTRIBUTE MAINTAINERS README README.unicode \
-		|| die "dodoc failed"
+	dodoc AUTHORS BUGS CONTRIBUTE README README.unicode || die "dodoc failed"
 }
 
 emacs-infodir-rebuild() {
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch b/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch
new file mode 100644
index 000000000000..0e6be8910334
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch
@@ -0,0 +1,76 @@
+*** emacs/src/xfns.c.~1.681.~	2007-03-24 11:49:48.000000000 -0400
+--- emacs/src/xfns.c	2007-04-18 01:18:52.000000000 -0400
+***************
+*** 72,79 ****
+--- 72,84 ----
+  #include <X11/Shell.h>
+  
+  #ifndef USE_MOTIF
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #include <X11/Xaw3d/Label.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
+  #include <X11/Xaw/Label.h>
++ #endif /* HAVE_XAW3D */
+  #endif /* USE_MOTIF */
+  
+  #ifdef USG
+*** emacs/src/xmenu.c.~1.317.~	2007-01-20 23:18:14.000000000 -0500
+--- emacs/src/xmenu.c	2007-04-18 01:15:43.000000000 -0400
+***************
+*** 82,88 ****
+--- 82,92 ----
+  #include <X11/StringDefs.h>
+  #include <X11/Shell.h>
+  #ifdef USE_LUCID
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
++ #endif /* HAVE_XAW3D */
+  #endif /* USE_LUCID */
+  #include "../lwlib/lwlib.h"
+  #else /* not USE_X_TOOLKIT */
+*** emacs/lwlib/lwlib.c.~1.55.~	2007-02-27 23:25:05.000000000 -0500
+--- emacs/lwlib/lwlib.c	2007-04-18 01:21:44.000000000 -0400
+***************
+*** 48,54 ****
+--- 48,58 ----
+  #endif /* not USE_MOTIF && USE_LUCID */
+  #endif
+  #if defined (USE_XAW)
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
++ #endif /* HAVE_XAW3D */
+  #include "lwlib-Xaw.h"
+  #endif
+  
+*** emacs/lwlib/lwlib-Xaw.c.~1.25.~	2007-02-26 22:07:08.000000000 -0500
+--- emacs/lwlib/lwlib-Xaw.c	2007-04-18 01:22:33.000000000 -0400
+***************
+*** 35,46 ****
+--- 35,55 ----
+  #include <X11/CoreP.h>
+  #include <X11/Shell.h>
+  
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Scrollbar.h>
++ #include <X11/Xaw3d/Paned.h>
++ #include <X11/Xaw3d/Dialog.h>
++ #include <X11/Xaw3d/Form.h>
++ #include <X11/Xaw3d/Command.h>
++ #include <X11/Xaw3d/Label.h>
++ #else /* !HAVE_XAW3D */
+  #include <X11/Xaw/Scrollbar.h>
+  #include <X11/Xaw/Paned.h>
+  #include <X11/Xaw/Dialog.h>
+  #include <X11/Xaw/Form.h>
+  #include <X11/Xaw/Command.h>
+  #include <X11/Xaw/Label.h>
++ #endif /* HAVE_XAW3D */
+  
+  #include <X11/Xatom.h>
+