Fix layout problem with ddd, bug 303887. Add prefix keywords.

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

5 files changed, 49 insertions, 9 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 91d8667c7cd3..bb1132846585 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.226 2010/02/06 15:47:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.227 2010/02/11 10:22:56 ulm Exp $
+
+*openmotif-2.3.2-r2 (11 Feb 2010)
+
+  11 Feb 2010; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.3.2-r1.ebuild,
+  +openmotif-2.3.2-r2.ebuild, +files/openmotif-2.3.2-ddd-layout.patch,
+  +files/openmotif-2.3.2-solaris-2.11.patch:
+  Fix layout problem with ddd, bug 303887. Some fixes for Solaris 2.11, from
+  prefix overlay. Add keywords for prefix architectures.
 
 *openmotif-2.3.2-r1 (06 Feb 2010)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 73186dd1b7b6..22f11e35ab23 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 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
+AUX openmotif-2.3.2-ddd-layout.patch 274 RMD160 a99f67abb3722b993cc0ef5277dc5f39aacc7bed SHA1 58f93f5b8b376de628f6d406af9a94662b489000 SHA256 f3de455ff830de4cb08a5cc8ee0bba10bb730bbc8ab448749ce99b98329e13e0
 AUX openmotif-2.3.2-ldflags.patch 654 RMD160 8756d40e95f64a851838042f9cf2152a1b6e9f61 SHA1 f0f9958a259487b0ef6c9d0d9daf8ab2415faa1d SHA256 70236c905c93a50354d990fdb500ba32b94bb28b90ccf8b4ca5052d4ac23ca80
 AUX openmotif-2.3.2-sanitise-paths.patch 734 RMD160 de091a0b8d232fc4507c9fc3b3805dd386a9a4c0 SHA1 49e5be643bbd5ee180525ef76458986d555bb038 SHA256 dfdbe238d4009588ee8d3a0a1f8eacf1fffabff746504393a3da87a643c7c086
+AUX openmotif-2.3.2-solaris-2.11.patch 409 RMD160 78e04d1ea6985b663423058754b6d05fdacdf88d SHA1 dc19563eada1094f921d69d0415cdf643697e0a5 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
-EBUILD openmotif-2.3.2-r1.ebuild 4859 RMD160 a3829ae82ca1192dad1ec721e955ebb7dc0350e1 SHA1 1b5fa7b52e90f4d76b7c658ef13027d48bfa278c SHA256 c27f16ad8cbbc76eefe1d18c4231460c2026c60a0da361dda22c4ca628200524
+EBUILD openmotif-2.3.2-r2.ebuild 5209 RMD160 d1cfdda957109e812d41f01138100a8c001719a0 SHA1 1d1c0b721bad029b70300bf5000dccf71926158e SHA256 dfadba2158afeefc8f8e3c559594767116d6a9a9774163fec3aedaab8ebce3d0
 EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e
-MISC ChangeLog 34122 RMD160 391b91b4303d6e4f93ec432409839b4184ed419e SHA1 105da446013143ed1bf41fd5f63bbcf338155691 SHA256 a8fd9596be71e1386c95c630936838cb77942b04c15f9a75f2ed419c8aa194e9
+MISC ChangeLog 34483 RMD160 a1b20513accb663a1436e21c0e94afead772cd6f SHA1 84cfeb411647cf86178007282f3c8217b1e5cdbc SHA256 14cb672f9fcfcafced7e6e0c3d34931395175ac542884d5e486f5fd7c9578ffa
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkttkB4ACgkQOeoy/oIi7uz8BgCfSOmc3y2hVr/zf9XMV4jKLpjL
-RbcAoIy1azxS4i9dAHepG/vq+jC4SCQD
-=mixx
+iEYEARECAAYFAktz2poACgkQOeoy/oIi7uyDxwCfR/x2GzZcvl1VEKsIt93W3PSQ
+DlEAn3VtFbIf9GHxG8zUGcotMM6BxA4X
+=wvbR
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.2-ddd-layout.patch b/x11-libs/openmotif/files/openmotif-2.3.2-ddd-layout.patch
new file mode 100644
index 000000000000..6b0cc7ecdc0e
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.2-ddd-layout.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/303887
+
+--- openmotif-2.3.2-orig/lib/Xm/PanedW.c
++++ openmotif-2.3.2/lib/Xm/PanedW.c
+@@ -60,7 +60,7 @@
+ #include "MessagesI.h"
+ #include "RepTypeI.h"
+ 
+-#define FIX_1476
++/*#define FIX_1476*/
+ 
+ typedef enum {FirstPane='U', LastPane='L'} Direction;
+ 
diff --git a/x11-libs/openmotif/files/openmotif-2.3.2-solaris-2.11.patch b/x11-libs/openmotif/files/openmotif-2.3.2-solaris-2.11.patch
new file mode 100644
index 000000000000..a36d4ab6e6cf
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.2-solaris-2.11.patch
@@ -0,0 +1,11 @@
+--- lib/Xm/Xmos_r.h
++++ lib/Xm/Xmos_r.h
+@@ -602,7 +602,7 @@
+ # endif
+ } _Xreaddirparams;
+ 
+-# if defined(AIXV3) || defined(AIXV4) || defined(_POSIX_THREAD_SAFE_FUNCTIONS)
++# if defined(AIXV3) || defined(AIXV4) || defined(sun) || defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+ /* AIX defines the draft POSIX symbol, but uses the final API. */
+ /* POSIX final API, returns (int)0 on success. */
+ #  if defined(__osf__)
diff --git a/x11-libs/openmotif/openmotif-2.3.2-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index c89ea72cd31d..fc4a3bc88cd2 100644
--- a/x11-libs/openmotif/openmotif-2.3.2-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r1.ebuild,v 1.2 2010/02/06 15:51:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.1 2010/02/11 10:22:56 ulm Exp $
 
 EAPI=3
 
@@ -13,9 +13,9 @@ SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz"
 
 LICENSE="MOTIF MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples jpeg png unicode xft"
-# License allows usage only on "open source operating systems"
+# license allows usage only on "open source operating systems"
 RESTRICT="!kernel_linux? (
 	!kernel_FreeBSD? (
 	!kernel_Darwin? (
@@ -85,7 +85,10 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.3.1-multilist-stipple.patch" #215984
 	epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081
 	epatch "${FILESDIR}/${P}-ldflags.patch" #293573
+	epatch "${FILESDIR}/${P}-ddd-layout.patch" #303887
 	epatch "${FILESDIR}/${P}-sanitise-paths.patch"
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& epatch "${FILESDIR}/${P}-solaris-2.11.patch"
 
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
@@ -109,6 +112,9 @@ src_configure() {
 	# feel free to fix properly if you care
 	append-flags -fno-strict-aliasing
 
+	# For Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] && append-flags -DNEED_XOS_R_H=1
+
 	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
 		# libiconv detection in configure script doesn't always work
 		# http://bugs.motifzone.net/show_bug.cgi?id=1423