Fix "present but cannot be compiled" warning in configure, bug 82081.

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

5 files changed, 34 insertions, 15 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 93125a884240..4d27736a6e6d 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.211 2009/01/05 21:55:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.212 2009/02/04 21:04:38 ulm Exp $
+
+  04 Feb 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/openmotif-2.3.1-ac-editres.patch, openmotif-2.3.0-r3.ebuild,
+  openmotif-2.3.1.1.ebuild:
+  Fix "present but cannot be compiled" warning in configure, in order to
+  prepare for autoconf-2.64. Bug 82081 (see also tracker bug 257596).
 
   05 Jan 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
   drop local xft USE-flag description, as it's global now
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 664aa5d89bbc..510fe901089e 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -5,18 +5,19 @@ AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7a
 AUX openmotif-2.3.0-fix-nedit-segfaults.patch 926 RMD160 c6ddd15bee038509cc7e18098f209ac6c14f8e48 SHA1 c87b69cb24d3004bd146cd1e8645c72956fcfbdc SHA256 8aeb1daed4862393c7dc10df469d43e2a98154d18c7a0c3e65ca2750a412072c
 AUX openmotif-2.3.0-freebsd-libiconv.patch 744 RMD160 e01f49c108b1393cfa408f5ec452f18afe852503 SHA1 7ba83a4da347bfa1ce94340fdaa5675dd104d5bb SHA256 15065447d0670b64242b9673113ecc23e90d7b3a778a9c5ae5da2b48940c08d0
 AUX openmotif-2.3.0-sensitivity-invisible.patch 6503 RMD160 98ddb9cc9e8c84e28a2d8802f4a389f42f5f9715 SHA1 1da82de91d748b6eaf04fa9d320181b7a27138ff SHA256 d55d756548b6c8e7892f2d597cb8ac4dcd78d5164602d5878be314ed6d6cdcb3
+AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 DIST openmotif-2.3.1-1.tar.gz 5937284 RMD160 e03422204b6077fa6556894f194236d40e92e42b SHA1 3245375f4bd8e2d2eb02c2636d5491e834d8bb1a SHA256 1f831a1a2feb63af3167e54eacc12856d8a38b9caf6342f30daf901a414a986e
-EBUILD openmotif-2.3.0-r3.ebuild 4088 RMD160 43b3f3576e2febe253def1b3c0f344a36724d5de SHA1 ec15d89845471be1fa8a65afdd3467a493ef79d8 SHA256 2d5f3f1a304bf2c698040a3a379816c5c160800b8efb2c21d389d4980094af6c
-EBUILD openmotif-2.3.1.1.ebuild 4186 RMD160 ea7ad3bca45c8136d5ff943a6373a159e8ab137c SHA1 bf37acc6ad5e4df5f25fccabd787ae547a0e698d SHA256 7de784c0c82638cb17dd733c4efe28d83ff1e190486057e4cde0a68e3338beb6
-MISC ChangeLog 31952 RMD160 ef8b4829bfb2cb19dce47a5108642d76c4b4270c SHA1 8f5912554c4fca87438436c5286ac518092705bd SHA256 d130706514caa01a833e5e83b62ac519500b2a389fa9a01311dddcb51e8a59b6
+EBUILD openmotif-2.3.0-r3.ebuild 4146 RMD160 982cb5706c4181c36591a6f4e4819b16ea59933d SHA1 451eaa336ffa3d6cbc53301c7cf04c587b8fb018 SHA256 f9aa1d0a4d8f317bbab11b6c21800587ed9f037940f9ab9d47e84929f0002cb8
+EBUILD openmotif-2.3.1.1.ebuild 4186 RMD160 4676e5796c473d463d9a5628bb4b7c97e1e75777 SHA1 603ffd67e08d5d1c5ba1c93413786f7e0eea8d1e SHA256 9034efeb6edbd501703d8e598d4a543341a1bd69ee9b161963db1acec585844d
+MISC ChangeLog 32238 RMD160 2a76b743687be3acb41a4542a7f428bb54f41908 SHA1 f0179b6abc582586d37734f70f31a5f3fe9377a0 SHA256 6c1552d1a61efa7b64474303e4796f8b5c5b25195d76192048d9023980acc438
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkligc4ACgkQkKaRLQcq0GLMtgCgtX7bqgssG65EwJhzrXLwKQH3
-7I4Anih4BrRsk7Z3R5Oocx5hw3NSmF2g
-=B3iN
+iEYEARECAAYFAkmKAyQACgkQOeoy/oIi7uy1UwCbBEzSX9q46l0hRNJhT2BLXPgL
+CosAnRn5FjbvuhaDSeKdErNEOrsE3bxj
+=EV3J
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-ac-editres.patch b/x11-libs/openmotif/files/openmotif-2.3.1-ac-editres.patch
new file mode 100644
index 000000000000..ab32f41a66d8
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.1-ac-editres.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/82081
+
+--- openmotif-2.3.1-orig/configure.ac	2008-08-30 13:10:19.000000000 +0200
++++ openmotif-2.3.1/configure.ac	2009-02-04 19:28:02.000000000 +0100
+@@ -75,6 +75,7 @@
+ AC_CHECK_LIB(Xmu,XmuNCopyISOLatin1Lowered ,
+ AC_DEFINE(HAVE_XMU_N_COPY_ISO,1,Have XmuNCopyISOLatin1Lowered)
+ , , -lXt -lX11)
++,,[[#include <X11/Intrinsic.h>]]
+ )
+ 
+ 
diff --git a/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
index 6b43d7e828f6..b8b846538d5b 100644
--- a/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.10 2008/06/29 12:39:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.11 2009/02/04 21:04:38 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -62,6 +62,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-sensitivity-invisible.patch"
 	epatch "${FILESDIR}/${P}-fix-nedit-segfaults.patch"
 	epatch "${FILESDIR}/${P}-freebsd-libiconv.patch"
+	epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081
 
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
diff --git a/x11-libs/openmotif/openmotif-2.3.1.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
index 6112aa5fbd95..ed7929f09b20 100644
--- a/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.1.ebuild,v 1.7 2008/11/12 22:07:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.1.ebuild,v 1.8 2009/02/04 21:04:38 ulm Exp $
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -66,9 +66,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# display stippled multilist items correctly, bug 215984
-	epatch "${FILESDIR}/${MY_P}-multilist-stipple.patch"
+	epatch "${FILESDIR}/${MY_P}-multilist-stipple.patch" #215984
+	epatch "${FILESDIR}/${MY_P}-ac-editres.patch" #82081
 
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am