Mark stable on amd64 (bug #540844). Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

19 files changed, 100 insertions, 285 deletions

diff --git a/app-i18n/fcitx-rime/ChangeLog b/app-i18n/fcitx-rime/ChangeLog
index 4c9e7ce3903d..9cf308fa23a9 100644
--- a/app-i18n/fcitx-rime/ChangeLog
+++ b/app-i18n/fcitx-rime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fcitx-rime
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/ChangeLog,v 1.14 2015/05/01 05:51:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/ChangeLog,v 1.15 2015/05/09 13:38:18 yngwin Exp $
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> -fcitx-rime-0.2.2.ebuild,
+  -fcitx-rime-0.3.0.ebuild, fcitx-rime-0.3.1.ebuild:
+  Mark stable on amd64 (bug #540844). Remove old.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> fcitx-rime-0.3.1.ebuild:
   Stable for PPC64 (bug #540844).
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index 9dad5803c9ed..d048ae2dddbb 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -2,19 +2,27 @@
 Hash: SHA256
 
 DIST fcitx-rime-0.2.0.tar.xz 8116 SHA256 e4bc9243abffd1851b4ee19c88d7c2b32ede134aeda60aee930388f9f33ca269 SHA512 3f02d7bf0e47981e7a135ccaa46653be319d1bb716bd939b50419e47b8d3c07b347434e8529522d4266bd5fac6dbc2cdc1bfd4b7ea0607250023f70f97006228 WHIRLPOOL 7dbdcd3ac90f2d901b5b5c06541b9f6f1debf4ad833c2ddacb840dbd80a4443725fc7bdb41ad2261db8f34cb0dc77fe3d5f0c45e69a0a056618518007c1c708e
-DIST fcitx-rime-0.2.2.tar.xz 38432 SHA256 970c883794da69a2e3966435df0ac591a83a9adb2f2588ddcef55c89cca801a1 SHA512 4497cfdf38e6fd85e358b0c8b52efa21b54a8c46cf5f6a640ca1c1f91a30df2a2033f46eec2d123bfadf9c8c58e4b8f6ec96b1564d32b2b8157261ca14a2855b WHIRLPOOL 17864ce71b0d9efe14acc7b16477b7996eb73b3e804e8c36d9ba9c2919a87216bf28307dd71b64a66babc602d62155c089ec75531f34b69a761984804dca9fc2
-DIST fcitx-rime-0.3.0.tar.xz 39152 SHA256 76408597c73af1fa8b577347867ac089c21a3981e6feabc90f70cdf7247f6447 SHA512 8dbb8fddf4d372d4af9707d2f1bbdb7c15eb29602ad5de8f0cec5dfca81074087fb2873980afd8cdd09f78316620b086708761d91b820b714539a5100bc156a8 WHIRLPOOL 32e14c1a37f20502469c7400257bef295663abbe36fbf3e22c2feaf94cdf90815a053047db1bfa398ddad63b8702fe2c6cbd4967d79c9636c775e815d7c49ade
 DIST fcitx-rime-0.3.1.tar.xz 39648 SHA256 3ca74de4d20e8fd0e67eb4ccae8af3790bb1f557f183c2af32cb45f371e8521d SHA512 5d3c8fc119e1a104987a7876f3b1c54da074e34ce9feb9c02efa7c9cfd788c3735680a03cdb50d69a5512a9f075c7326bdc267cf076daa916238898da81d2388 WHIRLPOOL ed8f4ed563dfbe01aaac71bb847d4a9b641b041f9916c8c6c34a444202ac00720ebe4274c30906141b103fbbf55d7ce045cef094792c1fffadae03dd0ce73f7a
 EBUILD fcitx-rime-0.2.0.ebuild 827 SHA256 149240f2f9ceab26904a9aba4983f764140c8b9389135168ff735937452c81f9 SHA512 d4c921c2b3b6c344e71cbd7022281cff23890f373b4ff14e05c32ddad9213f42724ff47affd8950778787a2d41ceabc1c5142a3775eb00a169fe0258284b787c WHIRLPOOL 632495a573487b42b59bd5af98aff8e02b20375ed7776108892d62d12bf7fcb3d8934144156bd6198c582f48388f14939ef00a62ba5c716f8532cc235f168624
-EBUILD fcitx-rime-0.2.2.ebuild 828 SHA256 992ea63f41f3529d03110e074d8c2f18c4ebf72a5fbe6a321d6fd9e05d02b7cd SHA512 76af28b6d7e106fb23de683f51b6a9a8c4235d3aa053183883b2fcd8b71313c644289c425653dc8d425af89945a64c9a23e03f3d255d23a7cd35b2695101757c WHIRLPOOL e6761cb3a8f6a38697cf19ff3e9425fb788a39e184ce0462676e8aac02d7505ee061e6f75d88fc3ffa6097da037ec7c6381882b3322397759ecc0109b2ce6a3b
-EBUILD fcitx-rime-0.3.0.ebuild 837 SHA256 7680b78e4fae2e1d6020f1296ed03e545bb913d9c820e8f63c61c61c2f7592e4 SHA512 76229dbcd6b6c6fcc05d78f5e8c54d94ede84442815bdfb78f1785c5e2ba5d04a89a519299f68775e4600c6574e75dae274acbe38a8c69e09f8891d43cdb4cc1 WHIRLPOOL 6b7e84eca094768dd665b7172af8039c5585e30b116a25d4600aec1572ec5dcbd25c4ef3af5fff51ed3ebbe6eee7bb1124f6ca8e12a074f96d46c999c2e301b8
-EBUILD fcitx-rime-0.3.1.ebuild 831 SHA256 bf9cd657858d36d7caeada77d925909efdf89de27a002d4c05b255a721fae095 SHA512 51d271c446fedcf7d286582f3db2b0304ef2d0b77e35100ddd44d86bf8af721f3f60871d09fa3561dcc8b5bc1b2bac76d2bf3f4950a9b1947be04bc295c7795d WHIRLPOOL b06d2d62f57acd305dbcf40232102adaa2acfb0e8d4e60b44bcb6a9f4eca73b6f027f4c4961fd3c64d6a8d9970a41245ce191eb26215a0b98a15f947741f01c6
-MISC ChangeLog 2020 SHA256 f1ba6295a02d55298665e2146b66e589d41113fabddca3d538414c0be15226e3 SHA512 ba3b348ff2e9c3fed643bc12cff73f68ea18656b0d57b2239c5535a3815a9bf6398f8c1b0a0b71272406e60452f35840e12e793276f2d3daec18a98d7ab5a0bf WHIRLPOOL bf19d99049a1ab1f1eb633aa33d0247a339f6fdc83155c6b20fdf914822311f302842c4e19e6b47314d1c5724a0747ceac47876d1551921e8f56d4332fa0f900
+EBUILD fcitx-rime-0.3.1.ebuild 833 SHA256 f67822b2467a6394cbcf7f8c0fc94acb0eed8da704874332eadf858a930515c6 SHA512 8a3a4d6743bd10b71106c13e8543cce7f3c19df6152f8b85422b5a2c57004aa1d7a2d0d9f1b3aa073d7e7310487c02efb0e70ae4ae87a12098ae8ec14e099c7b WHIRLPOOL 47f8a5cffa82b156db61594a8c7f193b3a72975663b363efaf4a82ea6fdd3d4986c7283f8d1c3d2a6970d4265ab5bf724589971ad23d87a8d36872b41c148aa9
+MISC ChangeLog 2201 SHA256 1c6a150b9716f4e1dbc3f6f2405cfb138f81b4c133a63d2ff605456362376f02 SHA512 5792009e10b17e5e3512c1347db541d925ecc35ad89ea14c03d0f75574195a6f4f3617a119056b616231a291bd0864527b31a9e30d9a98bed587821ce4b9d24c WHIRLPOOL f2652aa2be1cb2e47c43d16be1afdbeb482083ef017947c8dd4eb11ed886062269a49d2d6ab4a0f22492d46defb3d971b26d78a18834417909436539deb09d20
 MISC metadata.xml 400 SHA256 ef9da68c5b68be87d6bd28827fe4d32d8298d8e39d8e613cba62a1f3549f9ade SHA512 91b2813b92863323b87ddef275286a39914facdd568ad5a49bf7825250645c691be81588c4fc6eab00774d8f75bf6b228e6de6a8eaaedaa1f94f6f0b6a3540df WHIRLPOOL d68401ba313e0842ab8a86b28883e25f289daf51ba8c4a7ac58ec5e1c68ad0bfadeb3fb344c5f21520468e51da848b6aaab91512b1f62ebef207061cc493d96f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVDFG8ACgkQVWmRsqeSphOWnwCfY2N/Aokau9xLzvGYqaCXuLPe
-CvUAn36S8BpZS/gMG4sGeNadBBvfslXl
-=LbFz
+iQJ8BAEBCABmBQJVTg3PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOaZgP/1xc2enzLG4FH6YjBBmRVANz
+xCarYnaV/LS+yaJks6eJV5Xy9f7OIoFY7Im8UjA81YpCZRAQsAqseLux+N96cRtL
+FMkfcmBlB+4he2YKU6A266RAMzxof+ziq4wh4HJS52coKtMOt0am3zNX5ITklwa+
+qTrrOKEZmz2gb9dfGS4OK8zydGNHoiSLsWkKQhCNhBCIau3sjjWCeTOVGMrh0lID
+DhUs8VkWWHpjqOB/JuRyrV2gYPjrXeuN21POq0YkU52nvG0bLJYyc3oe525HVqat
+ZmGX+rODulbcRZeYxOA0fuVavhwVn+beFvnjJvvI+3dhkswBs3J95EaU6B8L7Fu7
+2S+y8Jx3VYC5TmZlnfh9yPdrpJTmNdw0hRqI1SIaZ3C5RcTPsQiyaVOPfX40dAlX
+Mc8V3nAWYVKgwR/nmmzn21v75XEsmcZu0lBMICBk/gbD0tcf4Ne8yFPbtOS3olGh
+0xcylfRmxo9RzdBxXySxFVEZ+EK/HJZcvQJhM/f/yGy9Vc//reTgqnsFaEK6OWwD
+fSf5NGzmPfl299H70aechEtR/fFKuTVfLk3O/vL5TkMkoheBs9UT5uPAsct8OGMh
+NBuQaBxSwpzmxekSfp8zVg9DdMCwMHoEQ2NArCNoXYJgojpbWDibxnEzim2UxyFl
+4BaxvchmNk5FHzKZkcV4
+=I4Kh
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild
deleted file mode 100644
index f25f17a4151f..000000000000
--- a/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild,v 1.3 2015/04/19 11:46:20 blueness Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Rime support for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-i18n/librime
-	app-i18n/rime-data
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# dont build data resource here, already provided by app-i18n/rime-data
-	sed -i -e 's|add_subdirectory(data)||' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRIME_DATA_DIR=/usr/share/rime-data
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild
deleted file mode 100644
index 0de62d9cc36c..000000000000
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild,v 1.2 2015/04/19 11:46:20 blueness Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Rime support for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8.1
-	>=app-i18n/librime-1.0
-	app-i18n/rime-data
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# dont build data resource here, already provided by app-i18n/rime-data
-	sed -i -e 's|add_subdirectory(data)||' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRIME_DATA_DIR=/usr/share/rime-data
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
index 82baa2baacb7..d7cdf99c0386 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild,v 1.3 2015/05/01 05:51:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild,v 1.4 2015/05/09 13:38:18 yngwin Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.8.1
diff --git a/app-i18n/fcitx-table-extra/ChangeLog b/app-i18n/fcitx-table-extra/ChangeLog
index cbd8e14af5b1..eb038bf3dd1c 100644
--- a/app-i18n/fcitx-table-extra/ChangeLog
+++ b/app-i18n/fcitx-table-extra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fcitx-table-extra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/ChangeLog,v 1.11 2015/05/01 05:53:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/ChangeLog,v 1.12 2015/05/09 13:41:54 yngwin Exp $
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> -fcitx-table-extra-0.3.4.ebuild,
+  -fcitx-table-extra-0.3.5.ebuild, fcitx-table-extra-0.3.6.ebuild:
+  Mark stable on amd64 (bug #540844). Remove old.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> fcitx-table-extra-0.3.6.ebuild:
   Stable for PPC64 (bug #540844).
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index 5cdb2965295a..3c21862336e4 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -2,21 +2,29 @@
 Hash: SHA256
 
 DIST fcitx-table-extra-0.3.3.tar.xz 3350592 SHA256 ae2bbf9146dfdeafb6220c9a738ddc1f0437da2c5f2da0d578ba4970bc74767d SHA512 ea100ba7bfc558395b678390bb787b15f674c13140ab22b5a9ef423e5114399633d24ec322904fd61d8f3613058744d08f615d4330ed948aad9dcff09818e36f WHIRLPOOL 10a61ea0aac14e9b55902276557c5b5daba17c14a3101d4e4e1384c8922c89dbfe96b1ac543e9ad3408f0951ecd7869a8c4c0d36d168129b2f78d611a0f70158
-DIST fcitx-table-extra-0.3.4.tar.xz 3697272 SHA256 c01ecd31bf2b34ffc413873ea6ba4c4130e46f7a131785ed75b0ba1a227924ba SHA512 8042fad0972963faba530652a50b43d74fc94843770e24c95fddaa034b18dbc558529fd3afb619aa98f3cbbd0405a54dbc5e4c3c23a840c9973691c54ce87515 WHIRLPOOL 2f7c34cff593b00b09cb5bd7428cf2c38c6bb2c2c3bfb10f8a5c3c1bb4dd972ffbdd013e56dc584a2b986555957895dee4f0029364568163b58a7a16eadb1f37
-DIST fcitx-table-extra-0.3.5.tar.xz 3697920 SHA256 d7bfafdc77d11c6080e62f4a34b67bd709ea88515342ff5b9462ea4b83144661 SHA512 02432660cb81be7cad0ad636f28a79964d91853b2a795c8fc5bc5a1de411b0eae6dc5b9d5ff403669c8cce560583770c63399364118bd6f2d2aa1f7ffe4b2d7d WHIRLPOOL a23b7a60057bd764f9f09139719221c9b7a851e7c191b109577c0efe5cde85e3a87f433b321c3547e543d3e07247bee4c674fef546403b822776e578a8fd4c9a
 DIST fcitx-table-extra-0.3.6.tar.xz 3694520 SHA256 9f80984d23622b90a7d5fbf439f54d7d46f6e2f640618b00079214f50a62a233 SHA512 3970fd9fb14afef5bc55fcfb8234c12951cf88a8ead9be1575ba3100d08f83f23c923093722380ca9c066d6a3fa065bd51f176b09815b0c85f13d8351a004304 WHIRLPOOL b296eb3198cbf578c4b556942591aee9a9998e3677776a8a6d5a4b80cc3e360d4b6cd784e88d5eb3714879d1ec1231d13e2ad9cca50439470362ae1a9473963a
 DIST fcitx-table-extra-0.3.7.tar.xz 3704164 SHA256 8933570ecd803a4f4fe932c983004e669d81b2f08c3bcaa532151545a42e659e SHA512 628eb7d2b09a3383ab92460dc8c2bc86771482cc84bdce847a394ee595423642dff29a39ccf31f56ea8de833f25e9d42952b55b754dd234d0831b5de5431d16a WHIRLPOOL 2744d91154d51d2388192ce313f4be2e839d5dc33e20622a68208e8e4f155883aedb7b4828e619a1a81e21ea4f893fb6806e59ebed66d842259477a7b4127122
 EBUILD fcitx-table-extra-0.3.3.ebuild 690 SHA256 1d3f96c87ae56cc3895be59fd1b3f2d71fd4f97f3cd520ef3c7cf4563b7bde16 SHA512 1584c3b987a5eba6a43cc48560d11f8f14aca9a0f14b01307ea0828a819a2482ccca4d140110eb25d36da6036f97f92380e8502efdef5e1660674a3705f28596 WHIRLPOOL 78bc63dce11a7851367214dc6db0461ebb8b2d91c9afefe7e1f16efc14b20ee5df4e4a226f9eb0cf60f72934a3987a8c16384afbe6a1ce99fd422682d2bad43f
-EBUILD fcitx-table-extra-0.3.4.ebuild 693 SHA256 10f299d5113fdd49c274412cdd514527292af14a485c8b7293d248384990e8e2 SHA512 0edcec8baaf30234b7c379a6bf348e9bdd9e02284e01688df8a7a4a93c172a4a24c6bf1fa8f8c602305ea6e2618a7a75e4959aacb7eda14fc27f69ad3ac07761 WHIRLPOOL d93f4a81166020b00441b96b69aa689755921ed13e7c8f8e87652d22cb82d36a00eeef9b705e3d6e34188e44aa80d32198381a36d13004c5dbc72b646842b318
-EBUILD fcitx-table-extra-0.3.5.ebuild 694 SHA256 11acaeb8c309ecce2d7650cf304a8448635f2f5431c4ad2893556776433badf8 SHA512 424effcb10819e01fde41512e492ae5c1f6260bf847915043790ff09166aa775d3771dc4cd5a2b5eed21f0d3afef15789c1b16313205902f1f907271a0d22294 WHIRLPOOL 923b045a644456d2cbf17223a0cdeb7602f554eaa1c6587718754c1bd03980e6e0f26cd8f7f1d74239678a6a2acede8bc50ce9f1e0eb79fd698bed91a46ac4d2
-EBUILD fcitx-table-extra-0.3.6.ebuild 688 SHA256 4f9ef95da5ff5b7f40e77cdf4db1d18782624bd81b397dd25964500b201a5e4b SHA512 762448a6bc5118086ed265ee6ba2f0be453db241c9dafbd4a5beef58560062eea1a16aa59034344d2506870be8f2b4b04142bea986aa98c1ab41115e736adbf1 WHIRLPOOL 34b85d248bb6d9a97a506055f65088fb0128d975b1bf25ce98cea8252d14f53c22db7986963b966a6a995d3275ff1c1f3a15b4b98610d97bf1632d1e5a3414c2
+EBUILD fcitx-table-extra-0.3.6.ebuild 690 SHA256 5fddf79d5cdfdeaa7fbe303af719748d88403a3324aee9cb37d95a3db39011a7 SHA512 3da068bbf9e185ccd19d1df66dce8c4a3369b59ef63d64ce957a95073e3f243db53d0bdf7a43c191e092ca7a6361e3f78026b6833c226431217d887acd214551 WHIRLPOOL ed0e8fd1d791f9df7c79d9c662f2210fd2b760f55a6b1542f6fd58a0dd42139220559fa840bdda7a0cd301ed3c804e5529924346965d5a53530ef9ece829f1e5
 EBUILD fcitx-table-extra-0.3.7.ebuild 694 SHA256 032ba6e0d31e5af0228ba860eb6e002b3e7a1694b3b0a475a09f27e0e3ac6b29 SHA512 443479c85dd11539b9d8156491316a0920d28f34e1da61b98c177108fdf7d88d19647c0cf6675b9a52203ed939ae11875eb1b51a372ad969e98979752ac0dce7 WHIRLPOOL e0e6a3587959b10e5aadf416c229c66949e4d0824b54467abea71f3031bb0631d29757e4fdadfd1c57e026c6270634ecc656f0790b7ea32f20c92edc9c205234
-MISC ChangeLog 1821 SHA256 ba4eb7c0b196b24e4e6721a6a4a299e6c95bac940337edaee1a266a082404a1b SHA512 e2cc11c5c550957707ae4ec9ff160033785e4cb114c026de4ce53bb57c88938b60ffa02dc8ee15b75e3b3ba786fde607ba0a1fd8f15f8ca698757a0bab6debb2 WHIRLPOOL 8323eed9770c3d7f3ad637697ea0f9264b2eb86030405f1e7f77939fd55cb362b97d968e53f80ac1f6d4d3e04e9d9626bed169067ac953ac9bc487fa6a8ac678
+MISC ChangeLog 2023 SHA256 d3ad4d699cfeacb00ecbb0c3333d613d9fa3a37c721aaaa16468c475d6e88de6 SHA512 7dbad68694b52c1f0093177afcff773a02e9121e0008ce5045aed33e8ad791bb0e2d157a3a274cdf7feb6f0e0e253ca93fdd29bbfc17aab423af5c58153fa08d WHIRLPOOL d20c8ca309851ae2e37b87f888e00566d5337b12754a5118184d9164653a27a26b48c01a08d37fa50d6fbb930a254c7a3cb7baf6f8b1a5e15e9b71de331e8bbf
 MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVDFOwACgkQVWmRsqeSphP6KACdHZ5lxCFW/Alcyo+fGGR3Q2Ia
-NREAni2cljG46OQRqPFllOZ3q9kGbwZS
-=nm3v
+iQJ8BAEBCABmBQJVTg6oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOz5IP+gK+8XqfIZ1nY40DZBnNXeMf
+NoKDTTzV6j0/27Xnp6mzmBKpzKsPCsfiHHvn1VVhMc1rj20hZe5pHN+ypmEYEMMF
++NNvSFuLQnKEOHT9OL94MCnNkeft4wyIEnWmFkM9KWVwdrvGMtDel/MPsDKzIALk
+Ykxoubm12TNqJ5kaQE/fgYKzgq6OdRtECpreiQ3fw6m7a2TH8xzeopxq4aA6c+QV
+GafQDC88RNegPL2jTPI4lIJCzmsRc8O3Tt3bM7KxiJo4kr7fu8FDTK9Uu/neGiVY
+I/tO+1nG9QSMYH0vY+D/d/gxyRVV2iwjQO2zq6RyXCf6Pn4lQM3gTedLllvNafuE
+msBPPyKuchIokwtbyGKi0j7sjB5Y3hNkPxoPN8rhBy5w5jfqqy2cM1/2kAckvH9r
+nw38ZitKfZtccySUKmmGwsUacQcP9Z+ULNjn9r5FccDy3kWtzmCsh68S+WlB80Rn
+HS6wdU/kJDIl2VLa+cqMHN00+P6SHSkNCe2d/GCVLfNdfO4Z9N5poCkYB+wDiHRe
+x0XHE1udCmN189+kvA/z9sGyTrmLmA372aaeiiFqeVsR+lpLMX6BtvVhnDV/T0z/
+/oiKAUS2en9l+ITbItiI9jrfbVG6HELm6HPWC3PteP4MHpBRycbVj5m+5moLmEBl
+lKR9CzaxkdoS1Dm+Tq9W
+=y6Ju
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild
deleted file mode 100644
index c6b229e23f3e..000000000000
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild,v 1.3 2015/04/19 12:06:55 blueness Exp $
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie and Quick"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[table]"
-DEPEND="${RDEPEND}
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild
deleted file mode 100644
index b7da4aa2c50e..000000000000
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild,v 1.2 2015/04/19 12:06:55 blueness Exp $
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie and Quick"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[table]"
-DEPEND="${RDEPEND}
-	virtual/libintl"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild
index 492289df0b9b..afceef30cd73 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild,v 1.3 2015/05/01 05:53:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild,v 1.4 2015/05/09 13:41:54 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils gnome2-utils
@@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/fcitx-4.2.8[table]"
diff --git a/app-i18n/fcitx-unikey/ChangeLog b/app-i18n/fcitx-unikey/ChangeLog
index b091997bcffe..69585842b435 100644
--- a/app-i18n/fcitx-unikey/ChangeLog
+++ b/app-i18n/fcitx-unikey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fcitx-unikey
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/ChangeLog,v 1.10 2015/05/01 05:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/ChangeLog,v 1.11 2015/05/09 13:43:32 yngwin Exp $
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> -fcitx-unikey-0.2.2.ebuild,
+  -fcitx-unikey-0.2.3.ebuild, fcitx-unikey-0.2.4.ebuild:
+  Mark stable on amd64 (bug #540844). Remove old.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> fcitx-unikey-0.2.4.ebuild:
   Stable for PPC64 (bug #540844).
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 0888b9a56579..57f2fd784f3a 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -3,19 +3,27 @@ Hash: SHA256
 
 AUX fcitx-unikey-0.2.0-cmake-qt-option.patch 1664 SHA256 3f55747effba6e0fbed6edd0fd79a77b38be7bbab3314bf5d1f06affd50acd1b SHA512 873879e98423c992b2acfae979a7a08ba6ca54788de6f1c909c7aadb91cf29e2f461dfd3e9b32c5e6a348ba2af37a7649384901e68b1ca44be7610347abdaaa4 WHIRLPOOL ddf5cc93f920dabd71071275dda08c09b60dca62f8f05d4b4d3c5fde4676908d258021c82a8fb6ebd18ec06a21abfb0098fdfc2627179923f3ea57adde04d7d1
 DIST fcitx-unikey-0.2.0.tar.xz 70944 SHA256 152da48ffeb665fc5d88202f6491fa5f4d11284792c2ef079bea4a94c8b125e1 SHA512 10c5c2c5b7e4f40710daccc485b220ed4cdadc6e866636032873a86f9f8489490a42671c9d02aedbbda78a94e40801dd888efc9b692d26ff81fe6d1fe2e10fa7 WHIRLPOOL d6dfd445bd5aa98ec28ab0bd9668f288d67f27874ecdd079f78956172f3d5695fd990ce9e70f190a26edd1eab4f48a8263efc8682fe93679a85fc1db2f6745be
-DIST fcitx-unikey-0.2.2.tar.xz 71612 SHA256 d9f6f634aed376d230f0cbea1ccde1eea92760d442af05a00884fa5527b0e378 SHA512 71a0773222b1172943f80bce904da77c136225981a0580d937327829c8d734fc65d9c4afa5275bd210ca837d7a7b9d8bfb18df96f62710068b9883a22499fbfb WHIRLPOOL 4be68ab5f5326f63d8434fe316544b03abdb1a4fe5187a5bea9c812ae42d604f92897de0d653234006c4e46501a458d2d8b8681763c63d9c25a9fcde12d4e6ca
-DIST fcitx-unikey-0.2.3.tar.xz 71628 SHA256 e5c943de52cd892e55d7dee05ebfdd431f921fdade85266043ac99b93e6888ac SHA512 5826022312ad307d8a070cd3ab77a206a5f73d6ce5337cdac4c75ec9a436b055ca0e28fcc7baf2f1512b2cb92c779002a8fc41ac01cdedc3dc669355d825a0aa WHIRLPOOL 74d1d5dad7f4d37242edb787af060e448db6174700878b0bb46b55036282b73eba2071d1b22e0deda9e44a086c82b1dc6b508e766aa04dbc426b6e19986b5cd9
 DIST fcitx-unikey-0.2.4.tar.xz 72308 SHA256 726e5999c00e93856639258298688c835db1e80e4ac4d5ff0786433c0593c195 SHA512 d55fe71bbcbc420e0ba3ec61ad3c7e9293e33f30b6303d90591d5a94e89d7bbc513dc940ae5a081b81c0d973fa6674872a695eac03cfbbefb460609993219221 WHIRLPOOL 9178a4ec7bcf0b6f969295bef0b066b266e336352c52f9a8761cb1cb6456df6c3d90a90d90212c2fbe137ebc07a1cf6b79f82e959dc6ad3806158675ee040fbb
 EBUILD fcitx-unikey-0.2.0.ebuild 886 SHA256 7401432f6cd5973b7fef14406b9fbd5a2cbdacb742870b532b69707ceb645a22 SHA512 a6843e226c88e27542a2567316216f3d778ff2e171bd6c59657f4ce5cfd857a7e552b9a71536cfe2a2c0b622d357fe115c891a8f4764d30e8cd37c0b9742fa60 WHIRLPOOL 287492978b770b6d03b2d010b098861d68cf20710817b86200f71b07262a6a1ca6c414f76a577bcf214dd0ad2a73eb5547d76818cd4c59ded389b90a8f709d5e
-EBUILD fcitx-unikey-0.2.2.ebuild 759 SHA256 27e518af5faa4ba0c1512ef0dc20497988aab04afbe9d115a09dbe0754329350 SHA512 70ca54049c9fe63ada93ea2d91f2f64e075d599eb409e691b383e12786f2142bee8fd5b48d88cdfc6d01d7f6911b69821b21d99a4ca632d5f818b5a168fb9243 WHIRLPOOL 2dd31208216a3a04c960836a81145f97d83b0d9eebea08943159277b0ea3a508ed4122add9b7439444559c2ea5a7b79148b5ddbdc24b640b72c71aa76b4234b8
-EBUILD fcitx-unikey-0.2.3.ebuild 760 SHA256 5fb53e5e1f12fade3ddb63bc2747a4dd38ada82c18f4d5ee61cde2c8870fb0f0 SHA512 ef5cb9705e4a200c3f7e81f67c3491057898377ee10543420388213319b363e289556dd18394b7decdfd1ec0ddb80827071219122d4558807a0eb275884a222e WHIRLPOOL 8de19e179883a3ae059ac03b0fb42c1a7ef5a2ab1baaef246150294fefac88cf0b5b41810ad890b1b5b58ce60481ba1b19a5efb65316f706c07c489bfbf2bc45
-EBUILD fcitx-unikey-0.2.4.ebuild 754 SHA256 ab525bc977d6680a92872b29a18363ff83b436eeb8f154880c59fccff0fb19a4 SHA512 d54a758368d5492771f92d854c77a0ac72bbcf9d77a958e1fbc1985d7d5ded256d33c23a9d61a696eaae82e01bc126a84857da1ef3cae37f253a14a854d2d366 WHIRLPOOL 6b4ad278f50daaa85c1f3082f3bf2fefdf9f039bba1c92fe2e3f322a3cec7a186b601f343bb8ec7d4a0a3665fbd2790b173c8354ddaaa02b371c331cc02131ea
-MISC ChangeLog 1604 SHA256 83af9b095c7382f6ccfc54fff6a1b471a16ad4d26bbb888a47e908bfe23afe4d SHA512 8c98e09e80f57ef6ae4e598e3a5bd3904b011f3bf726beeb96f07dae41ed09aab6d12008bba99bb8ed7a05bab681fb97abb998f93a4f8a50daba1b7ab6541910 WHIRLPOOL c3a37f221f1ec2a9e910f26302139b907199c07bf210373b33b907bbe1243035c124f4c2999615e940bc3c972fb9f079253cad72b0fa0efd2280d579d8ddc504
+EBUILD fcitx-unikey-0.2.4.ebuild 756 SHA256 df4006f3263b1c5cc8d71c1376150dcf5b0c1692d8f741d2556d3c08f8096761 SHA512 aa4e0920647ebb0a211d78cef24954347be1ecf1d1b28f142b259ba774bdd4e128b05827699de526e7f3b08781282337536fe182553cd93fe7113e361a4cfd57 WHIRLPOOL 0f3ce766a6507749286ab94920a73199745fe97ff9657587ba2d75ecf51c8d361f5cc172e46e99cf93d10383c811712b1f2711c2f56f99bf0154357d060a9500
+MISC ChangeLog 1791 SHA256 38c01ea949713b3b27ddd895b931c8f190e31ab09501424f3a6294d85740ca45 SHA512 0c7f5bf6eaa51a4c93ee6c69574cd1cc8e09fabc94880d7999aa699b4d8b0bbd0cf4572ced25e4949fa16f724719bf87ee4710f2afe1f7969d67a7395fb3cad3 WHIRLPOOL 79cffc5361cfd803e3d840afb48f247c92dc5423f5a0d256f5ca073de8d37f62da908f05fa583f12a0e1c448d7500406821df574d48346eb4902bbcb3f412318
 MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVDFY8ACgkQVWmRsqeSphP8RgCfX7djtGsZFsdpe/oZKgvV+dzT
-c1UAn2BwY0AWZpi3d8FMuvGjPFxTwILs
-=296q
+iQJ8BAEBCABmBQJVTg8KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOP5YQALCcoF2tkwiQTlbphOxhngIZ
+d+mnTgNEn/Nix63WdwfkQA82Zq7Ios58bjeQKtwB0w4XASEC/MKR/Ocs2BIfyfc1
+W6+HHFAuNlJrzFW+fJkguqaNz/Isgj77IM34v0v4H/8JYssJ5ckhagH9lH6wFF4G
+QGRPOKahInfEZy1UZNOXwtqhARQHtv/5f+54Y9LaEEyWfWeHq/R+oXh4FQveiHZz
+9rMO+8npA9+JaDJd8msZGjCLVu9GjCzFW5i25X4dCwJiPae1586HOMtT7U61tlnO
+a353LAHe57P6xYLV31nvnyp85LjL8yOIDXxKEDnXjmeuWiNraQ2weBpKnbWXKAK1
+k3lkOgp5CLFrj++kHhIhfIIc3iN5mPIxCWEf5pJvyiygNB6F4i4BaXWVpy1m6bE4
+/IO3DBvvC41AzOe6lne+C5r7BvIejMZDyFIJAtYvUZWM487SPoSWWPcSMq9NtbiB
+dyiwJj/wScGC8IUFEQh8Prw5fETO1zKzQcPcCeFNy0SFJ0wdSvHxIFa34ke8aURR
+tZpF6cfWs8WpiLO+SqqtaNFCVKNE4yQWpqa1EvaeMyBSmuyI+jRDAuvEvOoUM1lh
+EPEOeVIQCVW7FhX8ktv5OXQSwpqPqLH3oCuZNL2xFI6WwMqgnF75uV9lxAbz02L+
+m3kvRwalw9dHImTHUumF
+=WE3A
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild
deleted file mode 100644
index 501fb53715d2..000000000000
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild,v 1.3 2015/04/19 12:05:06 blueness Exp $
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Vietnamese Unikey module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="+qt4"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable qt4 QT)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild
deleted file mode 100644
index 2c030e8dd38a..000000000000
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild,v 1.2 2015/04/19 12:05:06 blueness Exp $
-
-EAPI=5
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Vietnamese Unikey module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+qt4"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable qt4 QT)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild
index 78a6176cbd9b..7df2f95b1de5 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild,v 1.3 2015/05/01 05:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild,v 1.4 2015/05/09 13:43:32 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils gnome2-utils
@@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="+qt4"
 
 RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]"
diff --git a/app-i18n/librime/ChangeLog b/app-i18n/librime/ChangeLog
index b32f787e9933..50a1a85f43ea 100644
--- a/app-i18n/librime/ChangeLog
+++ b/app-i18n/librime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/librime
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/ChangeLog,v 1.20 2015/05/01 05:51:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/ChangeLog,v 1.21 2015/05/09 13:36:56 yngwin Exp $
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> -librime-1.1-r1.ebuild,
+  librime-1.2.ebuild:
+  Mark stable on amd64 (bug #540844). Remove old.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> librime-1.2.ebuild:
   Stable for PPC64 (bug #540844).
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 5b94d605c6c8..db78adaf5714 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -7,17 +7,27 @@ AUX librime-1.2-BOOST_NO_SCOPED_ENUMS.patch 6887 SHA256 1749de31c37626d7835df60c
 AUX librime-dictionary.patch 409 SHA256 a64e70aab186d14f2f0685bcaea811dea69660f7dc30f3a20143ae2d3afc680b SHA512 ca529ab32c5453e338c952670071fc2ad489c8785ac2336811ecad31f9e09f1fb0d081b68f61fac4b53f65ebeb3067e3ff499292ec7a3da63f51d3148a7cfd07 WHIRLPOOL 2310b349e18f2f45da856212cc98d7cb88a8c4c8c8c2029b194cb6aabf6cba49d939e258c8a7839c6fefbde4422267f93d494153f420ad2af850a5d3fb0d103c
 AUX librime-test.patch 1398 SHA256 98ad3c51d59ed64609bfe698568fad6764878cd5715e5fd3089cc0d084197fb3 SHA512 2fba47701527439e74d5511feb70dc604ccfa0d3eb8a402812b97617077ef721b8d7ad07b9a7cf7b69e5204f58a7366bf8d6b114c89a39f50f69a039c268e09b WHIRLPOOL ae6b711eb30b141eb0db6f9c19cf415bc2ac1ae0367bea8127c1a092d6868fe3d17a8d91dc3b66c0b1f4fb92abc77cdaefe0a4400f0b63680d8d9f92f662d46b
 DIST librime-0.9.9.tar.gz 2548968 SHA256 e828acc853a5d9e3ca191d065112c410183aadb5bd1d021704f82a8644ff6fd8 SHA512 71b39e713d5bbb73441dfb3038be6dc04518d2169df336e7fcb19b4c3b19a48d7db7c230fb1107148f3b7d95342851d23569617ff8138200c7ef1d750060c00f WHIRLPOOL fb5798491352eb1682a2bed7a73486df153a2479eef0adadc00726ab958b50606e32d59bfa8ded86c3aa35bac5e120e4251903fcb54326936251f1f3af726f92
-DIST librime-1.1.tar.gz 2630430 SHA256 f631557f35a1abc4bf176c44fdca6aa5831a61e738798e6a70b3f1d112e4b1dd SHA512 deb0142fe193f7d445f5008f2cfebb813e4db662f5c474dcb5b8d9f1a9ea8c2e7dc384f3dfae32e7fd13c08f55852124089db08cb96928b98e94128b10847af0 WHIRLPOOL 2e7c77d0dd03183be20ef04c21cf68fcbabca49c6c93249b724bfea4aafd1c211cbf017085db355c58d89a4b1a449b59a3573d0c659329b9e53cf93a76b0350d
 DIST librime-1.2.tar.gz 5199581 SHA256 fb04a7e0a4eeb2f25031c9a366cedfdab641ab06960f50c42febef5195de9381 SHA512 75a771916a58b1ab678dbf05ac074a651cea077e81d25e4dfd0ea839fabe6cf606135851e72c19d6a8a9c6ed66b89928b90785f282e8786c375bc1d393059227 WHIRLPOOL 44a821fc4e1a562cb01ce7c28efc5a4fd3ca8e9d2d4e55ddda3434b677a17b59d7114a634bfd95ae53072f0e6f2e5f027b2c81ab70fa51b011934c7c39fbcf51
 EBUILD librime-0.9.9.ebuild 1014 SHA256 442108fde766d404976aabef941abdf1bd9921c76c2d3730404cdc59ff8a7f30 SHA512 ff2a1816316bcbd03deb65e56578c8bc0f8c72a47d92ffd13049785b646b0715122b4d0c55f8cdc7f7f67415b91ad2461d4f7a0c061d168c25db6fccd8b2fdeb WHIRLPOOL fb9b94c04a33d1f0819fce3a1594b6d4765ddfb267b43fb0462cb618a9e9840174dee2d3ef990e07344df2eab7b8938f0dff860558f9eed02b7b244b49b43274
-EBUILD librime-1.1-r1.ebuild 1127 SHA256 6dd6fcdbff4d0e0fe3f01f6646b55416748eb74877af6d505863ea2c3b6ce802 SHA512 cf1213b30c63ec60d4744aa97c93243b74dfe3bdecdcd26ddd2199ac4935f1ae3c339232e35280a7bd341e1e995e08c37f60d122926f5b84f350bfc31a05b534 WHIRLPOOL d91e46c1ab27ddfa05802f8abce5f42212c021cb73ad76a166bef421f178950990f484c99891de61cf2de921aeb54f3ae26ec09f209cb81d29ca54d76a22ef1e
-EBUILD librime-1.2.ebuild 1142 SHA256 80d0900a2b8b75231924a04d62531ddb3976328bf18b703f5f6eff890393af0e SHA512 a414c46e7b5a9e2bc71ff639b2e80e7affb1e37b6ae33d0fc423387fcaa04d6113f84b06cd20f6d1d06cd10943820b913b7a1271bdcf1e713f9ea504021ec56d WHIRLPOOL 4f8bb9a0810c416380bb27bbd81ac5c3a6b2dd8c07a486d44fab7529352ea2d3136aa2aefb201ff9c4f487e2f0668f1428e1016a7d66975404c5fb485ac49719
-MISC ChangeLog 3174 SHA256 abcb878ddb72802d646f4889d2088f5b05a69a48ed9cbec50c6ab5528ca21f07 SHA512 5847728152526a69785585afc51feb28c5e13c3dcfb05575f05ae623ca59f97f7f725b4a2fa448a7d9606246895ea990066ec2119cead6308a16beb309dd8ee8 WHIRLPOOL 163db60eefd3810b603feb0f972798a4ee734f435b05f896d77c6fe6ecd561391e3036faba0f3ad61b7872a123fd285c4a856a9c82161f60b07ada9e49220c41
+EBUILD librime-1.2.ebuild 1144 SHA256 a82e4f0772a8a9b7da2e34f47cb2a34a03a989206b3fee501f6acedb71b377fa SHA512 91cadb1eeb6bdeaa6c5a9b9d9f86eba3aa79285910d8eabbb3e8faa33cc61f5ba6cc356a653a53f0885dc59f2bd0ef6602ffdae09554e0b1a0a46c7daaa2c2e0 WHIRLPOOL 653963d75608572e4f993b721499b6c4bba73d0014a294758120fcc51f47f03cc33ca587e01b7041c09793d0dee80cd9f5893334aefcadeac873920f2520c285
+MISC ChangeLog 3322 SHA256 1d5b9b9ce52e660b7dc571cc70c7d7ec01b14447a4c6029a481b733c422d180a SHA512 19325ca6fb92c4ce0bb82757a8fd0be33ddc3dbef5eccb3bc70cd8843c6c9cadfce7b98baee22ae1442f7c49785cbc5da2c613471e2a3f794cef11de9c8c718f WHIRLPOOL 56d910f0c173359ae55f8e3898a38bfac1cca797178145e8f514609905a8888846f3dbfd7dc014257bbab6128df7dcb730d73e9e9640ae98a472e801dfdf473b
 MISC metadata.xml 504 SHA256 6739836ad17462f6c792d322a0c5f63b1e2808127c3b647464e7088ed78302fc SHA512 9c1459de074b84b6a645cf3716477c51b7cd7a6063b7fe6fcd2e0b87bac9890b3b4a62c86fca57277e2fa5f440feb07aa34b99b802a6a30b2d3a16a915c48cdf WHIRLPOOL 6e080ed0ffa04b47fd97cbba3348336c936d90906db59a8554a8671f24d581eb7523b359faf342de27f203439a4d4e693646fad7ab6de87781d1991e912748da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVDFFsACgkQVWmRsqeSphN7igCfbRyg1ppvHXZWuGv+h6hzuTc4
-C5wAn3ma9OXecXiBNTgjn+eVqZupGCWi
-=L7W5
+iQJ8BAEBCABmBQJVTg19XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOiawP/At36VrKFGjCi0sRoZgjdOgE
+p8P61RBgNdw71JYeHtGAvnwLJGt8mORTVrnTV++nzTpmzmZXdDjwRSZxZr0qs8uD
+9bH1NKGd3pFUNrlKUJ07mN0SgOxshrn244GcHx3EID0SJuLgGKxkIBPFhbbIjs/P
+3j4lFfH3Il9vuMhBqHNWxAs9MB5qEhsMw2cxZhz0PxyfCOp6eZ/hjpjmCI8oDwX2
+3nKeO3OqDBMOp0Q8NNY/N+UJnFei7ePjenXWdIH9eAYVnE4idxAibujVuWGQ1fnM
+gcHxOohfdLWECOvKbnxBkkyjEMnzxI7BK9EJPJWw7bhRrRvy1ykl9clHduUfuqjQ
+HxUtcpo+/sH/hpqZ1HJYuD51yXKE4LLb7xRpshhe3xkWnpaB5nG/w0ADzTYdYSeo
+w9lM0GcM4xdGSXLuNp2lGOxYmWw9g69ZlosDukDBcIEgbp8QSUU73zEyRXUmj3I4
+mqMBV3B+UegKWStIDyxx3e2CfzGnDAmqt1rRjlm5gkQB6gruEr4En35M3BrAQKe4
+toA35spQy2Et46IgB01bBIeXvl4mRKGY7xxw7D28ZlNCdyGGm79YYz8jMD9JuBGw
+zqzipmtPZuFQDPGgGTcWhamjcnW9UYa795kok23Fsu5ose5XnhADaVQPu5r8MLdx
+8adRXH/qPmCXZ4LA5yH2
+=mESx
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/librime/librime-1.1-r1.ebuild b/app-i18n/librime/librime-1.1-r1.ebuild
deleted file mode 100644
index 84ad8f0d198e..000000000000
--- a/app-i18n/librime/librime-1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.1-r1.ebuild,v 1.2 2015/04/19 11:37:13 blueness Exp $
-
-EAPI=5
-
-inherit cmake-utils multilib versionator toolchain-funcs
-
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://code.google.com/p/rimeime/"
-SRC_URI="http://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="app-i18n/opencc
-	dev-cpp/glog
-	>=dev-cpp/yaml-cpp-0.5.0
-	dev-db/kyotocabinet
-	>=dev-libs/boost-1.46.0[threads(+)]
-	sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}"
-
-#bug 496080, backport patch for <gcc-4.8
-PATCHES=(
-	"${FILESDIR}/${P}-BOOST_NO_SCOPED_ENUMS.patch"
-	"${FILESDIR}/${P}-gcc53613.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-		-DBUILD_DATA=OFF
-		-DBUILD_SEPARATE_LIBS=OFF
-		$(cmake-utils_use_build test TEST)
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/librime/librime-1.2.ebuild b/app-i18n/librime/librime-1.2.ebuild
index 1f4541715cf2..963af7976037 100644
--- a/app-i18n/librime/librime-1.2.ebuild
+++ b/app-i18n/librime/librime-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.2.ebuild,v 1.5 2015/05/01 05:51:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.2.ebuild,v 1.6 2015/05/09 13:36:56 yngwin Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="static-libs test"
 
 RDEPEND="app-i18n/opencc