16 files changed, 109 insertions, 461 deletions
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 00a425afda51..912147d5eeb4 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,4 +1,12 @@
-MD5 7984fcdd135a3be4acf7f38857130452 ChangeLog 2647
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 9b0772063fdb063a704a6da601d48f07 uim-svn-20050505.ebuild 2892
+MD5 df9f3641c72d0837841d6e0f3b16a0bb ChangeLog 2743
+RMD160 c1fb80483aa84b96913eef7658862df4292bd0f8 ChangeLog 2743
+SHA256 cff8c967061d57cf76b7447a612a4a83a9ebb5ff98e10fd40177e54305f1ef0c ChangeLog 2743
 MD5 224fb1ad2d4fafabab78a7aee65c0c9f files/digest-uim-svn-20050505 65
+RMD160 03e876224ff903bbe8d5d4193f094e0c75373cd8 files/digest-uim-svn-20050505 65
+SHA256 181addebbcac584903d148c2bcc13edd3c2984c9340136347a89e563862c9ba6 files/digest-uim-svn-20050505 65
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 66866737969792a762ccadf9af825274 uim-svn-20050505.ebuild 3149
+RMD160 630097394f9811e1545c4b0b359b48244e946e21 uim-svn-20050505.ebuild 3149
+SHA256 559e37fc74f967b719fcaff5e6d8bdd0a482a217e6e3c322a93e8391b5f24cca uim-svn-20050505.ebuild 3149
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 8d01a0d83e53..770b092e2498 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/uim
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.130 2005/12/23 10:09:20 usata Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.131 2006/02/10 20:31:22 liquidx Exp $
+
+*uim-1.0.1 (10 Feb 2006)
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org> -uim-0.3.4.2.ebuild,
+  -uim-0.4.7.1-r2.ebuild, -uim-0.4.8.ebuild, -uim-0.4.9.1.ebuild,
+  uim-0.5.0.1.ebuild, -uim-1.0.0_beta.ebuild, uim-1.0.0.ebuild,
+  +uim-1.0.1.ebuild:
+  modular-x-ified, version bump.
 
 *uim-1.0.0 (23 Dec 2005)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 2589e6cac402..82f57ce3e10a 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,18 +1,40 @@
-MD5 fd3371280677df01bd1964fd3f934a91 uim-1.0.0_beta.ebuild 3455
-MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 5dcf71d68ad992a0e5a0d473b5dff0d3 uim-1.0.0.ebuild 3474
-MD5 858be48526cabf6940b8e3f7c851477b uim-0.4.8.ebuild 3172
-MD5 e2cdb33a2408bf9f1a757f7f57b305df uim-0.5.0.1.ebuild 3255
-MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 49ff9cc7aadffa06d924c5c54057ee47 ChangeLog 18601
-MD5 f35d23551f66bfc54919377d7cfd9987 uim-0.4.7.1-r2.ebuild 3448
-MD5 fb1dd1eda2839248766d1a7b8135275b uim-0.4.9.1.ebuild 3173
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b0d01580a17279a1cb0402f10d29926f ChangeLog 18884
+RMD160 33b60443f20083d8668adddcd604b3f450c3dc22 ChangeLog 18884
+SHA256 01851474be479139659f27ae84e89e79c7941747b070c6e94e7470dc8814f54c ChangeLog 18884
 MD5 f2d1f1632eaf89b416b29ee2001c7987 files/50uim-el-gentoo.el 296
-MD5 2ae94233c8b9078f8bf5ae9d8b08cb62 files/digest-uim-1.0.0 62
-MD5 6c83b1813a452bc4802de9e5a1bd349f files/digest-uim-0.4.8 62
+RMD160 0a966341d3f19dee46a855257ed7636a58e4418b files/50uim-el-gentoo.el 296
+SHA256 e572b2c766fcf5534dc687ec9a7e4384e3a5747431f91695c977a925392baeb4 files/50uim-el-gentoo.el 296
 MD5 bfda49a91f0fad04a3319739d29d59a1 files/digest-uim-0.5.0.1 64
-MD5 63af18b52d0150f105ffc738fabc44ee files/digest-uim-1.0.0_beta 67
+RMD160 c3284cde87ef880d955f8d2c941b85059f7738d0 files/digest-uim-0.5.0.1 64
+SHA256 29e388d80ff21f153c7bf09cab60ef83f99ea4148059402c92384b0c69402f74 files/digest-uim-0.5.0.1 64
+MD5 2ae94233c8b9078f8bf5ae9d8b08cb62 files/digest-uim-1.0.0 62
+RMD160 0b71a69065aa7167f771932b216f15c689e57f8f files/digest-uim-1.0.0 62
+SHA256 5af1d248c9a680c939143790b575030b68446e38fb46349e280e3c9c042fb8cf files/digest-uim-1.0.0 62
+MD5 8470e0fe2e1e730863b769223579a247 files/digest-uim-1.0.1 232
+RMD160 2a1e39b677a2184197b949bbae634737863dcd64 files/digest-uim-1.0.1 232
+SHA256 9e3b8e63ea872fded9d7efd8414bd947b07f33940a3cd63624ec182914fe93db files/digest-uim-1.0.1 232
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 258e2affd49ed5b6a54039de8e47d560 files/digest-uim-0.4.9.1 64
-MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
+RMD160 e06a106bdc460057aeacab94bc471faf0e9180bc files/uim-gtk-query-immodules-gentoo.diff 552
+SHA256 ee7e06d7da7dd125ea4f820d5e25a3ac4cf30837a479c11cf004ac7859a262c1 files/uim-gtk-query-immodules-gentoo.diff 552
+MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
+RMD160 4e733f159a595e48d0d02c410145909944b09554 metadata.xml 642
+SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5 metadata.xml 642
+MD5 5189ea5c7c751325a21976a7816e00fe uim-0.5.0.1.ebuild 3432
+RMD160 68fe072541cdbdfd4f4d45d84f69764e80df38d1 uim-0.5.0.1.ebuild 3432
+SHA256 4c1b5b13fd0663bf6e6cd67b2550fbfc3096da4a07a5b221479901171771b968 uim-0.5.0.1.ebuild 3432
+MD5 93173aa9537515c7cae15b93b5a550ed uim-1.0.0.ebuild 3709
+RMD160 65149c5ce95505fb8d244b8ad33112cdaf3d6c39 uim-1.0.0.ebuild 3709
+SHA256 e7ba296b4080b850bbd17ca8da44cad54838237a7188912c69365b443b35ff5f uim-1.0.0.ebuild 3709
+MD5 b848518b9fa40bd4e0b262ccecc420ee uim-1.0.1.ebuild 3709
+RMD160 36e0d67780987cbd10c936d7f682cfd4d0169c4a uim-1.0.1.ebuild 3709
+SHA256 30020797031a65a5c58262cbd63e2a5d7ca162b39ff96146fd7af232089ab678 uim-1.0.1.ebuild 3709
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD7Pgp9ZFPrqoILX8RAvktAJ9N2SwjiYhzVWoMB/azGuFlkqBV9QCfXQTX
+54nJ84c4jdhoeRrO7LZ8ElQ=
+=jH/P
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/digest-uim-0.3.4.2 b/app-i18n/uim/files/digest-uim-0.3.4.2
deleted file mode 100644
index 53cbdd2c83b5..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7f614845a872e1de46de0540388649a uim-0.3.4.2.tar.gz 824389
diff --git a/app-i18n/uim/files/digest-uim-0.4.7.1-r2 b/app-i18n/uim/files/digest-uim-0.4.7.1-r2
deleted file mode 100644
index f130072068a3..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.7.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz 1544242
-MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/files/digest-uim-0.4.8 b/app-i18n/uim/files/digest-uim-0.4.8
deleted file mode 100644
index 98345a684f73..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz 1600984
diff --git a/app-i18n/uim/files/digest-uim-0.4.9.1 b/app-i18n/uim/files/digest-uim-0.4.9.1
deleted file mode 100644
index db1cd5a83363..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e2625cc926917d7864c4d0c341c535a uim-0.4.9.1.tar.gz 1602849
diff --git a/app-i18n/uim/files/digest-uim-1.0.0_beta b/app-i18n/uim/files/digest-uim-1.0.0_beta
deleted file mode 100644
index 48d2e29dbed6..000000000000
--- a/app-i18n/uim/files/digest-uim-1.0.0_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c68b7a8544551bd5b65df03dcb46d9e3 uim-1.0.0-beta.tar.gz 1955754
diff --git a/app-i18n/uim/files/digest-uim-1.0.1 b/app-i18n/uim/files/digest-uim-1.0.1
new file mode 100644
index 000000000000..7483ae8d46ec
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-1.0.1
@@ -0,0 +1,3 @@
+MD5 1de96cb9ca0c570c0d04678a95f9c75a uim-1.0.1.tar.gz 1924484
+RMD160 fa0e0057a554382c06dc1f8c7287617db203bcee uim-1.0.1.tar.gz 1924484
+SHA256 cfd3a906763d0474576fd07b0ffcfbc829075a750fc4fe28dcb4e37999e4d57f uim-1.0.1.tar.gz 1924484
diff --git a/app-i18n/uim/uim-0.3.4.2.ebuild b/app-i18n/uim/uim-0.3.4.2.ebuild
deleted file mode 100644
index 544316240b31..000000000000
--- a/app-i18n/uim/uim-0.3.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.4.2.ebuild,v 1.7 2005/01/01 14:42:20 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="x86 alpha ppc"
-IUSE="gtk nls debug"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	!app-i18n/uim-svn"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
-}
-
-src_compile() {
-	if use gtk ; then
-		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
-			Makefile.in `echo */Makefile.in`
-	else
-		sed -i -e "s:@GTK2_TRUE@:#:g" -e "s:@GTK2_FALSE@::g" \
-			Makefile.in `echo */Makefile.in`
-		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
-	fi
-
-	use debug && append-flags -g
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.4.7.1-r2.ebuild b/app-i18n/uim/uim-0.4.7.1-r2.ebuild
deleted file mode 100644
index 145706c886a6..000000000000
--- a/app-i18n/uim/uim-0.4.7.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.1-r2.ebuild,v 1.8 2005/09/23 03:41:36 matsuu Exp $
-
-inherit eutils kde-functions flag-o-matic
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz
-	http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
-#IUSE="${IUSE} scim"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep
-	canna? ( app-i18n/canna )
-	immqt? ( $(qt_min_version 3.3.4) )
-	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
-	!<app-i18n/prime-0.9.4
-	!app-i18n/uim-qt
-	!app-i18n/uim-kdehelper"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-# An arch specific config directory is used on multilib systems
-has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	use qt && set-qtdir 3
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
-	fi
-
-	myconf="${myconf}
-		$(use_enable nls)
-		$(use_with X x)
-		$(use_with gtk gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_with canna)
-		$(use_with qt)"
-
-	autoreconf
-	libtoolize --copy --force
-
-	# --with-scim is not stable enough
-	econf ${myconf} --without-scim || die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if has_version '>=app-i18n/prime-1.0' ; then
-		cd ${WORKDIR}/prime-1.0.0.1
-		econf || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if has_version '>=app-i18n/prime-1.0' ; then
-		cd ${WORKDIR}/prime-1.0.0.1
-		make DESTDIR="${D}" install-uim || die "make install-uim failed"
-		cd -
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.4.8.ebuild b/app-i18n/uim/uim-0.4.8.ebuild
deleted file mode 100644
index 75496812898a..000000000000
--- a/app-i18n/uim/uim-0.4.8.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.8.ebuild,v 1.4 2005/09/30 18:19:52 gustavoz Exp $
-
-inherit eutils kde-functions flag-o-matic multilib
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
-#IUSE="${IUSE} scim"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep
-	canna? ( app-i18n/canna )
-	immqt? ( $(qt_min_version 3.3.4) )
-	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
-	!<app-i18n/prime-0.9.4
-	!app-i18n/uim-qt
-	!app-i18n/uim-kdehelper"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	use qt && set-qtdir 3
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
-	fi
-
-	myconf="${myconf}
-		$(use_enable nls)
-		$(use_with X x)
-		$(use_with gtk gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_with canna)
-		$(use_with qt)"
-
-	autoreconf
-	libtoolize --copy --force
-
-	# --with-scim is not stable enough
-	econf ${myconf} --without-scim || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.4.9.1.ebuild b/app-i18n/uim/uim-0.4.9.1.ebuild
deleted file mode 100644
index 2d945424e28b..000000000000
--- a/app-i18n/uim/uim-0.4.9.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.9.1.ebuild,v 1.2 2005/10/01 11:48:18 usata Exp $
-
-inherit eutils kde-functions flag-o-matic multilib
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
-#IUSE="${IUSE} scim"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep
-	canna? ( app-i18n/canna )
-	immqt? ( $(qt_min_version 3.3.4) )
-	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
-	!<app-i18n/prime-0.9.4
-	!app-i18n/uim-qt
-	!app-i18n/uim-kdehelper"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	use qt && set-qtdir 3
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
-	fi
-
-	myconf="${myconf}
-		$(use_enable nls)
-		$(use_with X x)
-		$(use_with gtk gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_with canna)
-		$(use_with qt)"
-
-	autoreconf
-	libtoolize --copy --force
-
-	# --with-scim is not stable enough
-	econf ${myconf} --without-scim || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.5.0.1.ebuild b/app-i18n/uim/uim-0.5.0.1.ebuild
index d46b489cb3c8..600112739726 100644
--- a/app-i18n/uim/uim-0.5.0.1.ebuild
+++ b/app-i18n/uim/uim-0.5.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.5.0.1.ebuild,v 1.8 2005/10/01 20:29:37 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.5.0.1.ebuild,v 1.9 2006/02/10 20:31:22 liquidx Exp $
 
 inherit eutils kde-functions flag-o-matic multilib
 
@@ -17,7 +17,17 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
 #IUSE="${IUSE} scim"
 
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="
+	X? ( || ( (
+	   	 	    x11-libs/libX11
+				x11-libs/libXft
+				x11-libs/libXt
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXext
+				x11-libs/libXrender
+			  )
+		   	  virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2 )
 	m17n-lib? ( dev-libs/m17n-lib )
 	!app-i18n/uim-svn
@@ -29,6 +39,7 @@ RDEPEND="X? ( virtual/x11 )
 	!<app-i18n/prime-0.9.4
 	!app-i18n/uim-qt
 	!app-i18n/uim-kdehelper"
+
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
diff --git a/app-i18n/uim/uim-1.0.0.ebuild b/app-i18n/uim/uim-1.0.0.ebuild
index 374e3d32ec77..3b6d96eb7010 100644
--- a/app-i18n/uim/uim-1.0.0.ebuild
+++ b/app-i18n/uim/uim-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.0.ebuild,v 1.1 2005/12/23 10:09:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.0.ebuild,v 1.2 2006/02/10 20:31:22 liquidx Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
@@ -15,9 +15,18 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna emacs"
-#IUSE="${IUSE} scim"
 
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="
+	X? ( || ( (
+	   	 	    x11-libs/libX11
+				x11-libs/libXft
+				x11-libs/libXt
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXext
+				x11-libs/libXrender
+			  )
+		   	  virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2 )
 	m17n-lib? ( dev-libs/m17n-lib )
 	!app-i18n/uim-svn
@@ -31,7 +40,10 @@ RDEPEND="X? ( virtual/x11 )
 	!app-i18n/uim-qt
 	!app-i18n/uim-kdehelper
 	!app-emacs/uim-el"
+
 DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
+	   	 	  virtual/x11 ) )
 	dev-lang/perl
 	dev-perl/XML-Parser
 	>=sys-apps/sed-4
diff --git a/app-i18n/uim/uim-1.0.0_beta.ebuild b/app-i18n/uim/uim-1.0.1.ebuild
index f70e5d6f2c93..217b27ac4fca 100644
--- a/app-i18n/uim/uim-1.0.0_beta.ebuild
+++ b/app-i18n/uim/uim-1.0.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.0_beta.ebuild,v 1.1 2005/12/17 16:54:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.1.ebuild,v 1.1 2006/02/10 20:31:22 liquidx Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
-DESCRIPTION="a simple, secure and flexible input method library"
+DESCRIPTION="Simple, secure and flexible input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
 SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 
@@ -15,9 +15,18 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna emacs"
-#IUSE="${IUSE} scim"
 
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="
+	X? ( || ( (
+	   	 	    x11-libs/libX11
+				x11-libs/libXft
+				x11-libs/libXt
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXext
+				x11-libs/libXrender
+			  )
+		   	  virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2 )
 	m17n-lib? ( dev-libs/m17n-lib )
 	!app-i18n/uim-svn
@@ -26,11 +35,15 @@ RDEPEND="X? ( virtual/x11 )
 	immqt? ( $(qt_min_version 3.3.4) )
 	immqt-bc? ( $(qt_min_version 3.3.4) )
 	qt? ( $(qt_min_version 3.3.4) )
+	emacs? ( virtual/emacs )
 	!<app-i18n/prime-0.9.4
 	!app-i18n/uim-qt
 	!app-i18n/uim-kdehelper
 	!app-emacs/uim-el"
+
 DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
+	   	 	  virtual/x11 ) )
 	dev-lang/perl
 	dev-perl/XML-Parser
 	>=sys-apps/sed-4