Revert unrelated style changes of previous commit.

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

3 files changed, 26 insertions, 35 deletions

diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 6f54f78caa26..708900188e54 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,32 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX Mwm.defaults 536 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab WHIRLPOOL dbef57a2fb37b93f38993aa4ca04b082a4e8fbde3142867c11c4acd2e7a53ffdb65ef299d8f96cc06eb6572aa29ae8e6db8f3f9499aa46669f199f9f35023db1
 DIST motif-2.3.4-patches-1.tar.xz 1776 SHA256 b5c9a0d026202c488a95b24beaefc63139b0cd30084af66da4247117c8c2d1e6 SHA512 f6773e0d7720adff8b5225025a682d12a4a60465c2a49d26df29daf7f8d7891f68b7ad3e284ff5cc73938ec4c78ed27216f9304f35905267b28c33f6d29b5666 WHIRLPOOL e677f210513dbb2ce68bffa0662443e232b2515c7796165cfe66e6c15cf765a9477362ba1d9ce42ef606c351df6e342063733fde907995d0954a10929ebacad1
 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-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
-EBUILD motif-2.2.3-r12.ebuild 1997 SHA256 ee2eeb9d75459604d013804ef856943b47fb06080949091b19ce1518de52e89c SHA512 3ba738ecccd80a541e96f2eab8a2639590d915707ad727064e34f20ccb84b9da6beb3e6afd1fd7e593222d783aaac3fb6c9da7b3a64219d1a2173f8a0651ae40 WHIRLPOOL 5d2fac39139790a324a98f130b3ef226fec51bc3c8164bb7401f5bc2e62285d524e532e32cc7d1b197660b45fd4db75f4428b5413201f8e2f0e509302a5947cf
+EBUILD motif-2.2.3-r12.ebuild 1975 SHA256 0f1d91c322a7dad1a3f5b98b96a13c55ad674c23fdf586718b1f8d79591825cf SHA512 707a82f3a6e7e3b45ecdbd35aee7b4517a135a97d9592ed4898fc16a871b25a38bdc3bd41fb655239f6d00a5a0f5aa935c8053e51dd7dac4d98dd2db1cafd59e WHIRLPOOL 74d5aa64ef0e1050b61987da669c89dbe34c5c825f5e22f6f6a7a9444d23581b023b8c90f3e8b3fd4570ae24d9dae48f39692f6059bbff9f0c1f0a736e1ecde1
 EBUILD motif-2.3.4-r1.ebuild 3854 SHA256 4f2b82370bccdd94cf75330fa942c3e0c8484831469d441a9f98374667dc6b7f SHA512 17f55650d719ab407afafd5dcd5e50748c3a08926043f79e4e7b543b83465834bd649be1e877fa2098e04e15fce91971ff9164d712da8361956b222f1a6b5465 WHIRLPOOL 61cc1052f647327b016dd8d6a9ea8d3431d5cfcce95ec56d69f279fa2f2ae69eec153582ddd86e8d4a652c5e74905c33d52cb261ed90c8e0bfa540da8ed2ed17
 EBUILD motif-2.3.4-r2.ebuild 3489 SHA256 0be68881eb41ce8004ea395ec84f1aca8ec4bc47496563a91bcf3fb1ce7fb53f SHA512 87c87ee04ed1e61f37f61d4bf8b85ed2c2e202bcc239fa5ee51281f7136ea24249298ead4b1f25ad251b2858a0b4f770287b773e5c878a6ca8bc16fc72bd55d5 WHIRLPOOL cf36101137bb17e719aa79bbad9be317281cf273dab28ba46179bd5b25964d8216d9d2d87d265b69354c94e37d1136f567ecc48104006796e741a3d1f59e4cd6
 MISC ChangeLog 48739 SHA256 7f17f83f67009f69be621e01a58f9b6314fe312b0bba43ab8cb2fc77836696c7 SHA512 d6ec60729c9f82753823e71e888027c3967395b5d5bd2c17214be2568f7f627330352c7509bbea748ec994a5fd4a57322ed5330f047ba3149c73edc53e69c44b WHIRLPOOL a6908eccff28449b08adb6ffb10a0c4117e821c05a477d657493f72f108f08d312db19a7db8601e0a793403a0a21434e92e43fd73626cd02c0bce606ac5e3e22
-MISC metadata.xml 301 SHA256 e57c92dff773b5a0b9281ffe8b1f230c30d5a6c4a60d6643be22be51790e9c05 SHA512 910aa7e0e8bc599315f0e310acd597760985e4f40cd988f3d6896def0930c9c5457d18b3e9a59e3c16f50707a1729ed22ac2c7810adaf52d889f9b8e529c3a71 WHIRLPOOL a6195930eb5ca6221ab1d012393f2fe94624426037f63cf4a83f2bc6e397e10a3d7f815f38edd5a0d194d3aa89f1f02946101bb4922d64274a9e7504d61b43bb
+MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUrpV4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir+S0P/2Jj0Tjkl4MK5hkMvvxRVNvm
-BfEL5lgy3RrtcUD7oklIKfO3//UwM9+8JU302LbrFU2EcMDMrSDm0PSwMekC/CfP
-r9BKJxUtuRK2QeVgZMZ+1733DoxaEbpB17XYzgsPxwcRJ/V/Zz/z+U+zP8gbJPrp
-Em37izYnHn5+lhCnedchTtCoCKoMICes8yr5FXTqfMHgWEiyEqZfUiZki3H4ngY0
-MTW5qx0HByrgRG28LU0vSTRdFdzwuK/PtEoEhnqZeu1aPGxVeA2uJfbH8ipwctUZ
-nUwoUCmS2rfeI7FISS3QF3wViJiHb1tkoujkqCGVpDTEXRuw7TVKg9FsJ8Pf9Z0n
-IL0EhnX7gM/Sq0xqrqUVZNG7JHftWN02vGyb1Rb3qtmWsyBCPLJCZq4C9VWdBSG+
-IBx8yeQx7d6PPDAC1N5x4ctQYPlZt4OSBUqaBiUAP/us3cfW5bGXfM9iaeHsQaSN
-qvLKZNvXtPcjOGzvqgmWknYL/wccJ7I4Gbv5+aKIWT7JTelDSzrPULSf5skDQoXi
-GSZtkWIMQQkSJmyPsTJwSphr2jkMUid/Og2046A4EsxoekeuPeUmjgeK1YqnQ9Bt
-FhACNdErYY7SRT3tZDJJpYh4Q7PQEHJZeBdc9n9N/wYTKMdL9PIFQX0KlgWzN7uu
-49Rzsmzc6tTwXwrtxgS/
-=7++A
+iQGcBAEBCAAGBQJUrxKpAAoJEJQzkH1pP7W4R3kL/17af8ADyNeoRovyqDkcwau3
+SZVQAt0s68ODXDyYsgoex9fL20Vk8aIhorDQZtXrjPcpBu0AC26YLjF+meWZIUkc
+k6+Xs/B3/DPvoIBguilhp0FwWurYQLrfPDS+XpAzfJA823dD9P+kHQEhRC+3/cXC
+8x3uJIpQ9ZATriT+Bf5PynmE18YC5gDpk/OOQ+XcBwHmI9cKJ5oo7NGoz8hA1PVA
+LV/QdVr4lIY//ImD9rK74rLfQtepc3EvKkA59nY9pFinbQXdhpjRweYpcg3OGUmr
+QfYROS4Zz8bfDTkNDVYC5JiwUFwWj2tpzF8ycvKRE+yIXk6ZlhKNZ4Poy8wihDxD
+GmzrAY/4T8vXqensr11LMOOZW+sMqBcVxNxcnPzaJmRyh084qKMmwhQ4FQyF34Pl
+Ng1Hn2X3P6eg6ZwYitPhLQBQR8lTj/0Xty14hSibeMWCGllrc/1tGeG59hFg6VVi
+Ki4GZOGmbcb2Hgq+VahA4KKc4GB4K5pBQR5Pvb/E+A==
+=a8F8
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
index 18e2c2bd158e..ad024ed0a1ac 100644
--- a/x11-libs/motif/metadata.xml
+++ b/x11-libs/motif/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>ulm@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag>
-  </use>
+<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
index 80c6be5c44ba..97a19a9e7156 100644
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ b/x11-libs/motif/motif-2.2.3-r12.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2015 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.13 2015/01/08 14:34:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.14 2015/01/08 23:23:03 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
+SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
 	mirror://gentoo/openmotif-${PV}-patches-5.tar.xz"
 
 LICENSE="MOTIF MIT"
 SLOT="2.2"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
-	"
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	x11-libs/libXaw
@@ -72,8 +68,8 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	# cleanups
-	rm -Rf "${ED}"/usr/bin || die
-	rm -f "${ED}"/usr/lib*/*.{so,la,a} || die
+	rm -rf "${ED}"/usr/bin
+	rm -f "${ED}"/usr/lib*/*.{so,la,a}
 
 	dodoc README RELEASE RELNOTES BUGREPORT TODO
 }