Properly check for Xaw3d in configure; thanks to Philantrop for pointing this out.

Package-Manager: portage-2.1.3_rc6

3 files changed, 167 insertions, 88 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3a93c3446353..e51483380f66 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.169 2007/06/25 07:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.170 2007/07/01 16:09:44 ulm Exp $
+
+  01 Jul 2007; Ulrich Mueller <ulm@gentoo.org>
+  files/emacs-22.1-Xaw3d-headers.patch:
+  Properly check for Xaw3d in configure; patch backported from CVS trunk.
+  Thanks to Philantrop for pointing this out.
 
   25 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -files/emacs-21.2-sh.patch,
   -files/emacs-21.3-amd64.patch, -files/emacs-21.3-hppa.patch,
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 138cb3405e8c..34734ba4c45f 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,10 +9,10 @@ AUX emacs-21.desktop 238 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc SHA1 92
 MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc files/emacs-21.desktop 238
 SHA256 3d40581e18f1f633d0f1c822b00a8d2fb2de8ea95660fe0815ac837616f6db58 files/emacs-21.desktop 238
-AUX emacs-22.1-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
-MD5 2f28d7e33295c25205c50466d3deac65 files/emacs-22.1-Xaw3d-headers.patch 2045
-RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 files/emacs-22.1-Xaw3d-headers.patch 2045
-SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c files/emacs-22.1-Xaw3d-headers.patch 2045
+AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
+MD5 8a440640bcaf8056c90863ec16dd1c93 files/emacs-22.1-Xaw3d-headers.patch 4736
+RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 files/emacs-22.1-Xaw3d-headers.patch 4736
+SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea files/emacs-22.1-Xaw3d-headers.patch 4736
 AUX emacs-22.1-disable_alsa_detection.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
 MD5 4d8a875faa61af1fa4d5fd31d85ad5d5 files/emacs-22.1-disable_alsa_detection.patch 1573
 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b files/emacs-22.1-disable_alsa_detection.patch 1573
@@ -56,10 +56,10 @@ EBUILD emacs-22.1.ebuild 7245 RMD160 3aaf13665152aa188e75bbe1092438780bcfab3e SH
 MD5 2adb797bc23f916b56a068f998d09f7d emacs-22.1.ebuild 7245
 RMD160 3aaf13665152aa188e75bbe1092438780bcfab3e emacs-22.1.ebuild 7245
 SHA256 123e5b0ce781b6ff7d56593bb152c40ed3fb066a2563383d7221e602cdfa50e6 emacs-22.1.ebuild 7245
-MISC ChangeLog 25622 RMD160 700dc7a9a2bc858a0bbfeed5077a12f00ed06510 SHA1 5ded7326cc6c18d37d47e6c1a0dc4aac7bea964f SHA256 327223af555a7997a380f57d3e882bc58e2b95f717bf7b3b79e1032856776171
-MD5 c06236b461f31af828af8957d622b57d ChangeLog 25622
-RMD160 700dc7a9a2bc858a0bbfeed5077a12f00ed06510 ChangeLog 25622
-SHA256 327223af555a7997a380f57d3e882bc58e2b95f717bf7b3b79e1032856776171 ChangeLog 25622
+MISC ChangeLog 25830 RMD160 8fd8d26a4459a3005cfb7cb6e84e8bfddea36c1d SHA1 380ef954f28907b535901af12935e0ed44767303 SHA256 73f1aea590b68ec84aaba31fddac4191400133a16520fc27e3cb0ea036676b06
+MD5 46fd6e145fed76fe932d9825244ca3b3 ChangeLog 25830
+RMD160 8fd8d26a4459a3005cfb7cb6e84e8bfddea36c1d ChangeLog 25830
+SHA256 73f1aea590b68ec84aaba31fddac4191400133a16520fc27e3cb0ea036676b06 ChangeLog 25830
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -82,7 +82,7 @@ SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGf21KOeoy/oIi7uwRAmN0AJ0TC1UmeT9hGKnlWlx8SGICp71HagCgkzLy
-/kxPeFqjafI4KP9dcFaiS7o=
-=g+ir
+iD8DBQFGh9HPOeoy/oIi7uwRAq4pAJ0T2jCskLFm6ivet8UJD/zz6wYURQCeLEE3
+3Ef8oym/v+KLq3fDFYsmtaY=
+=RgB3
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
index 0e6be8910334..8b4f33271395 100644
--- a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
+++ b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
@@ -1,76 +1,150 @@
-*** 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>
-  
+--- emacs-22.1-orig/src/xfns.c	2007-06-02 06:00:11.000000000 +0200
++++ emacs-22.1/src/xfns.c	2007-07-01 17:19:35.000000000 +0200
+@@ -72,8 +72,13 @@
+ #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-22.1-orig/src/xmenu.c	2007-05-14 16:56:31.000000000 +0200
++++ emacs-22.1/src/xmenu.c	2007-07-01 17:19:35.000000000 +0200
+@@ -82,7 +82,11 @@
+ #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-22.1-orig/lwlib/lwlib.c	2007-04-20 15:27:29.000000000 +0200
++++ emacs-22.1/lwlib/lwlib.c	2007-07-01 17:19:35.000000000 +0200
+@@ -48,7 +48,11 @@
+ #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-22.1-orig/lwlib/lwlib-Xaw.c	2007-04-20 15:27:29.000000000 +0200
++++ emacs-22.1/lwlib/lwlib-Xaw.c	2007-07-01 17:19:35.000000000 +0200
+@@ -35,12 +35,21 @@
+ #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>
+ 
+--- emacs-22.1-orig/configure.in	2007-05-25 14:43:29.000000000 +0200
++++ emacs-22.1/configure.in	2007-07-01 17:19:35.000000000 +0200
+@@ -2205,29 +2205,45 @@
+ 
+ dnl Do not put whitespace before the #include statements below.
+ dnl Older compilers (eg sunos4 cc) choke on it.
++HAVE_XAW3D=no
+ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
+-  if test x"${HAVE_X11R5}" = xyes; then
+-    AC_MSG_CHECKING(X11 version 5 with Xaw)
+-    AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
++  if test x"${HAVE_X11R5}" != xyes; then
++    USE_X_TOOLKIT=none
++  else
++    AC_MSG_CHECKING(for xaw3d)
++    AC_CACHE_VAL(emacs_cv_xaw3d,
+     [AC_TRY_LINK([
+ #include <X11/Intrinsic.h>
+-#include <X11/Xaw/Simple.h>],
++#include <X11/Xaw3d/Simple.h>],
+       [],
+-      emacs_cv_x11_version_5_with_xaw=yes,
+-      emacs_cv_x11_version_5_with_xaw=no)])
+-    if test $emacs_cv_x11_version_5_with_xaw = yes; then
+-      AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
++      emacs_cv_xaw3d=yes,
++      emacs_cv_xaw3d=no)])
++    if test $emacs_cv_xaw3d = yes; then
++      AC_MSG_RESULT([yes; using Lucid toolkit])
+       USE_X_TOOLKIT=LUCID
++      HAVE_XAW3D=yes
++      AC_DEFINE(HAVE_XAW3D, 1,
++                [Define to 1 if you have the Xaw3d library (-lXaw3d).])
+     else
+-      if test x"${USE_X_TOOLKIT}" = xLUCID; then
++      AC_MSG_RESULT(no)
++      AC_MSG_CHECKING(for libXaw)
++      AC_CACHE_VAL(emacs_cv_xaw,
++      [AC_TRY_LINK([
++#include <X11/Intrinsic.h>
++#include <X11/Xaw/Simple.h>],
++        [],
++        emacs_cv_xaw=yes,
++        emacs_cv_xaw=no)])
++      if test $emacs_cv_xaw = yes; then
++        AC_MSG_RESULT([yes; using Lucid toolkit])
++        USE_X_TOOLKIT=LUCID
++      elif test x"${USE_X_TOOLKIT}" = xLUCID; then
+         AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
+       else
+-        AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
++        AC_MSG_RESULT([no; do not use toolkit by default])
+         USE_X_TOOLKIT=none
+       fi
+     fi
+-  else
+-    USE_X_TOOLKIT=none
+   fi
+ fi
+ 
+@@ -2315,21 +2331,6 @@
+   fi
+ fi
+ 
+-### Is -lXaw3d available?
+-HAVE_XAW3D=no
+-if test "${HAVE_X11}" = "yes"; then
+-  if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then
+-    dnl Fixme: determine what Scrollbar.h needs to avoid compilation
+-    dnl errors from the test without the `-'.
+-    AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h,
+-	[AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes)], , -)
+-    if test "${HAVE_XAW3D}" = "yes"; then
+-	AC_DEFINE(HAVE_XAW3D, 1,
+-		  [Define to 1 if you have the Xaw3d library (-lXaw3d).])
+-    fi
+-  fi
+-fi
+-
+ dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
+ dnl using Motif or Xaw3d is available, and unless
+ dnl --with-toolkit-scroll-bars=no was specified.