gentoo resync : 01.12.2017

3 files changed, 10 insertions, 9 deletions

diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 4408ec69bbec..943b4259df02 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,10 +1,10 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
-DIST motif-2.3.6-patches-2.tar.xz 1600 SHA256 03478b2ef5c49b9854534ac4615f56d93e589daf50d9056c1abba372e157c947 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619 WHIRLPOOL 2d59ea61e646a827b0da3d6b44b72a7d42b8e60f1defcfc00c8c9689a97c6789cfd6f91ff858ee1b8cc8443c5510507ef14d37efd4e24928c0d9dc54f87a2b8f
-DIST motif-2.3.6.tar.gz 5725456 SHA256 fa810e6bedeca0f5a2eb8216f42129bcf6bd23919068d433e386b7bfc05d58cf SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60 WHIRLPOOL 88a88dbdeefce4ff01a5018f16cc687e9ac86af67344c5c292d0508abcada17d8dc7d65df2c2e6e4904d6c8524552e2607f1a926a745fe3196f866d9c5f93294
-DIST motif-2.3.7.tar.gz 5715478 SHA256 8f7aadbb0f42df2093d4690735a2b9a02ea2bf69dfb15ae0a39cae28f1580d14 SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8 WHIRLPOOL f94a384ffdcbcd6fd289d31225822101a0cbfdf147a49e925c0b5d12fb57548177746e6da511f2f096aa1cf72b07f3a3930f5037715c784857e0679a005b4a02
-DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
-DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
-EBUILD motif-2.2.3-r12.ebuild 1796 BLAKE2B 5200f9c080a7eed0bd6f1bae65b4e98c2918537b5306dd7f5232188ba56cb99dd847a6fa19260fd41e7d9499cd4dd1e95e14def938a6cac882875c256ad32798 SHA512 d509681101969f0e25aa6525ccabd82d772d05f9bb4f8a6504fbcd68d7b6f1fd859d3ed6b54c531ceced115201364b17e06471ca13217f15b798b25ddeea534f
+DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
+DIST motif-2.3.6.tar.gz 5725456 BLAKE2B 40f1af89e267de8d7603a7db81390286d52d1fd1ae1a7f45dae82b6d11f6a7c35e4214b9df0f3901781a9249632d40aff360b9d97cffc3218ca2d251693d9ae2 SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60
+DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
+DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
+DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
+EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
 EBUILD motif-2.3.6-r1.ebuild 3468 BLAKE2B 75be1e877dd39810cc656c62935512abe527cc5e602e125dd60586ebd16256b4b4948ec952a90c4e4ca8776d8b23a45e41bd589c8c0a291373b3333e54473fcc SHA512 31e3580fcc61f6e748e0464ca0b535483d16186c33065c5d6fb3041d4862a73e7d53d8007dce5085a0da9947f2c863eb5e7bf38ac2a0fa63d50a73336519c828
-EBUILD motif-2.3.7.ebuild 3484 BLAKE2B a035cf248b68a043b19eef292001b381f17bbf2df9683d4a35ef534e1c824bb8b3f5db43d373c2e34fa40ed6ea38a0e615d8d5520b32a6a6e47b23916da7147a SHA512 86c18a4e1db68c69171f480bce9c1f0260dfc15cc9894ccd0150ba17abc90f7963c3ee1bffd19db2612d836cc8ceb3a2ac2c35a655c3a2123f6581be8eeda7d5
+EBUILD motif-2.3.7.ebuild 3478 BLAKE2B 33b41f4013f40b4e81810c0e87082716d91b95ac59242e26aea881b4ac7b3926c71d25dc38bb90fe0aafad0e26e5601962fa5f6f0e00511ded974f72f05d6f7b SHA512 a11e5792b0e423b0cc9653cbc846b6cd95613f8e6c0ff35a1b64f5885a6daf5123077f7d205982aead51a361e5da6aac0234bb64163cb23d73af6de7e4532708
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
index c511707f1a96..feb4e6b11620 100644
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,6 +40,7 @@ src_prepare() {
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
 
+	mv configure.in configure.ac || die
 	AM_OPTS="--force-missing" eautoreconf
 
 	# get around some LANG problems in make (#15119)
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
index ec09b0590406..2b2ef6c61e48 100644
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ b/x11-libs/motif/motif-2.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]