Restore stable x86 keyword, it had been dropped due to bug 468590.

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

4 files changed, 22 insertions, 18 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index e7625c62cc23..87b98cc3a93b 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.38 2013/08/06 11:03:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.39 2013/08/06 11:09:57 ulm Exp $
+
+  06 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild,
+  motif-2.3.4-r1.ebuild:
+  Restore stable x86 keyword, it had been dropped due to bug 468590.
 
   06 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
   Require USE=development for emul-linux-x86-xlibs, needed for pkg-config.
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index d3ce0d824f4d..07cf0b331283 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -11,22 +11,22 @@ DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442
 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 2083 SHA256 90fffd77b6f6f32f9ca27a32f9b6a2cf9f64299c709bd32c9e24b099f6a01f4e SHA512 b72db4b7e3ef189d937e2440c4325d1647167e7600fee3aa6fcad88be5511a66efadeda84fd1f25f2470563dad7c5e35c415bf83e98c62d6f2a8630c1afc23b0 WHIRLPOOL 5596deb45751d34ed59f3ef44f89e141dc41a4fb2cdd329bd19ac1d61a99ba36198056dbf1ccfb67568f333fec6854d56177a09b88156deb25f77c275d39b0ea
-EBUILD motif-2.3.4-r1.ebuild 4523 SHA256 afa5c9f59d1d9a84730a5be7fe650aec81accb982b87cf1e129e6226ffff18df SHA512 f612f4b2d4a2ec03c2540761150a78b4e78b8092d23eb6d4728c9ddfa76f0b51a922a63abcfb3b5c8951eac5f4c2bef1a7d52c92c4877705ff34cfdb73f54c1f WHIRLPOOL 4e003bd3fffcaaf06b5d1889a26e8e3fb17df3ea065c35964e01c36a7e731dd742203061d03103fbf31695504eafd4d69687f0aaea844164ef39425db303a798
+EBUILD motif-2.2.3-r12.ebuild 2083 SHA256 ed1ed20d10dc87fe3c225dc56807437c5d9a04bcf7ba535dee1dd366e75bdfde SHA512 e87f9ed60a84ff44705c997826f23cbde24c449de9a693e85021cb483ebe883dfaf782ea0d62c8b4e1f256f239a1fed1e4429ec654dc7dfdca0ea68fb873af45 WHIRLPOOL d1d11011b52e7f861b486c385e7085f9bc619a0be99476828ab53a4f3fb9ca1c180dfe42774d712db4729f7fc84108d1b3fbae655bd0e2b989ff07d6f7264fe6
+EBUILD motif-2.3.4-r1.ebuild 4522 SHA256 5eed1ec7fe8185b5609b44dee7655917c63e017cbdc634fce63ee5484b7fca67 SHA512 43f1c5ba6d9895fbe78c364bde3c99f8dca60b519edc70c919ba51295691a0ff43d5fb21b7e3b6d8c5bf2ed49cc4ee88b6c048b41c42fcf31fa299dc51e1e50c WHIRLPOOL aefa9bd7a1c7eb9dd93756dd08d383c741ff1d7301252de2a3eae1b06c0e5f7962670bdad3fe27cce60d4e42a786b927e2db47824fccd0e725489b1ccf76848c
 EBUILD motif-2.3.4.ebuild 2864 SHA256 e18f53051496fa24b6086525d8e6bc8eb236f644f68d9137ec643c417c90c5c0 SHA512 f611710238d17f5ed703f6d36ec7c2d3f6a0a77eb01aff600761a9da6a0f96b5c9d9ef06ce5a2221f54eb57b1b529315d3f3eea1ab24c79a6cd9ad056e067d42 WHIRLPOOL 58efb2b1ff36ee51895fb621b8c01b1dcc120a7d8573226615139051365926cbdf3285846ade2d273e07e0758f5dd176f9379a86fbbb810691dce66189c2a7cb
-MISC ChangeLog 46550 SHA256 69ca329e496dbf08a81b66bb55059f05ed540501a5025a9a133b3760ad883341 SHA512 72f67ce06bfdacf1f0413e5727f33b440192b4257c21a5bd93d29c333cab6bd6616f01550361fe5759d3f0d7048818fcc11fddee4c41a38bb499f33077b4b8e5 WHIRLPOOL ce6a54615b92717f490c921e84b9b935044b77f79b5671a6a77e29bbdff9a81f097d8c23fe1e7a27e3770c1a5235480fcbc93be1b542ec3e8eac97edd7e2b8f3
+MISC ChangeLog 46716 SHA256 b6d590ff1b8cf21a0fd4165a49ccf3ce5bd88e4096ec1584ccb178d4ddb7822e SHA512 7a630e98793d17ccc1fb93d2910e24cdbaf29e8a6df303edf5ac7755da1147f69df81a9708a1f2b2d754056b92ea82860cacfde33f7ea8ea943ee450cadd9854 WHIRLPOOL af6f973a8b509a656d0ff36e97033497b3087f26e0c4b3c8f638b73fd8a99bbba322d0866e110941b7dba4c0952851f50d544351c062b4645ddadf7116ae1592
 MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSANhQAAoJEJQzkH1pP7W4GVgL/0tmpzMOybqAC9/p265uuhUC
-2rEOWrLge3jTNZDe3mBccMAUQm69qQt+KJk96TzISuCynIn2Gh+xrWEg0U/+srlC
-xuYPO4Cmfe5WXDWC6+WXiM8vkBHmmkoAAOIw1uQOz8onUOlDeeJTdO+ONEe0WEDo
-66BVMX9ikXfq8TY5g1UlCimKXTQCE5I6S2nPkMbS86mxRETtYdNmwqy5fwHKPLrW
-MeH/fvxmkt+1WvTTZst644wS4gR29zaMBhBMfojOnjuzeGwZTvXXyj6AFcMkWhV8
-4i2ampNyrpDYpt9ET/fit6aasT8ksl2T6jlKluIdiP2lkJruIFKjCdHDSXSmn0Wl
-Uxvr+gnUQIb0gfXJKd9G6MOb6RXCBmd8HbKtLc365dpKFFEIk7mZ9ipTsi7Uj1gA
-QJDro2qayoKZ9NIz/a4ynGRyEwFJjrH9m1rBhnuBRF60kxx2cv+ToScYdaQ921h6
-/VXAUYJfO6peGUPbJlRK+vamFMGEo0fJG5PMeaMPeQ==
-=F4I6
+iQGcBAEBCAAGBQJSANnsAAoJEJQzkH1pP7W4p9YL/j9h4kQ5B4BpKFvBzAArpoYL
+l/K5Uf/QDbCtmXpo+xm8zRp0rYwxCw7A0MMSUIbF8EDKBHRzQl40uEcKJ3ouLSLb
+VW+nqw2BNbf8mH/KQVzuZGDKKVI5P0Y08TA2IMeM5P7HosOW1EheGDdF9BqDuWhw
+Hud/KEEjjFOfImwC+Yxpcq5HQBPhpzdbjbI074y0jIfSDV4ZxRa/BIXtJ0ZggPQ1
+W8bSzOjxDPg0Ibcf0Gqm4xX3KIJzh/hIH0E8lvs/42WzG8hxoP/psX38IFJLMtjl
+K0fYWXPMAlT+hgtdn+jVHgPGRq6LgKur5qR7Ha1U40zPke/NGLf4DSLw+QrVEkzr
+LMqvkedAodr3/lQgSb7gs//nR3yO12myT+IGUMtenooaYf2acBKnQRe4HxZSAHyu
+oW4Lo87rZ8ITOjGrnHsjvVh1fmeCUXLsJnLOX1IwSEjD2+s2Cozj3AQ72+G3U6nS
+2IAAfM4Gtdamy5Rf/IthlxCjP8mBlgf76zidb/A0ag==
+=ZYlM
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
index 1f9d40a415ff..d7d36895e9ad 100644
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ b/x11-libs/motif/motif-2.2.3-r12.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.2.3-r12.ebuild,v 1.9 2013/08/04 18:36:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.10 2013/08/06 11:09:57 ulm Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
 
 LICENSE="MOTIF MIT"
 SLOT="2.2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
 	|| ( (
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index 73cd537f26ff..6d04e870ee64 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.26 2013/08/06 11:03:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.27 2013/08/06 11:09:57 ulm Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-s
 
 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"
+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="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )