Quiet QA compilation warnings.

Package-Manager: portage-2.1.2.9

4 files changed, 49 insertions, 10 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index e14fcd9fbc54..867ef131c271 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.163 2007/06/04 15:05:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.164 2007/06/04 17:36:26 ulm Exp $
+
+  04 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-22.1-oldxmenu-qa.patch, emacs-22.1.ebuild:
+  Quiet QA compilation warnings, patch submitted and accepted upstream.
 
   04 Jun 2007; Brent Baude <ranger@gentoo.org> emacs-22.1.ebuild:
   Marking emacs-22.1 ppc ~ for bug#180642
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7077ba04f642..52c7e76c74da 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 60emacs-21.envd 34 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af SHA1 b67d26aecf206d799eeee8cea2649486a3e024f9 SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153
 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34
@@ -70,6 +73,10 @@ AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520
 MD5 33cdd958f1be433095a69bff6be18148 files/emacs-22.1-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-22.1-freebsd-sparc.patch 475
 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-22.1-freebsd-sparc.patch 475
+AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb637590 SHA1 10887f5e0ccebde6715307fdc59faa8f826dd597 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590
+MD5 56912f79ce93e75206cf10fdeb85bf49 files/emacs-22.1-oldxmenu-qa.patch 448
+RMD160 ac5b0e57569f0963862ded46953be899fb637590 files/emacs-22.1-oldxmenu-qa.patch 448
+SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590 files/emacs-22.1-oldxmenu-qa.patch 448
 AUX emacs-subdirs-el-gentoo.diff 1369 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf SHA1 8e1bf448e427efe51fcacad0f1b81cd7ea9c2ab1 SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
@@ -96,14 +103,14 @@ EBUILD emacs-21.4-r8.ebuild 5711 RMD160 249b044798438cf45407a262e3f751aea72a2796
 MD5 c26a6d9fbd64864d40dd82cffcde57f6 emacs-21.4-r8.ebuild 5711
 RMD160 249b044798438cf45407a262e3f751aea72a2796 emacs-21.4-r8.ebuild 5711
 SHA256 591014e674fe57645affe5ada46d06ac3ec937fb1862a7ee75e59c015a37e6bc emacs-21.4-r8.ebuild 5711
-EBUILD emacs-22.1.ebuild 7371 RMD160 2df643e270e8e99596847116e118b2d374c47bfc SHA1 f800c22c640e38ffaa42a9699d92401f080e66f7 SHA256 97fd57add904ea0fc16766beef85238bc7c8e4ecf5b419bfc396c054da92000a
-MD5 0a040dc1c1e5ffe0007a3f7fe2017f87 emacs-22.1.ebuild 7371
-RMD160 2df643e270e8e99596847116e118b2d374c47bfc emacs-22.1.ebuild 7371
-SHA256 97fd57add904ea0fc16766beef85238bc7c8e4ecf5b419bfc396c054da92000a emacs-22.1.ebuild 7371
-MISC ChangeLog 24365 RMD160 f83ad897aae1dda066941e053baa5885c879d7c7 SHA1 d2eff1a776a9ec9ef2e16172bf1689b59adf5b52 SHA256 16a97935ca994a4b6ab6901f03eb650cdb75242524e9f378fe6ccd30e1567ca9
-MD5 6a0d6837069b60d2ff6df77426ed1e81 ChangeLog 24365
-RMD160 f83ad897aae1dda066941e053baa5885c879d7c7 ChangeLog 24365
-SHA256 16a97935ca994a4b6ab6901f03eb650cdb75242524e9f378fe6ccd30e1567ca9 ChangeLog 24365
+EBUILD emacs-22.1.ebuild 7413 RMD160 b41fc176ac57b78975c8b26df1057733192ac31f SHA1 1476e9d0a1cc6c48674908e149f88e94c17b7efb SHA256 1d134507d30c7417e693c3a9e6bea7918129fcb3d57a9b4bee84f7741b7ccfa6
+MD5 ac4e983936114a100d38362479ac0ff0 emacs-22.1.ebuild 7413
+RMD160 b41fc176ac57b78975c8b26df1057733192ac31f emacs-22.1.ebuild 7413
+SHA256 1d134507d30c7417e693c3a9e6bea7918129fcb3d57a9b4bee84f7741b7ccfa6 emacs-22.1.ebuild 7413
+MISC ChangeLog 24540 RMD160 3eb55be43b6cc75c5e9575c1b2f5038c6a96ddba SHA1 d35ddd557aeadbdcdb3ac52b2937bd44cbf6d6af SHA256 85f42f2caf603787104e5a1b5c239dbe7f700094acbc4dccde2baa54cd7de663
+MD5 f366fe4ed3164cd4bd85d42016002915 ChangeLog 24540
+RMD160 3eb55be43b6cc75c5e9575c1b2f5038c6a96ddba ChangeLog 24540
+SHA256 85f42f2caf603787104e5a1b5c239dbe7f700094acbc4dccde2baa54cd7de663 ChangeLog 24540
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -123,3 +130,10 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1 238
 RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1 238
 SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGZE2jOeoy/oIi7uwRApHpAJ9QvCJNdAEHKYtl8MnlJ0QBq7kfvQCfRITp
+BB7ujJ5lRi5FNbb2492+B5c=
+=btfe
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.1.ebuild b/app-editors/emacs/emacs-22.1.ebuild
index 83530c5b656e..f97d737c0cc2 100644
--- a/app-editors/emacs/emacs-22.1.ebuild
+++ b/app-editors/emacs/emacs-22.1.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/emacs-22.1.ebuild,v 1.5 2007/06/04 15:05:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1.ebuild,v 1.6 2007/06/04 17:36:26 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -72,6 +72,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
diff --git a/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch b/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch
new file mode 100644
index 000000000000..4c962c1527a3
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch
@@ -0,0 +1,20 @@
+--- emacs-22.1-orig/oldXMenu/ChgPane.c	2007-02-27 04:04:22.000000000 +0100
++++ emacs-22.1/oldXMenu/ChgPane.c	2007-06-04 00:47:56.000000000 +0200
+@@ -13,6 +13,7 @@
+  *
+  */
+ 
++#include <config.h>
+ #include "XMenuInt.h"
+ 
+ int
+--- emacs-22.1-orig/oldXMenu/ChgSel.c	2007-02-27 04:04:22.000000000 +0100
++++ emacs-22.1/oldXMenu/ChgSel.c	2007-06-04 00:47:42.000000000 +0200
+@@ -13,6 +13,7 @@
+  *
+  */
+ 
++#include <config.h>
+ #include "XMenuInt.h"
+ 
+ int