Honor LINGUAS setting. #402891

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

8 files changed, 1410 insertions, 15 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 4f514b0e3c91..755ead1c1834 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.260 2013/04/06 01:37:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.261 2013/04/06 02:45:32 naota Exp $
+
+*uim-1.8.2-r1 (06 Apr 2013)
+*uim-1.8.4-r1 (06 Apr 2013)
+*uim-1.8.0-r1 (06 Apr 2013)
+*uim-1.7.3-r1 (06 Apr 2013)
+*uim-1.8.3-r1 (06 Apr 2013)
+
+  06 Apr 2013; Naohiro Aota <naota@gentoo.org> +files/uim-1.7.3-linguas.patch,
+  +uim-1.7.3-r1.ebuild, +uim-1.8.0-r1.ebuild, +uim-1.8.2-r1.ebuild,
+  +uim-1.8.3-r1.ebuild, +uim-1.8.4-r1.ebuild:
+  Honor LINGUAS setting. #402891
 
   06 Apr 2013; Naohiro Aota <naota@gentoo.org> -files/uim-1.5.4-gcc43.patch,
   -files/uim-1.5.4-gentoo.patch, -files/uim-1.6.0-linker.patch,
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index e92a92add2a8..a655e63ece78 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -5,6 +5,7 @@ AUX 50uim-gentoo.el 113 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a
 AUX uim-1.5.4-zhTW.patch 1034 SHA256 82afb0a1cc1c2e706ac02da71084fe16655bbcb9719710ae37057ab6c14b9196 SHA512 0fb31957a74b49bd2ca335357b8aa177dda4fb90687b8ee4ce86595940d7fd36b82ccaf12850d658dfbf0e7f2e5119dd26ecf9246806d854cf22bde633687aee WHIRLPOOL 77ac84c09f36888817b0763db3ce4f7ff356f15cc3dde44f7151ad55261dd9516088934ddff5aaf6646df2d28977d774cf9146f4f907e67929ea458aac895e3e
 AUX uim-1.6.0-gentoo.patch 381 SHA256 c44e97d8c4d2125e17fe0d8107ce3d258c930b9dda3329eec170cfb291ae6c80 SHA512 c5445c74269aa51a07fc41e5ecc05bc6c4e73527dd6780e13070efa4f9074f5a3eddcd150c38981393cec5d883e73ba55e4b1f3d460aeaf40817ce60c268f417 WHIRLPOOL 2ab3952deb6d52a70870535f07269e104546d35a0cdfc23f92f01ee5be9dd8b9d10bf3bc320b802adf0b1ecd014825279b7dd12d9fa500428d45c6531c428dab
 AUX uim-1.7.3-glib-2.32.patch 582 SHA256 a65524077354ab2811ddd80347977de5070715a9ad002b3c284ffce74ab68553 SHA512 0339014da5346b2c7a9aefac139001218727ac2d053b5882f15e73fb1167c87843daf316cfff9d7c78e8ac655dd88299b1c96920be5e7d84529341c0e6b7550d WHIRLPOOL 5e9da23a4e511db4b6ae0414f8a38104f8c56f16384c2a4aa7c40feb8bf39d0a3eba0de1f732be7538be8436241d03c1830ff498f1d31ca767423e79c2100a15
+AUX uim-1.7.3-linguas.patch 137 SHA256 e213b04dbad4439af5382287dded96cf2747444f2e60a110d46a84e0d25e5994 SHA512 adfde364e566adc42eb2f2c5c9d2b5265cb6773c7ba70b79e5eba3898b8de21b50b1df082d299e75c00b1cc0efb38b9f254a8b38c2e70bc4f4a21c04a1b10c0e WHIRLPOOL 870f2181668bece9ea1817ca7673b414992c1ea04ce20e5e1ee539419b477ec7013b74c38104f2faa017c336a3a5cec3d700b761259bed3ffb5f1129c9b50ea8
 AUX uim-1.8.0-glib2.32.patch 365 SHA256 b237cdd32786026db77f44a814b50bbf1eef6d822a3e233309a000ae3996240b SHA512 6b5c6fa860935fd5175259178686c131fdc5ef3e5ae192ac197de7321715a326c5555fa04d30369d288882ba4ccb857f9645e3ce1e89c6d60a59cb411c23f288 WHIRLPOOL 4e5e9d9a754c8f6b87be43d6c69537f65823da658f8b1b70c3c67891333a6057195125fe8b8b0c6c144b5d52a43eaccf28ce41c5520c2dd206e5c9ba564fee56
 AUX xinput-uim 108 SHA256 972c38f0c227cdf2ace54fa3cb0d0095864e88cf38c73759645151e3eae4b548 SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc WHIRLPOOL 0ceb8889d4771f09588d9c53a73dc557aa09a00587df0982620615796d0530ef2c9604018f25dc50ece679ab55ea68b44edad96ba06f91950f0b9fd2200d32e2
 DIST uim-1.7.3.tar.bz2 6380469 SHA256 d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c SHA512 4879595417c77c3c14e579b2fa6e393f87a056910f9eb126262eedfc39c8b45192e8647c45dfbcd57e0a8bc074694b9988c5d5bafdd99942d9d89e90a66fc14c WHIRLPOOL 27e0865ad63d5daa0047927b7dee89097e39efc6dc4d82915768b5cb3deabc93464cc7f9836d22a620d530834dc03af2fe0bd5ae4e1390e8164520579f26d6aa
@@ -12,27 +13,32 @@ DIST uim-1.8.0.tar.bz2 6453678 SHA256 bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06
 DIST uim-1.8.2.tar.bz2 6480613 SHA256 44c2003179291b3279dae7f911d638418a54910f2b99e58418acc88e10067835 SHA512 4433db6913611c753c896e89c79880b87bc55cf0888eefbc76f04e72f8b4d0bf3a97e355e9beeeb51f6dabdbeafaf575399562585b44717a660b8efac9ae80ab WHIRLPOOL 0b089785a5e0b12abbeb6edf7cb5dce162e15e1fef8ea17475511d0a95f733be616bf00dc2cebc6833dc611c31655d1ef5c5c584325ecf0160cbaf4f48a871cc
 DIST uim-1.8.3.tar.bz2 6493892 SHA256 e701e01c3b75512de9ae5b451bdb0a5f49bb444186c31cd5a1ab4fbaed4b3b6e SHA512 28e7207ada6b12ee56017a620b6ebf03ce3eb02ebceec79f43236caf0bce4c3b6508c4d4c2cc3d1705b77d1033a3b47a0c9d0d0d78005217acb4b6ce8ee6bb99 WHIRLPOOL 33acf600f7f6126a04ac2cb1139e28cf1b3e47bc409822016b20f5dce8aa5ca04c8d44ac5985bf864f0fb451748df049077e221dd2d3456f520dbd4e4352a11a
 DIST uim-1.8.4.tar.bz2 6494902 SHA256 16541b9dfe7e5b0f6c06d9b07a19e6b03de2d1dcee4669f8525e48dc552d683f SHA512 b804757f07f44212c0fbb494c2591536cdafd223fd12cce21da68c1273d14eb7156d4186eb96a3969edfc76cfb448d96cf45a9f7d59bd1dbf4c5faac754d95b7 WHIRLPOOL 5bc6a5ed58a140585089c697a54d8bdb5be52888f5c54fe46314e039094d7706814c4e43f64ce373b280e7790c8d851e5b0946ba5dcbb255c248dbd5ec28e060
+EBUILD uim-1.7.3-r1.ebuild 7730 SHA256 002b9bf62dd0e14c092e65ca554c74b808a17a2bdee031c3d6a5ca05c39b1e16 SHA512 3c7cdefe09a9e891f4d650ffe82fd122b549b60895d4553e287c9bc7f2ae6e2be8c62a74d4f421917c278363771fc1286f9092e483963c6cef2ab9de3fc6a8a1 WHIRLPOOL 7b7cee5671595665ad0ea3fb7b108f2f54740a9a389f08e36282090674f16fd0804054f070ab1ee733d4ff4142d4426488f29d8a9363ff509fd4fb7028ecaea7
 EBUILD uim-1.7.3.ebuild 7549 SHA256 02fde92ff08c883ed4c646b95963c38ab79fc413074544ba69ae5ec087b3e75e SHA512 bb73e6348606ca5928585a524e2f3d779b5db547657d993a01eb377702d84541bedbcb9fc4ed3a5cfcc4a452a8cda8b0bfc2f6ae9faedc233b07bc185bbc308e WHIRLPOOL d5377009c79b44778ee53cbc46439bc22a4ec8994a59171d67d148e17e2330bbfcb498623dda1f83093357e600361904e3b465d65ac73c04ca3d5dafd48dd550
+EBUILD uim-1.8.0-r1.ebuild 7166 SHA256 81313268b7d4fdf72f16e5f200f9fc91e89979680754ea79a1f2b45c3d87f98b SHA512 b83c2aa554bc6970f332134df426dab81011a6a69d1ad5ed3e53adf4130aac209d146209939b554ac0ae70a0cab1a1b366610e2058732cf57b895544089dc972 WHIRLPOOL 5b5cbce1492ed6f495690f22d10a423c024233043f3a19d3e15fa5466a9815ffd3893bb16d35606f6bd14b7f58024bee2af1025554a93adf2f0b14b243f2a9c4
 EBUILD uim-1.8.0.ebuild 6985 SHA256 b8c30116c615249168969b9ff7acea6c1a3b60def389b9b1d4f39b0464b828fc SHA512 d3506efad3878d03a0ec4506aebd388c31acf992fccd06ea59593ae16f43458dbab8274bd199e22bf6398ea0514ef8129083a9b8d6a22bed9088060964bd8903 WHIRLPOOL c17d070b8abc48d4bdf67a0b5a09c3d022ac8156e32498b5dfcf56faa6ec49522d98cf653e05d35223fc589e1f0403da5230b654126f36ffb206484095cd20c3
+EBUILD uim-1.8.2-r1.ebuild 7121 SHA256 46f7922d951c268f8ccaf064f6147582b2b2a366e04235a13b924e29ca545371 SHA512 4209905292cdb621ce2875843e5d7a0f645f9879d78e76f0d8830453fa0387e3158e9bf37516f50d95c5ffe4716d6c379b7b33b9b53fb00b651cdd4a7fe2394a WHIRLPOOL 71e3bd777e304ad7a6eb5c0dc24a5c8698d0bbd8f75a4dcbd48eecbb071d5e13f68e14b767fe2e1cd37a369fdbacb3a65b21dd256a42122b1a471ae07d757416
 EBUILD uim-1.8.2.ebuild 6944 SHA256 b3be5cc3b31243b6f56fd6345dbb7fda5ef65b13996544d4837a9acb21a0e80e SHA512 522357acd54c233618862fb4523ed0dcf0bb33b70b20f07a92bac56b62660200245896cfa4a2c21b2b45bb0dba5f509438b120f6463270d81b7f184d3aaf926a WHIRLPOOL 4b771946a0787766934d34a767d8fdab114071744eda3126bd7d559a5730c87756a59512310bc868ac0b7781999d6f5b2c077e4e433d9f8dd3fa4b13c50c7d14
+EBUILD uim-1.8.3-r1.ebuild 7122 SHA256 8cd490d91df38a163671b87869caba92f0845ef08b2fd9502c2fb44a0ec87808 SHA512 9c86865e51ef34b6def7d2efd483d5b399ded79c0668772a8be21a5a4b7e8305a84a004cd32ad83982414a06f536a21cb7f0b280afd18b846c4df4a796f577dd WHIRLPOOL c9d7cb8b36d7dc60a8add27092e4ef890fc7eaa2d9fa1fcccf9a531a75c2708778476d649196b0bed18bb7e64a1d64421ce6cb2b372e3aeac710f43e5c5efe49
 EBUILD uim-1.8.3.ebuild 6945 SHA256 413c1f8ae1a5e715611aa135be9a66fbdb4859d930c27b92722677ebcdfdfbd5 SHA512 f811a080e440157659e1cfa2296ff4cedb2bb40f6be51214af78eae8886016816a1dfac9e994c66f962b2b140cd1adf84a2fad263245248cd44c7d310853930a WHIRLPOOL 23b528cec8d1c8ade4ee155e5c185b97f89f8bedeedf4e720205198a3c1878dafcf3c794f459f09c023c371942956646bfeb8f2ee07e4a751a088ef4c8d7cea5
+EBUILD uim-1.8.4-r1.ebuild 7122 SHA256 b87c7bb56697425cc1c7f1632411e3ddda720aeb8c80ab1deb82a5aff3c2091d SHA512 9bfdc6f68b44c5f1ba4d4cda85014850de68cb4cc1afc5d78e7c7c1c8423c921fbb6670605547c0e083e65f8e6034616cb6894e7e9f49830aab0b6dcbbe58d13 WHIRLPOOL d4a8f9a2739457aeb7a7c29ed459f7418482b56245d507079c7ea93242d68fb0a6927dd0f62e4ab218b79cdb6f82d07a206124aef2a547e15624e902dba88248
 EBUILD uim-1.8.4.ebuild 6945 SHA256 02a0518d44b6ce6e335259e9e9e594de5074a6cc716e392a8f793c14146d23b1 SHA512 c11b279697915970a6694400a62640a0e9d7cd43f09a396711043b910e81b5350ec40cb9e48ea0f41b6634bcb8d4ec9ffe87ce98294fb6dafba8971864cbfbb7 WHIRLPOOL 3e04ecd15f835d87b9de4bbfc528dfc34c0178c3af01a980d740c0544591f3d227626c20d67eea8d95e281a137774daa70cf2caf3c5f74e5276da4ff02543953
-MISC ChangeLog 37208 SHA256 077c1fe40b3e848c64a5f5432cb2963100f0d0beb69b6124f5e5825a6b35c68b SHA512 9150db378f4b9a8a9a551ac89bb538a1cde323792460ba2df2e93d868ed5fa62bdf705a191bb62d4651d7dfb119d131330c64ae22e697de75a83174a1f8e6af5 WHIRLPOOL 8d3fe2ffcfe9f8288a6cdf47797f528ed5a6f7a9690e2c83e704412f96a9570a8d21b50c763c727fe400a2d21dd9781a3293d886bab468bcf067148d49abef09
+MISC ChangeLog 37576 SHA256 6cfb7b672d70565e7ea61e1542669d2c4e759c851811ff7f416dbb6d6ef20f29 SHA512 2d192ae2036bdc74d606e0217ff0db76d15a357be25c1ff84df433a3cb5af97e55eea3b0e75a5c865fc1befe729f866f3257c1a1a88628003ac2b85e6a971607 WHIRLPOOL 601df859215e48484060ec87fb70922573a89d05890e85b33492d99c170d7173986c3341436f837ccbd3dec6a60ebbee81f3c3a8d5ad8762f1b9b9524b7381e7
 MISC metadata.xml 963 SHA256 f9ec0fb753307e61a6e6cc5381e41344f34fe4d774ec12d61063077e803c2a8b SHA512 07cbf037403887aee2402e27d9592e68ace684664305c215f21f480faa094faf66b7d8fdcf5977e22ced8bf19d7d88f6b5f96a8327d1c57580d1b0743cb9a5cd WHIRLPOOL 81fca7c8cea972c45b00b221b583b41bfb535ab2823f7f5d554d8c5f953d34807465797c814434149f7274f760d9718d36d8f561d21e8aba030fdb0cab600be3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRX3xwAAoJEDYO1FT4VRUUtXUP/0HDPJHFRkUXFQu1YsWCNPGE
-8/Z2VisFt9oAefKk0iIP8C/BI9qLQRBN9lkVmiodY6HW6XIIerzC2ix8bRQN7Tvc
-1DMhL0TlgUbxpBB3CJMNn3Rz80Wl9kFP/BXHaVmcA08IxeDMuVxTuruOkuvj6HqB
-FcHl+8RsYWh/agiPTs91SAEL4xMIG5QY4rjUc7hyxWF8Tf1imZhbBl8CJz39m4dG
-3xckbBPHWLNBspqzJawwUUFfFbDSZGcGGsEV+yOx6KuGtK5bmuNWYP/RHRSjDnke
-tTwsfRwmAguPv5TQWJY+NIf8lQK8GLN3z/HRkce/PI5tcrOJXqvQl2DXV85BEHzK
-vSkpCbm/wf+GFoM6LG8/cqjeCf6dWlZwLG746Z84nOreQgcTZtpf/LxUdp6DWSi/
-fWJziNvLyoOP9u/NSXoDqgu7EOHnq2FlsN+mxa6shWSc/LK3Wdn0pCgzQTS0ZPAv
-dHsHzEcyJGYTD9zyU/7BShPWKI9jSLyJ1LNhTZLYJBn2YquoL4s9Bc8D96W/8okp
-MaDq9toQJSzKn/4xXciPWJE5xCZm5jeU1fpMNlqLwm/KsH/eUY71brlQr9tGAD+i
-mcluGeb+JG7ELRGLTSZoPlWO5mt7fXjuo1+vIWYBDtB4vyceX/FJpDdzivwigR3n
-Osm2pNu6wX+4ZuDeofoX
-=5W82
+iQIcBAEBCAAGBQJRX4xOAAoJEDYO1FT4VRUU8H8QAIw1H8F5cbCNUbYK5L7TrLNt
+SkqGF2yDUJLtbFGVBKgezBZanCEr+Q/NqEBVPHOaBUG9m6I9AZpimPdW3Sb6ApEP
+QIJODE9VCXIQRQdu6LQ1izbT/nffBBVQxz8tq+xYOEpbUvKpk93XN2NzQ+p6CfQZ
+r036VvZcy6Nv6Nxs+zwNspwi+vol6aoAQMusBzm9XcjXYLFED521q+WrPoNrG5AA
+oY97cLKHjYfqGEsWqfrWl270ls7iiNRrZlev9GALDC4GtV02AF7Yscy5CC4YWvyO
+L1chz2pMXEaziT78iZkArD71xkogQAeS3ZtKJwbmWjDiySAlPDwIQ+nyM8261x0D
+ynresSLwJhz+tK66xDsf5GzeyJk2dyk7D8bAyNmXfnEF+tj8egXVwz8r+icndQIz
+2ZeS26C0ake2zFWssBiu3/8thZb19IvQ1xOg9lgvkonF9DF6YkjSo0CjC0VE5OU3
+6oaasLxw/PiGjBV68/m9ICoMcNkwPxWJtbvF37asjVNU2RQnVHvHI0lUST0BFUkJ
+zBCczU+5kx/o2zVPh2xFEIxJ7Pd/bvOq/rCxDtGg9FgACKoZcANxyM/FTu6cmsGc
+3esJcU6X9g7L0mkVK1Qklfa3f3jRwdkny5j4C2yNTMeFxexqojdUM5rVfM1wmfiq
+f8o+gH6hAIhPALnj/Rh6
+=LfGv
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/uim-1.7.3-linguas.patch b/app-i18n/uim/files/uim-1.7.3-linguas.patch
new file mode 100644
index 000000000000..4eb737a5f1f1
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.7.3-linguas.patch
@@ -0,0 +1,9 @@
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 4eb4f64..f85c7c7 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1,3 @@
+-fr ja ko
++fr
++ja
++ko
diff --git a/app-i18n/uim/uim-1.7.3-r1.ebuild b/app-i18n/uim/uim-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..1a3d9235e560
--- /dev/null
+++ b/app-i18n/uim/uim-1.7.3-r1.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+
+EAPI="4"
+inherit autotools eutils multilib elisp-common flag-o-matic
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+RDEPEND="X? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender
+	)
+	anthy? (
+		unicode? ( >=app-i18n/anthy-8622 )
+		!unicode? ( app-i18n/anthy )
+	)
+	canna? ( app-i18n/canna )
+	curl? ( >=net-misc/curl-7.16.4 )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	libffi? ( virtual/libffi )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	kde? ( >=kde-base/kdelibs-4 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	!dev-scheme/sigscheme
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	>=dev-scheme/sigscheme-0.8.5
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+#	gnome? (
+#		gtk? ( >=gnome-base/gnome-panel-2.14 )
+#		gtk3? ( >=gnome-base/gnome-panel-3 )
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? (
+			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
+		)
+		linguas_zh_TW? (
+			media-fonts/intlfonts
+		)
+		linguas_ja? (
+			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
+		)
+		linguas_ko? (
+			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+		)
+	)"
+#	test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+gnome2_query_immodules_gtk2() {
+	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
+
+	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
+	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	local gtk_conf_dir=$(dirname "${gtk_conf}")
+
+	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
+	einfo "-> ${gtk_conf}"
+
+	mkdir -p "${gtk_conf_dir}"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+	if [ -z "${tmp_file}" ]; then
+		ewarn "gtk_query_immodules: cannot create temporary file"
+		return 1
+	fi
+
+	if ${query_exec} > "${tmp_file}"; then
+		cat "${tmp_file}" > "${gtk_conf}" || \
+			ewarn "Failed to write to ${gtk_conf}"
+	else
+		ewarn "Cannot update gtk.immodules, file generation failed"
+	fi
+	rm "${tmp_file}"
+}
+
+update_gtk_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		gnome2_query_immodules_gtk2
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+pkg_setup() {
+	strip-linguas fr ja ko
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.7.3-linguas.patch
+
+	if has_version ">=dev-libs/glib-2.32"; then
+		epatch "${FILESDIR}"/${P}-glib-2.32.patch
+	fi
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
+	cp po/Makefile.in.in qt/chardict/po || die
+	cp po/Makefile.in.in qt4/chardict/po || die
+}
+
+src_configure() {
+	local myconf
+
+	if (use gtk || use gtk3) && (use anthy || use canna) ; then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk || use gtk3 || use qt4 ; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	if use anthy ; then
+		if use unicode ; then
+			myconf="${myconf} --with-anthy-utf8"
+		else
+			myconf="${myconf} --with-anthy"
+		fi
+	else
+		myconf="${myconf} --without-anthy"
+	fi
+
+	if use libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	#if use gnome ; then
+	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
+	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+	#fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with curl) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_with libffi ffi) \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with gtk3) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_enable kde kde4-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		--without-qt \
+		--without-qt-immodule \
+		$(use_with qt4 qt4) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_enable qt4 qt4-qt3support) \
+		$(use_with skk) \
+		$(use_with sqlite sqlite3) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_with xft) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# parallel make install b0rked, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+	if use emacs; then
+		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/uim.conf" || die
+
+	# collision with dev-scheme/sigscheme, bug #330975
+	# find "${ED}" -name '*gcroots*' -delete || die
+}
+
+pkg_postinst() {
+	elog
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/uim/uim-1.8.0-r1.ebuild b/app-i18n/uim/uim-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..5d8f27c87734
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.0-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+
+EAPI="4"
+inherit autotools eutils multilib elisp-common flag-o-matic
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+RDEPEND="X? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender
+	)
+	anthy? (
+		unicode? ( >=app-i18n/anthy-8622 )
+		!unicode? ( app-i18n/anthy )
+	)
+	canna? ( app-i18n/canna )
+	curl? ( >=net-misc/curl-7.16.4 )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	libffi? ( virtual/libffi )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	kde? ( >=kde-base/kdelibs-4 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	!dev-scheme/sigscheme
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	>=dev-scheme/sigscheme-0.8.5
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+#	gnome? (
+#		gtk? ( >=gnome-base/gnome-panel-2.14 )
+#		gtk3? ( >=gnome-base/gnome-panel-3 )
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? (
+			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
+		)
+		linguas_zh_TW? (
+			media-fonts/intlfonts
+		)
+		linguas_ja? (
+			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
+		)
+		linguas_ko? (
+			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+		)
+	)"
+#	test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+pkg_setup() {
+	strip-linguas fr ja ko
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.8.0-glib2.32.patch \
+		"${FILESDIR}"/${PN}-1.7.3-linguas.patch
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if (use gtk || use gtk3) && (use anthy || use canna) ; then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk || use gtk3 || use qt4 ; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	if use anthy ; then
+		if use unicode ; then
+			myconf="${myconf} --with-anthy-utf8"
+		else
+			myconf="${myconf} --with-anthy"
+		fi
+	else
+		myconf="${myconf} --without-anthy"
+	fi
+
+	if use libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	#if use gnome ; then
+	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
+	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+	#fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with curl) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_with libffi ffi) \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with gtk3) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_enable kde kde4-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		--without-qt \
+		--without-qt-immodule \
+		$(use_with qt4 qt4) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_enable qt4 qt4-qt3support) \
+		$(use_with skk) \
+		$(use_with sqlite sqlite3) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_with xft) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# parallel make install b0rked, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+	if use emacs; then
+		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/uim.conf" || die
+
+	# collision with dev-scheme/sigscheme, bug #330975
+	# find "${ED}" -name '*gcroots*' -delete || die
+
+	rmdir "${ED}"/usr/share/doc/sigscheme || die
+}
+
+pkg_postinst() {
+	elog
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/uim/uim-1.8.2-r1.ebuild b/app-i18n/uim/uim-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..bc324a7e2828
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.2-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+
+EAPI="4"
+inherit autotools eutils multilib elisp-common flag-o-matic
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+RDEPEND="X? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender
+	)
+	anthy? (
+		unicode? ( >=app-i18n/anthy-8622 )
+		!unicode? ( app-i18n/anthy )
+	)
+	canna? ( app-i18n/canna )
+	curl? ( >=net-misc/curl-7.16.4 )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	libffi? ( virtual/libffi )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	kde? ( >=kde-base/kdelibs-4 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	!dev-scheme/sigscheme
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	>=dev-scheme/sigscheme-0.8.5
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+#	gnome? (
+#		gtk? ( >=gnome-base/gnome-panel-2.14 )
+#		gtk3? ( >=gnome-base/gnome-panel-3 )
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? (
+			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
+		)
+		linguas_zh_TW? (
+			media-fonts/intlfonts
+		)
+		linguas_ja? (
+			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
+		)
+		linguas_ko? (
+			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+		)
+	)"
+#	test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+pkg_setup() {
+	strip-linguas fr ja ko
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.7.3-linguas.patch
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if (use gtk || use gtk3) && (use anthy || use canna) ; then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk || use gtk3 || use qt4 ; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	if use anthy ; then
+		if use unicode ; then
+			myconf="${myconf} --with-anthy-utf8"
+		else
+			myconf="${myconf} --with-anthy"
+		fi
+	else
+		myconf="${myconf} --without-anthy"
+	fi
+
+	if use libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	#if use gnome ; then
+	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
+	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+	#fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with curl) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_with libffi ffi) \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with gtk3) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_enable kde kde4-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		--without-qt \
+		--without-qt-immodule \
+		$(use_with qt4 qt4) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_enable qt4 qt4-qt3support) \
+		$(use_with skk) \
+		$(use_with sqlite sqlite3) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_with xft) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# parallel make install b0rked, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+	if use emacs; then
+		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/uim.conf" || die
+
+	# collision with dev-scheme/sigscheme, bug #330975
+	# find "${ED}" -name '*gcroots*' -delete || die
+
+	rmdir "${ED}"/usr/share/doc/sigscheme || die
+}
+
+pkg_postinst() {
+	elog
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/uim/uim-1.8.3-r1.ebuild b/app-i18n/uim/uim-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..8ecbf16d85db
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.3-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+
+EAPI="4"
+inherit autotools eutils multilib elisp-common flag-o-matic
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+RDEPEND="X? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender
+	)
+	anthy? (
+		unicode? ( >=app-i18n/anthy-8622 )
+		!unicode? ( app-i18n/anthy )
+	)
+	canna? ( app-i18n/canna )
+	curl? ( >=net-misc/curl-7.16.4 )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	libffi? ( virtual/libffi )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	kde? ( >=kde-base/kdelibs-4 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	!dev-scheme/sigscheme
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	>=dev-scheme/sigscheme-0.8.5
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+#	gnome? (
+#		gtk? ( >=gnome-base/gnome-panel-2.14 )
+#		gtk3? ( >=gnome-base/gnome-panel-3 )
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? (
+			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
+		)
+		linguas_zh_TW? (
+			media-fonts/intlfonts
+		)
+		linguas_ja? (
+			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
+		)
+		linguas_ko? (
+			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+		)
+	)"
+#	test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+pkg_setup() {
+	strip-linguas fr ja ko
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.7.3-linguas.patch
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if (use gtk || use gtk3) && (use anthy || use canna) ; then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk || use gtk3 || use qt4 ; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	if use anthy ; then
+		if use unicode ; then
+			myconf="${myconf} --with-anthy-utf8"
+		else
+			myconf="${myconf} --with-anthy"
+		fi
+	else
+		myconf="${myconf} --without-anthy"
+	fi
+
+	if use libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	#if use gnome ; then
+	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
+	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+	#fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with curl) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_with libffi ffi) \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with gtk3) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_enable kde kde4-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		--without-qt \
+		--without-qt-immodule \
+		$(use_with qt4 qt4) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_enable qt4 qt4-qt3support) \
+		$(use_with skk) \
+		$(use_with sqlite sqlite3) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_with xft) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# parallel make install b0rked, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+	if use emacs; then
+		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/uim.conf" || die
+
+	# collision with dev-scheme/sigscheme, bug #330975
+	# find "${ED}" -name '*gcroots*' -delete || die
+
+	#rmdir "${ED}"/usr/share/doc/sigscheme || die
+}
+
+pkg_postinst() {
+	elog
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/uim/uim-1.8.4-r1.ebuild b/app-i18n/uim/uim-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..4e778e51ff13
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.4-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4-r1.ebuild,v 1.1 2013/04/06 02:45:32 naota Exp $
+
+EAPI="4"
+inherit autotools eutils multilib elisp-common flag-o-matic
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+REQUIRED_USE="gtk? ( X ) qt4? ( X )"
+
+RDEPEND="X? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender
+	)
+	anthy? (
+		unicode? ( >=app-i18n/anthy-8622 )
+		!unicode? ( app-i18n/anthy )
+	)
+	canna? ( app-i18n/canna )
+	curl? ( >=net-misc/curl-7.16.4 )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	libffi? ( virtual/libffi )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	kde? ( >=kde-base/kdelibs-4 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	!dev-scheme/sigscheme
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	>=dev-scheme/sigscheme-0.8.5
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+#	gnome? (
+#		gtk? ( >=gnome-base/gnome-panel-2.14 )
+#		gtk3? ( >=gnome-base/gnome-panel-3 )
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? (
+			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
+		)
+		linguas_zh_TW? (
+			media-fonts/intlfonts
+		)
+		linguas_ja? (
+			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
+		)
+		linguas_ko? (
+			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+		)
+	)"
+#	test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+pkg_setup() {
+	strip-linguas fr ja ko
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.7.3-linguas.patch
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if (use gtk || use gtk3) && (use anthy || use canna) ; then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk || use gtk3 || use qt4 ; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	if use anthy ; then
+		if use unicode ; then
+			myconf="${myconf} --with-anthy-utf8"
+		else
+			myconf="${myconf} --with-anthy"
+		fi
+	else
+		myconf="${myconf} --without-anthy"
+	fi
+
+	if use libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	#if use gnome ; then
+	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
+	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+	#fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with curl) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_with libffi ffi) \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with gtk3) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_enable kde kde4-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		--without-qt \
+		--without-qt-immodule \
+		$(use_with qt4 qt4) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_enable qt4 qt4-qt3support) \
+		$(use_with skk) \
+		$(use_with sqlite sqlite3) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_with xft) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# parallel make install b0rked, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+	if use emacs; then
+		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/uim.conf" || die
+
+	# collision with dev-scheme/sigscheme, bug #330975
+	# find "${ED}" -name '*gcroots*' -delete || die
+
+	#rmdir "${ED}"/usr/share/doc/sigscheme || die
+}
+
+pkg_postinst() {
+	elog
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use emacs && elisp-site-regen
+}