Enable multilib. Fix parallel build failure. Bindings files moved from /usr/lib to /usr/share. New motif22-compatibility USE flag.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

7 files changed, 265 insertions, 16 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 8514ba2d0600..40863c2b6235 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/motif
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.10 2013/01/02 00:05:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.11 2013/03/15 19:16:34 ulm Exp $
+
+*motif-2.3.4-r1 (15 Mar 2013)
+*motif-2.2.3-r12 (15 Mar 2013)
+
+  15 Mar 2013; Ulrich Müller <ulm@gentoo.org> +motif-2.2.3-r12.ebuild,
+  +motif-2.3.4-r1.ebuild, +files/motif-2.3.4-install-dirs.patch,
+  +files/motif-2.3.4-parallel-make.patch, metadata.xml:
+  Enable multilib. Fix parallel build failure. Bindings files moved from
+  /usr/lib to /usr/share. New motif22-compatibility USE flag.
 
   02 Jan 2013; Ulrich Müller <ulm@gentoo.org> -files/motif-2.3.2-darwin.patch,
   -files/motif-2.3.2-libpng14.patch, -motif-2.3.3-r1.ebuild,
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index adf6731a2311..e68cff558188 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -4,28 +4,29 @@ Hash: SHA256
 AUX Mwm.defaults 536 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab WHIRLPOOL dbef57a2fb37b93f38993aa4ca04b082a4e8fbde3142867c11c4acd2e7a53ffdb65ef299d8f96cc06eb6572aa29ae8e6db8f3f9499aa46669f199f9f35023db1
 AUX motif-2.3.2-sanitise-paths.patch 734 SHA256 dfdbe238d4009588ee8d3a0a1f8eacf1fffabff746504393a3da87a643c7c086 SHA512 336b02bf89ac049ba01552b191dc3611c060b63217387acc0be0774a2351e1ba9cf094be913d6081aba5f096d39cd4c21c9545fba5452815812f54bdb645d5be WHIRLPOOL 224f4da595f8240ae2a2c7f5e3281dee5272c3b5101c7c650b04e6768d8d1b2355969581461442918bed900fdcba659cdd23ff78b7985a982c779675646c9a93
 AUX motif-2.3.2-solaris-2.11.patch 409 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7 SHA512 f9b318b62f9c64409c1867f037eb9d52f0b56c538f16b046b1808a14fbc47aa27ae234402df43e03c4cd209df2dd58a7072d969f20717f97de0c662cc72db526 WHIRLPOOL 309800a01dd44ecbc6bed7ac519ec4c9f0add5451dccdd2130e8c1204a9ae4e76b65b01ed9e03d7335155ff3fe3840f875de69536fd03928392574d2a08944db
+AUX motif-2.3.4-install-dirs.patch 394 SHA256 70d14182d1f5695f9f4b7e49fa521dfd87d0f61e396006554feee0cde7a0cf31 SHA512 ecc8c02cf8636a35399e69d8f44949cd9072689d4d4d9973d9979866a3694a6c3f91e7e33b793cd816f20ced06702b2d66dcf54024c09c37f43bb2ccb1010ad2 WHIRLPOOL db5744ecc6a6d554042a1dfda2966ff0e5334dbc20752155a29ec9e7b744128440ac96c4873b10a6bd412180d87c9a17c47e716b967aacc428f855aa3e42d7e2
+AUX motif-2.3.4-parallel-make.patch 792 SHA256 045b1003a819db5ba7cf9e2658cf50ea133c24fc3b89acca676bf59177f54006 SHA512 6e6550a76e15cdca6a4374ed4a1ec941c4438e88e4cd147ebe11fdff5765bebbb242f9981b8602807faf15d8a3f7ce8507517809cf37cc81bf89a6f0fd2e9d8c WHIRLPOOL 9d60ca2a53162198b9044d5acde9d3801d14c4ae20f205c77b316869182bd647c63e0433e58aeba5add87a42fbb0233d8d3f195b5d856d6e9983e938e115081a
 AUX motif-2.3.4-solaris.patch 541 SHA256 b9b6b9eb830d950214b2826d08e946440950593cbd881f9c0e8e68800ba74ec9 SHA512 aab5062aad07007241f8e5f37f73b5a6b68bea8811a0946895bb583435f09b6549657501bc61bd458bdae77c2d245e45b2544675aa41197d9f473711279b6641 WHIRLPOOL 153ca01765883e13f21dce0131db5981a2175752b0388503a4e72273999bd7f86ee87b9562d3f76c6df5e28783a9c67df2894f7edc4df2152d17b168161ff842
 DIST motif-2.3.4-src.tgz 9527040 SHA256 637efa09608e0b8f93465dbeb7c92e58ebb14c4bc1b488040eb79a65af3efbe0 SHA512 fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b31219230998eb93deae22a8fa698e816b1a30e52b3ae88ae1c01c1f0aac59a2af2 WHIRLPOOL 9e4447fb1ac09a41cd6c61af52584f42fee3d026874bc15e258bc79f239f95a21bb3fe79ed7df08d86aaac370a669ec83cacc9eadb11320fbad6df6c27715d95
 DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
 DIST openmotif-2.2.3-patches-4.tar.bz2 20601 SHA256 424bc4216db5f13bbe92dade35eb14dddc781a5598508539920595590169b449 SHA512 48490c4d031cdf1930035ad288ad85228168a9589db4f6660f2b6ccbca7e7c01d0bdf1c0e3583d3a83f0ae6b9f3dec7eb91bc0cf2e38a0f9fd35c9301c0a3428 WHIRLPOOL b3398492c05c01615ba751e6c04825415c4a168a3ab5144c35e8e110f53b8ccd96bf0568890184f8b4e54278cc0bbdf57a1d231f36a4a26b8f4179cfeeecc9df
 EBUILD motif-2.2.3-r11.ebuild 1649 SHA256 ab7c1ba8b77bfa9bd88793aa4a87ffdabda86670d03b7b800914ea4fa8ae0051 SHA512 129297b11c977ee879a34aafc5a22bdd05f0dfab18f50192d7116b1d550c92d7901ac2872d4f418f8bd3cf55da5b5ccda68aae7651e1e009e2602a459888e1f4 WHIRLPOOL e751d5ea8ae0ed54437c73ce81da716ca683994e5efa1dcda06689f905e73a7f9d3c483a0bcb2697938b023f5b8049f683a11990f83b58993877b0a73ac29785
+EBUILD motif-2.2.3-r12.ebuild 1835 SHA256 c83cc6d3cf1ef2246727c71fc124fed47282a7571a387dd0c74f5e89828c45b3 SHA512 a3b97d3c1f5bd2a0d50e93155db5268ba96437cf49f4b6505c8b2eb3dc3f92e438cfb302c66556bceaa1c03802056b3ece515d2cfb0850cc3d96e5e1f329e468 WHIRLPOOL 361a472d6e69d066b668f62dd8ca6a406810bbc5d69b8f5ac2dc5cd1acdf84b84757aa00fc25c19881c8ee1b48a67c72f72674954c651d7dfffaa3cc6bf3b086
+EBUILD motif-2.3.4-r1.ebuild 3762 SHA256 a37f137d319fbad36f7a83b05af82e1a09730613c7773597198f9a135648a8c1 SHA512 f327a29f4033726e5aac04fa3ae111cbda61d2f390d268959467033083ddcbfa280104d879c1c26d74c120c0fc1bd262f1da37558e31dd4db700d4a6021ad13f WHIRLPOOL 784f8fe5379d9423a4b40eb0f918d0776e9bf9cc61fc7572680fe0500672bc1464249d03f8817398c9fcc4cfbfb6d2b697fafc8c841296f662c0d413655477fa
 EBUILD motif-2.3.4.ebuild 2860 SHA256 63f24e3347816d44cd0c30e3bf10c37c001479635010adb2a134273a83bd1327 SHA512 6079667eea1d14a60a4d9f6cf77d7507c3cec68af48e58dcbf47a7703e09260680ea4b96e3dcfdced16f32d3005fd4433c5ddf0b447594a6ba3765582b84424b WHIRLPOOL 3eb8192bab18f95d5d9e5d567f0e163159d161368e53f22f06821b72d9eb4626137a9d463e2260229336c1ef450e27cb71a9c716c68e0cc07c33ddadfb18ac12
-MISC ChangeLog 42697 SHA256 771fbdf04284135a207ed870e7f68ece1f28febb7727d51a68cf4140408e4347 SHA512 54040c2b0626211883359396eadd79d77b264fda18f3415400fa7f6cdbc6b1e1555b12e504e3f508729a5644337631e5fd2ae3c096a253e83b195d89485708cb WHIRLPOOL 7a34b1a57b2e9d8885532ddd520d7687fcaa84c2198e0033d171e8d3e9f45c125b321c779548d0be0e23eeab44a2e318ce3bccf48d175c3bd2b64f0d7408ce53
-MISC metadata.xml 198 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481 SHA512 5607a8c66738198e21639247c46f41240819c2e0894855a05543e88edd7bac8ef5c5e2f3ca762f9c9bcf85f033235f013d8b40406acda50c1857c4ad51945c40 WHIRLPOOL 60b0c8b7be2ee31dc62d3668b6347266085a756f3f565cb3a962a91877afc1f6beaff21a36b7a2d4de1a4eb5798a9baa1533e2a9495b1552517036d733308873
+MISC ChangeLog 43088 SHA256 93a99864505115eb0cc6bf85431baeafb333ac18a265b75f3814d18302bcdf0f SHA512 4c3940b7c7b6c2f2e8809cee6b027fcbba05691cb817db2b4f42dcbe1a48f587a82bf97351b630a7bb1cc1687b5ae5e87a618b26dce0ad6837513dadd03f1543 WHIRLPOOL baa0fcbff9e42a55414d6d4cc632895711c235ad068d21c4281bc6a1d072a7ac01925f2a3830463ecaa2d1f6d71782a93aebf0c61455ca3f85deb9108de536f5
+MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ43pJAAoJEDxpGckxwJCB7FAP/RIuopgCgh3G0tLFknwzGfyB
-khGh0YxmhmK2xYPJ2bu5XQ4H8+5cOOPsAGcOq9MTY+N7vNXhQyHGxQK+KBONlbqX
-/NthvtQ1p79Bqh2Qw5CX+9L6Ybp0JQxWZdbW797WgAzBlBKZ9mLnXUoFzAYYaKT1
-LDWWeYq034vqr1PODi9VTDbaVW2RYsR86DcerpOMSkotB45QzsMv3z8+d44uIMbX
-C95JigiOi4yM12o84lLuD3teL5mabSV7Ye2fMNmO7iLM53qLWI6DFTpsacAFawpl
-KHuZXz+frr2ekrrbF+LIOoFBJDpGX1Y+MGt2Fi9oj6o8O5ZdrpVCIUTlw4COiuu2
-iq/dSfZ+JoDRxl3iUBG71/t+9atnmmPcEDH153ljaKreNF2t2oZDmt1PGCJh6gXJ
-Gu3BIamt6guBegueUm36ooM3rIxmyaS772sX9MMJHBbWQFynrEAhYJ1of/uhNkZm
-ZxjFbQHEfOTe5xdNeVK3MqkAccDfwVv40z6HhPtFAwl8SRCAJd3wxkLE8Zkn6WGq
-KPCd4yUjtwyHx5dojbqIsONt+cl2XHC8xORKc/SHGftVqT0MC9g/kGiCMZka8wxB
-AoRbgJJUopeMZJ0BOcoiC/FgNar01Tuzoa9E8Aw+X35FT9LReNyYsVxnKAfqSrhu
-+IcWc6BonMw8C0UPu6HU
-=dxZ0
+iQGcBAEBCAAGBQJRQ3OcAAoJEJQzkH1pP7W4LswL/3PMC+E87P9m8FpI7cgjvjMG
+R9KLybhT+w+piWAONyA2utdnaKScisnFaDwwSiQdAy6JA9ark2JawlKe1bB+HtvF
+C8rxkwfE++ltW0VzFsa6H3ST7X5luCa6bY+zrC1jJtOkLpjtZl18SDfxumpHmF5/
+grRQHw0RVR/SctSoTdWsuUOk6ZDJQryWFIG1289m5k8OjoX6mafcbuAPG7lvQ0GH
+rMyO0PTh+SjvTGvTE96mDqoBasyQG379lthqksShH9F2IrLeWcnZWt5GOFUWW6K/
+gjTtG3TBkxQxkRwk+naVWffmEWTDEbRj7TkRBUr0rc5x+PPj5YQajCwsLDuliI5s
+bMCGFSVjbs7vhEkw2QxIz9xW3ML1vYJT9mAv9QnBA5G9+YUbY7BsT8MU1FTxTBF/
+Kv1aIY39iIPYDU5EIHz63mTNuB0D4PxXCHrTNIbZM9JSpMO+v3Yqq69rSrL48Yrh
+qFDsadpKrZjO+RBWEVIXoy/iO9l4qIfo/aLC6ny2/Q==
+=xDg1
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/files/motif-2.3.4-install-dirs.patch b/x11-libs/motif/files/motif-2.3.4-install-dirs.patch
new file mode 100644
index 000000000000..8b525aaccf20
--- /dev/null
+++ b/x11-libs/motif/files/motif-2.3.4-install-dirs.patch
@@ -0,0 +1,18 @@
+--- motif-2.3.4-orig/configure.ac
++++ motif-2.3.4/configure.ac
+@@ -179,13 +179,13 @@
+ LIBDIR="${libdir}/X11"
+ AC_SUBST(LIBDIR)
+ 
+-MWMRCDIR="${libdir}/X11"
++MWMRCDIR="${sysconfdir}/X11/mwm"
+ AC_SUBST(MWMRCDIR)
+ 
+ INCDIR="${includedir}/X11"
+ AC_SUBST(INCDIR)
+ 
+-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
++XMBINDDIR_FALLBACK="${datadir}/X11/bindings"
+ AC_SUBST(XMBINDDIR_FALLBACK)
+ 
+ RM="rm -f"
diff --git a/x11-libs/motif/files/motif-2.3.4-parallel-make.patch b/x11-libs/motif/files/motif-2.3.4-parallel-make.patch
new file mode 100644
index 000000000000..c8733e9f6ae1
--- /dev/null
+++ b/x11-libs/motif/files/motif-2.3.4-parallel-make.patch
@@ -0,0 +1,15 @@
+http://bugs.motifzone.net/show_bug.cgi?id=1592
+
+--- motif-2.3.4-orig/lib/Xm/Makefile.am
++++ motif-2.3.4/lib/Xm/Makefile.am
+@@ -283,7 +283,9 @@
+ $(top_builddir)/config/util/makestrs:
+ 	( cd $(top_builddir)/config/util && $(MAKE) $(AM_MAKEFLAGS) makestrs )
+ 
+-$(STRING_FILES): Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs
++XmStrDefs.h XmStrDefs22.h XmStrDefs23.h XmStrDefsI.h: XmStrDefs.c
++
++XmStrDefs.c: Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs
+ 	test -f $(XMSTRING_LIST) || $(LN_S) $(srcdir)/$(XMSTRING_LIST) $(XMSTRING_LIST)
+ 	test -f XmStrDefs.ht || $(LN_S) $(srcdir)/XmStrDefs.ht XmStrDefs.ht
+ 	test -f XmStrDefs22.ht || $(LN_S) $(srcdir)/XmStrDefs22.ht XmStrDefs22.ht
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
index e153d85b2356..ad024ed0a1ac 100644
--- a/x11-libs/motif/metadata.xml
+++ b/x11-libs/motif/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer>
   <email>ulm@gentoo.org</email>
 </maintainer>
+<use>
+  <flag name='motif22-compatibility'>Compatibility with Open Motif 2.2</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
new file mode 100644
index 000000000000..55a00c7e639f
--- /dev/null
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.1 2013/03/15 19:16:34 ulm Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal
+
+MY_P=openMotif-${PV}
+DESCRIPTION="Legacy Open Motif libraries for old binaries"
+HOMEPAGE="http://motif.ics.com/"
+SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
+	mirror://gentoo/openmotif-${PV}-patches-4.tar.bz2"
+
+LICENSE="MOTIF MIT"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libXmu[${MULTILIB_USEDEP}]
+	x11-libs/libXp[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		amd64? ( app-emulation/emul-linux-x86-baselibs )
+		!app-emulation/emul-linux-x86-motif
+	)"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXaw
+	x11-misc/xbitmaps"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	epatch_user
+
+	# This replaces deprecated, obsoleted and now invalid AC_DEFINE
+	# with their proper alternatives.
+	sed -i -e 's:AC_DEFINE(\([^)]*\)):AC_DEFINE(\1, [], [\1]):g' \
+		configure.in acinclude.m4
+
+	# Build only the libraries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
+
+	AM_OPTS="--force-missing" eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --with-x --disable-static
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install-exec
+}
+
+multilib_src_install_all() {
+	# cleanups
+	rm -Rf "${D}"/usr/bin
+	rm -f "${D}"/usr/lib*/*.{so,la,a}
+
+	dodoc README RELEASE RELNOTES BUGREPORT TODO
+}
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..b79caaf693f7
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.1 2013/03/15 19:16:34 ulm Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="http://sourceforge.net/projects/motif/
+	http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND="x11-libs/libXmu[${MULTILIB_USEDEP}]
+	x11-libs/libXp[${MULTILIB_USEDEP}]
+	unicode? ( virtual/libiconv )
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg )
+	png? ( >=media-libs/libpng-1.4 )
+	abi_x86_32? (
+		amd64? ( app-emulation/emul-linux-x86-baselibs )
+		!app-emulation/emul-linux-x86-motif
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
+	x11-misc/xbitmaps"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-solaris.patch"
+	epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-install-dirs.patch"
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch"
+
+	epatch_user
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# 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
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+src_compile() {
+	local native_dir
+
+	# Motif has build-time tools in the tools/wml subdirectory that
+	# cannot be built for other ABIs because of missing external libs.
+	# So we build the native ABI first, and then replace the tools
+	# directory in other ABIs by the native one.
+
+	my_best_abi_compile() {
+		native_dir="${BUILD_DIR}"
+		emake -C "${BUILD_DIR}"
+	}
+	multilib_for_best_abi my_best_abi_compile
+
+	my_other_abi_compile() {
+		[[ ${BUILD_DIR} = "${native_dir}" ]] && return
+		rm -rf "${BUILD_DIR}"/tools
+		ln -s "${native_dir}"/tools "${BUILD_DIR}"/ || die
+		emake -C "${BUILD_DIR}"
+	}
+	multilib_foreach_abi my_other_abi_compile
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	use examples && emake -C demos DESTDIR="${D}" install-data
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+	rm -rf "${ED}"/usr/share/Xm
+
+	prune_libtool_files
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}