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

(Portage version: 2.2_rc62/cvs/Linux i686)

4 files changed, 42 insertions, 4 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/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