Apply Solaris patch unconditionally, bug 465426.

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

4 files changed, 36 insertions, 22 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 387a7f2f794c..c608c54f902e 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,10 @@
 # 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.30 2013/05/07 13:56:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.31 2013/05/13 20:02:26 ulm Exp $
+
+  13 May 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild,
+  +files/motif-2.3.4-solaris-11.patch:
+  Apply Solaris patch unconditionally, bug 465426.
 
   07 May 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.3.4-r1.ebuild:
   Stable for sparc, wrt bug #465788
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index f15a0ceca86d..0b9c7bbf9f49 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -8,6 +8,7 @@ AUX motif-2.3.4-automake-1.13.patch 358 SHA256 3e17cef2e33f8e952505972e7bd625b61
 AUX motif-2.3.4-fc-config.patch 638 SHA256 85e3d8d4db3d9f19a2592517a9473f4fbc454e4fc41136d20c21bf5a8f485bd6 SHA512 0785e4a8528063b01383a52835327425b10b4af955f9365c3d06008346158f2497338afbb52ca65e64140f51195427f1ce8e16717574f2d9622ed7bf6a34c456 WHIRLPOOL 2567538813462c4f93a2ba478e9eb87b0f7d055eaa242e2334c7403269c2b85c40bfcab86876ea973a4fb3de47a84600864500f9a636c65c96224fedd56c2ae9
 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-11.patch 483 SHA256 a2389f77d1ae2c0c4772dc2389c427a3790bee9ad63aab59f65f1b862a78270a SHA512 d4b5c8cfcbfc990686b075f2d675e4ce11dd438bda7e87adba05dc29782eb6221d1c69a8cfca0037d60a7e91ed2a45b88067c63f27a9bdb3b2e04dc889a58b15 WHIRLPOOL 10e712326563e60581975fbe882cd693b880dd1e8f6775b38a3c5b86040c01284878c3e2b17ce802f41b53015c3a3010b5b38b2fd4ffb56238c49015ea55289d
 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
@@ -15,24 +16,21 @@ DIST openmotif-2.2.3-patches-4.tar.bz2 20601 SHA256 424bc4216db5f13bbe92dade35eb
 DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
 EBUILD motif-2.2.3-r11.ebuild 1649 SHA256 ab7c1ba8b77bfa9bd88793aa4a87ffdabda86670d03b7b800914ea4fa8ae0051 SHA512 129297b11c977ee879a34aafc5a22bdd05f0dfab18f50192d7116b1d550c92d7901ac2872d4f418f8bd3cf55da5b5ccda68aae7651e1e009e2602a459888e1f4 WHIRLPOOL e751d5ea8ae0ed54437c73ce81da716ca683994e5efa1dcda06689f905e73a7f9d3c483a0bcb2697938b023f5b8049f683a11990f83b58993877b0a73ac29785
 EBUILD motif-2.2.3-r12.ebuild 1945 SHA256 578767e1ef42a2a698c71d70923b8eccb85d91c11783c3d3f45e7cb49c30720c SHA512 0252c70bad82ffee132de9bd43dbff849222fe6af6099aa3fafeac6f9b0f9bf999f717a61212cb38ee02d25fa66a6b59f3c26829a9c200c320b42d1e8f1dcc03 WHIRLPOOL da02b5b25fec30494319130f1cf721311bd53a41d2378fa9978022984de5e877cbe8909f77bdda34049bfb11c8ac933403c36055272f3fa460a83d9e71144c2c
-EBUILD motif-2.3.4-r1.ebuild 4017 SHA256 89f5551fc635644b0bf386d303a3266a5c5313356446b2d1586af21bb08da859 SHA512 f6d37c9b8cd512cc4b08268fb8968316702abe4d44ca1fea9ed95b24177b113909bdd65bb01ee29b9c6f936c9fcfc02b8b64539651a141c8bc992a89a4975b33 WHIRLPOOL f96395a822dd36dccc254ba2360cd821af4d930ca4369c243d5452d8414c0ed7b3c7a7d1963b81e12485bc193f27ec7570aef8446fb735ad6878bc25f0e526ec
+EBUILD motif-2.3.4-r1.ebuild 3992 SHA256 3086bc98c731f0f62bfffaf6e69c42958901dae62ade95ffed45a1013c97cf46 SHA512 2cdf816ca073e2f07d4d7070e831b3338bb0b89e477484079dee2300736f86fd1549515c361f1e51279ed80e3bbea5b6c543fa5382ab06d5864a6f1b7bf9735c WHIRLPOOL 80522231370e3de8d0ba55f1f47ee9eb24934c5fa22085789a3b17625ab5fee14feed54613191e8df5e5efc4123bf1a8c0920cad24217b3d8f09ed2d90b15b4b
 EBUILD motif-2.3.4.ebuild 2860 SHA256 6cac577c5e54043e0f220f124f65020d867b5e9015f8f6036683fb91354503ac SHA512 d183b21cdcfb394db3b24d9e8ddf7161f67169c0354d52cf6e04d2b5e744bef9a2a3108f90025ce67d12a9ad210ab8edbddb26c2715e08435bcfe4e1c28c9a37 WHIRLPOOL 0e113655d2855700431f345b495912708f4ad093d7f11311629f06184c3a4db038062c6893e4177281dc1dfadd0a85426f2273d53875e1793c78d89674bc55fa
-MISC ChangeLog 45166 SHA256 14b7f81c89faca5ffe8d930605f6a6caaef52b9031d5a6592ec014a0ca6f114c SHA512 3129b1bf8ed0f725b76ecf5764a9b1e11a0d9fd31387fa71080398a8a5dfabbb265ed4e52da41fbe8e2a5062954a34a8a68590b50573af4a095908662f597ce8 WHIRLPOOL da4f48f217ed5bd267b7a8664ed896e79532e8b8d0d7645fcb00d4f9c3756085051e2f5378e5b8063634281ea84670f485f66040f88c363acc41263d39649291
+MISC ChangeLog 45327 SHA256 e7cf398e8cc84b96e2f9754eb770d48241c09768609184edcd40b1768f979334 SHA512 e35b37e70cfbc6b8335a5737e60b5f62992cd8901a374526c6cd63dfcd0377b7598cebce19fe52bd39c8cb2bf326d55dbd006470801b0a3e504910c86d46bfef WHIRLPOOL 4d6d6ddd28349d47632351ee6f3614589fb61bf8f9953749ea4c4d6c42e7aec33f27f215bc05920c2be2cd725d14ea7a2ef58c5236cef422c90463b417be4c67
 MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRiQdtAAoJELp701BxlEWfNDcQALRYhbENrIrdzSqoR+oVNIF0
-LLIrjQCvSPMP9nV6RdtUXWhv2swpECbUdRM3Kzozt3j7B8YW8cKXmNBxBFYe4dK7
-qg9C+xkJjDXIjDbmZnKM8c6CSaP1YQVPrgPv9/T54Af234//6FS1cgICRHC7p+1P
-SfVKJwXm/u3Nix/BHdubet6L2E3Hy3FTsaDNYhBr+mmF2rzfj7Z59IWcq0Z1THwz
-2qpZzOO6GICo7QMTQJoxw+pTDLcuwd0YNqQ+NROJQvTO26dDbzh3iLfVankphYxV
-F7LLADRQjMCHH1LxDbdfEUXyFnhfqtzcONLcrxHOlN0tRrGHsPz3zpVSOW6rp8fI
-BDDYYkNCOp4QGPkMKHOl71KqpQ/dPU0BBN4QLISLasMl9AHUy1Nl/xw2y8/9o1ax
-+k27nLkt+5t+g1xcKv/6shfWOtI4EhRBneZPAwplxr+rwQb/keTrsL54VfsRRD4x
-GtVqjVj4/w586k+uavFNHyEKKg7QpjV0TuaYXpBHKsX1CFErC5fZj6xMuOxsYd6V
-jDKbNTdT8a8ZYZh9LbKQ1L4vHm9IKLFPZCVArBok+wFxxWEh8i2WOyOwkgM1STjG
-r8njbW5UwALJBHCMyqdyP5Im/HVVItCinVXluFPMuMeUsGrLAT2T4m7SLZhlMaAD
-Rk9ioF5xyd5X7l27ehCy
-=ieJR
+iQGcBAEBCAAGBQJRkUiqAAoJEJQzkH1pP7W4yL8L/RJ8JXAvWErPchikQsjbUUax
+w/zc8o4C3Pw5IZZPu3b3vwyGtw1TlV8jwD50CciLCjyyvFYIAWbiRzNXRZ83RkLv
+UFHrEOrB34vyeh3XHThkUEo01pa1SmTR1sfiAeeFaCjrvA4ryMRZXDGWZBx8PaJ3
+t3MjCX2Q7dk/DU4Vi6wM0IBpXHwQ0bZFbca2cqEuBAUeFNewhqDfJQgedvndt8ww
+RtM7F8duoSDm2VfR1xhAlZMeG5JXbKE8OYqw2YA4Ci6n1xGHlE+C/UcJ72IX2+wo
+id8wO949qJ0H9IvYCjTXCyu/4OvalkT222HXvQxrIlh9dMyU845FaYzxU4dFrRp4
+9sgF83yWn4j3qMeYIBTXAAoMxkJfspjsDU4/sdqyIErDmBUp0fkO+gHEPqJz3sFq
+geBiMhwmIzK/fklc6vKn9rQBfqy/vCuD3CZuF9zEkaGbtHwBe/Spxoujz1HBE5rU
+AAh6KK/JOgeqCtR34m5e7WEaWhVmOqIF75MdJg7Bqw==
+=1KvI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/files/motif-2.3.4-solaris-11.patch b/x11-libs/motif/files/motif-2.3.4-solaris-11.patch
new file mode 100644
index 000000000000..4a6b23661e47
--- /dev/null
+++ b/x11-libs/motif/files/motif-2.3.4-solaris-11.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/465426
+
+--- motif-2.3.4-orig/lib/Xm/Xmos_r.h
++++ motif-2.3.4/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(HAVE_READDIR_R_3) || 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/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index a9f95993ddc3..a8d5d29913cd 100644
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.17 2013/05/07 13:56:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.18 2013/05/13 20:02:26 ulm Exp $
 
 EAPI=5
 
@@ -45,9 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-install-dirs.patch"
 	epatch "${FILESDIR}/${P}-fc-config.patch"
 	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch"
-
+	epatch "${FILESDIR}/${P}-solaris-11.patch"
 	epatch_user
 
 	# disable compilation of demo binaries
@@ -68,7 +66,8 @@ src_prepare() {
 	append-flags -fno-strict-aliasing
 
 	# For Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] && append-flags -DNEED_XOS_R_H=1
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
 
 	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
 		# libiconv detection in configure script doesn't always work