Fix build failure with automake 1.13, bug 467230.

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

5 files changed, 43 insertions, 23 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index d59cbc8d7b66..3bb900707286 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.27 2013/05/01 11:15:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.28 2013/05/01 15:32:55 ulm Exp $
+
+  01 May 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild,
+  motif-2.3.4-r1.ebuild, +files/motif-2.3.4-automake-1.13.patch:
+  Fix build failure with automake 1.13, bug 467230.
 
   01 May 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.3.4-r1.ebuild:
   Stable for sh, wrt bug #465788
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 9c231b05cced..fdb8229de201 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,9 +1,10 @@
 -----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
 AUX motif-2.3.2-solaris-2.11.patch 409 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7 SHA512 f9b318b62f9c64409c1867f037eb9d52f0b56c538f16b046b1808a14fbc47aa27ae234402df43e03c4cd209df2dd58a7072d969f20717f97de0c662cc72db526 WHIRLPOOL 309800a01dd44ecbc6bed7ac519ec4c9f0add5451dccdd2130e8c1204a9ae4e76b65b01ed9e03d7335155ff3fe3840f875de69536fd03928392574d2a08944db
+AUX motif-2.3.4-automake-1.13.patch 358 SHA256 3e17cef2e33f8e952505972e7bd625b617fd54a829e370298ef5570cf697d803 SHA512 1d6df2858ae3064fb6f71e9c2673559b7d2ccc729b2dcdda4b71f8052491fb4225e253ca9326f016c898d499409bb75be0c1cb8dbd40d948c67b4333722f3a35 WHIRLPOOL f22323f33351b3bb3ca166ab91919b98c0a8de5520a4cb4007ccd465197a096de5dc5f049a04348ba4be8494341353003d1e10af2ed94d40b722f4a49a45811e
 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
@@ -11,26 +12,24 @@ AUX motif-2.3.4-solaris.patch 541 SHA256 b9b6b9eb830d950214b2826d08e946440950593
 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
+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 1966 SHA256 6b1685cb7181381632266e3bb8da430f573c3e6999ea3419504ebc94e0462e29 SHA512 e42ad3d6c48ec4d78cf10e26d9267f502399b0b118792678ab934deea5acc9b63d7d889c5dcd734be9e377e70881050ac2eddc8a171a753fa0651e9516b2df9d WHIRLPOOL 46a01ed7def96a2fcba4a4b6e50e7c79b603ccb0f4d61fb81347f432bfdb8ec8fe4f0aa78500cc0428a288916cc42edc9196acc31ac6cf0eceb973b46a3b9f24
-EBUILD motif-2.3.4-r1.ebuild 3991 SHA256 c8dbd61e42618169dbb19e405c2d1e3db651d07ad34d4768cd56f708c42108db SHA512 fc20f2fe5a69752f86fd8521102c9e5ecc7daf40aac73622cf8c8e5b5a1b4c3c9e77c0385b1fd4ee058f2946ade4a3746de0c134ab6800e485662ed48c2b497b WHIRLPOOL 35fde43ec2435f2c2bf3106d2787351d76ebdaa73e4f30898ac5b3c1617e59190cb9eaecde4d3e57c6c4440cec29b425e6c0c3eb02bf3a8d7b4b0ebb7b987f6f
+EBUILD motif-2.2.3-r12.ebuild 1944 SHA256 53eb4ede07c701bb6ddce8267a0b04b9bf82183c565a4979805e515801a8be8b SHA512 808dc9c9d27ebe9c0a79fb71c635b021cb53f7312982b5d48a5bbf61fa1a61b5864b4f0ef8b8c54fa67fb5d56b4d6c84b47b50d4dc8c9c92cd9520618caba2c3 WHIRLPOOL 44b08ce3a9a7f79ad77d54f3c855003ddd4ad498684a809b43b8cbc52f65499f8f408babfbe2c25b0a022379be084f9cfdf7e0e3667a5ef5f690bc46b06081cb
+EBUILD motif-2.3.4-r1.ebuild 4017 SHA256 f1152eadd502390ce1ec61d1f55f1553b2ad1fcf90b205f296a98cdb99ec66e9 SHA512 56b7f13383511ca45d1883333a9d4856eba60f474d788e7fe87eb8133af93a4c5945577d578abe5759fef27dcc8005a4031270d5992b5033bfff844eaea2ea31 WHIRLPOOL 443a33893511dfd36084cc54803e409cfecf938ea79b65d4f8a12ba788fd284f48c8b196249fe47db9db3b887ba7d4c6752fcd621086c392414b78d39fb46ad4
 EBUILD motif-2.3.4.ebuild 2860 SHA256 6cac577c5e54043e0f220f124f65020d867b5e9015f8f6036683fb91354503ac SHA512 d183b21cdcfb394db3b24d9e8ddf7161f67169c0354d52cf6e04d2b5e744bef9a2a3108f90025ce67d12a9ad210ab8edbddb26c2715e08435bcfe4e1c28c9a37 WHIRLPOOL 0e113655d2855700431f345b495912708f4ad093d7f11311629f06184c3a4db038062c6893e4177281dc1dfadd0a85426f2273d53875e1793c78d89674bc55fa
-MISC ChangeLog 44712 SHA256 581a3919dc7bb835197fa2e971133d68dc53b844ea10bb133f96f4ff57143cc1 SHA512 86c49df18a9c86354851240d1b7fc143b8a18ac93ec10d87da95d3d7944ac21e049e3514647c4438a22ed919fb2d55d29e0e585c9e4f2810ed46d09b6f81e7b3 WHIRLPOOL b3a2f636848e2f05e374f7795f4fe74de831665dad8a9c03abe927395d673e597fae667890c40871a8431cf19a1405a76cb604b3004138cf4f659cbf1c801bf6
+MISC ChangeLog 44901 SHA256 36a6fd729e7971b8e85901043960bf20759542360db31cd82ea892ff368c04a0 SHA512 23891f5bc0a2d0964c33966c7adb42f1c18207b2f55b43fe117f1f745ab3ba5b30bc51bd9479939dc62aa06106c6a959e9a4ce1bd387450e3b0c02d71f116b06 WHIRLPOOL 5177531a9f9e4d02cff71508e500a38b790143007eb2f8bb739db395d6e29cdc16e9a199912b25491c7829c39f836d127ee6a4de4321df0dbc4137c3231f0a60
 MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRgPi1AAoJELp701BxlEWfuUMP/0qIbHpjiJEj3sS5Pb1+VZnf
-IbRGCuo7IXVUTKwVfeQi7MO8eSG8bYJZ22RfXmfz6g7XEliqrU8ooQDheG9jPDko
-LtW5/uQxtpoBbs1g8R3HvWv4VjDypPCU6CW4XiPZ1WeYa+Uj/KWezxYWQYPKvxyb
-R3v9+ZgczwXxUzNg/wASpW6dU3/jHp8Ua24H5wwQsAi6PSH6hLM5RX57Ev+270UW
-vMOokQXpCimJnvOZExl+YmxJ1kgs/RbRY2niFkdszTqGkH8USe8eVJNCnZBq4Hqt
-9vBiIGd2WE74igK4dql1n1CsL0k7/lXGAFS6wSIB2iuazIpze4Lo+4f2yUeURDtA
-kesD2WSE21emdF/U/oJXIjFxWo31dQyODKsPn6flA3EHtOTJMXhKeVIAh8dYKb35
-W2et/DcOCRaNiWcIdC/qdLnCPQLKRnsfiR8KizgCMJ4/Ii9aWwixRtBsC0IYVvxd
-uO3IFDKhUcTtthHM4BBk5wXJdOjaUJHn4/Y1YTL9lLFaJnB0z/arfGAK/wHFiEDI
-qEeMKPqtbo1VX2rC/jVt0O5WI+CiXn2XaoeX13wheKzk4DV1kn/V6RDCV9MQm1TC
-jhgbvB+3TuSfuNCQ0GR5nMx8FZRbVuK1vkY7TINaxw9K4lCYF5/2au0ADaPXxyTm
-5QyAnzEzAzJdMnP53hAL
-=MMRi
+iQGcBAEBCAAGBQJRgTYCAAoJEJQzkH1pP7W4AhML/1NjVhL1IKdkNgRWsKUBMdiK
+3oVu6xV+mvvJ778GYQhtTyulfr9UZOsU4WQFIZQHNVn6amSisHDmDXVO2w7i1f8/
+pRTYymEjPJIX9Jm8TDIGtrImPDTp9yL7d7ZF9Nn98/IIUyOogNaZvpcnmkwYuSpC
+jK5KKzr3DugFODiUJ9Ava+JGBl0Lb04UUZ4aTGbex8DPfqd+XqwO00ormsnoKGMh
+OD8qzWrtbP9Sbba/JbJhUJmFZSjoKPg7FBELIqCN1pXwiN57sNAEB+ErkE5aaGpf
+AFHzEFDj0Kv7v9foWPevZ7NXUSZLjiusgBiWo0RPDwXhKQNe8stRmYj2jTFU0BGC
+uG3IrHx3oSa2NvljtVx2WTN9WL1ZoY6dBaYk6qD+w0h24qn5mDnDrj4V1PcZzGjl
+2nASvlDZHvan5RgLo7pFe6BWXs2edT3pm78c66hZDVHlfqSeBmbxC984Jyh/dIMO
+86YauF3xGy8ShRwYt4KONmcwp6KyLXRse6p4nHqNJw==
+=hQM1
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch b/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch
new file mode 100644
index 000000000000..3375f6e951e1
--- /dev/null
+++ b/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch
@@ -0,0 +1,18 @@
+http://bugs.motifzone.net/show_bug.cgi?id=1595
+
+--- motif-2.3.4-orig/configure.ac
++++ motif-2.3.4/configure.ac
+@@ -31,12 +31,11 @@
+ dnl
+ dnl AC_DISABLE_STATIC
+ 
+-AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
++AC_CONFIG_HEADERS(include/config.h lib/Xm/Xm.h)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CPP
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+ 
+ AC_EXEEXT
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
index 90c2e30133da..fef80402a63e 100644
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -1,9 +1,8 @@
 # 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.4 2013/05/01 10:37:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.5 2013/05/01 15:32:55 ulm Exp $
 
 EAPI=5
-WANT_AUTOMAKE="1.12"
 
 inherit autotools eutils flag-o-matic multilib multilib-minimal
 
@@ -11,7 +10,7 @@ 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"
+	mirror://gentoo/openmotif-${PV}-patches-5.tar.xz"
 
 LICENSE="MOTIF MIT"
 SLOT="2.2"
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index f19da3cb29cb..6a901635489b 100644
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -1,9 +1,8 @@
 # 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.14 2013/05/01 11:15:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.15 2013/05/01 15:32:55 ulm Exp $
 
 EAPI=5
-WANT_AUTOMAKE="1.12"
 
 inherit autotools eutils flag-o-matic multilib multilib-minimal
 
@@ -45,6 +44,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-parallel-make.patch"
 	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"