Fixed HOMEPAGE and SRC_URI.

Package-Manager: portage-2.1.2.11

12 files changed, 26 insertions, 510 deletions

diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest
index cf3d7cefed7d..991adacbfcf9 100644
--- a/app-i18n/libhangul/Manifest
+++ b/app-i18n/libhangul/Manifest
@@ -9,14 +9,14 @@ EBUILD libhangul-0.0.4.ebuild 597 RMD160 34ebfcb46c143e4f77f38f472d220f49ca79fab
 MD5 a0840ff9fabc6c3926fcf7a0659037ab libhangul-0.0.4.ebuild 597
 RMD160 34ebfcb46c143e4f77f38f472d220f49ca79fab2 libhangul-0.0.4.ebuild 597
 SHA256 6b75c6c2a7d213960c562749628a6fa44da1b8eedbda96bc0f9659f18f1e244b libhangul-0.0.4.ebuild 597
-EBUILD libhangul-0.0.6.ebuild 603 RMD160 6d304069e0f135273264327be1023b17310b432f SHA1 1e8072ecfa3abfc185362780305494e83922130f SHA256 f99c13663ee55fb141d02e3696e1d8287635ce6169bfd7bccc7873a823cc5cab
-MD5 3b3cb488dbfc50ecbf3f6fb5836ff26c libhangul-0.0.6.ebuild 603
-RMD160 6d304069e0f135273264327be1023b17310b432f libhangul-0.0.6.ebuild 603
-SHA256 f99c13663ee55fb141d02e3696e1d8287635ce6169bfd7bccc7873a823cc5cab libhangul-0.0.6.ebuild 603
-MISC ChangeLog 714 RMD160 e3422be852e24443f8b82515cf1f1008c880defc SHA1 6b57cb46a3a7f9f586bea89b2de2411fc25c4290 SHA256 4c52d84879dd57122deea7fafe6f7e6f55a4fb29877408f067e3ea0947835daf
-MD5 11ce9f924f50e93f08e117972a316764 ChangeLog 714
-RMD160 e3422be852e24443f8b82515cf1f1008c880defc ChangeLog 714
-SHA256 4c52d84879dd57122deea7fafe6f7e6f55a4fb29877408f067e3ea0947835daf ChangeLog 714
+EBUILD libhangul-0.0.6.ebuild 597 RMD160 5e42343d9ccc193d08bcb2103ba9b0caf674aed2 SHA1 514ebae5ae6876120b3e1204186b28e4bb970ee6 SHA256 46c6c1c2198e0772770c0bd734dc8022983e4e0459145552c083503b65e90334
+MD5 f935adaa1c4efa81aa11f369aa318956 libhangul-0.0.6.ebuild 597
+RMD160 5e42343d9ccc193d08bcb2103ba9b0caf674aed2 libhangul-0.0.6.ebuild 597
+SHA256 46c6c1c2198e0772770c0bd734dc8022983e4e0459145552c083503b65e90334 libhangul-0.0.6.ebuild 597
+MISC ChangeLog 815 RMD160 be9891542bc8258c94f097af863871039657da35 SHA1 65f025f699c74e497df1d5812587fd4099f3eece SHA256 09aca7358fbe7b21985126ee8cb790b85a9f3e5132a7b79a242308d370aeaace
+MD5 d423623be1f8e7e3a46e7e4ceb068262 ChangeLog 815
+RMD160 be9891542bc8258c94f097af863871039657da35 ChangeLog 815
+SHA256 09aca7358fbe7b21985126ee8cb790b85a9f3e5132a7b79a242308d370aeaace ChangeLog 815
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
 MD5 5a9deb1f29e94497a4ec6ccca8ccdeb3 metadata.xml 157
 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 metadata.xml 157
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 195ea0e2b854..fc35b036607d 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.168 2007/08/10 18:01:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.169 2007/08/10 22:27:21 matsuu Exp $
+
+  10 Aug 2007; MATSUU Takuto <matsuu@gentoo.org> -files/uim-1.2.1-nls.patch,
+  -files/uim-1.4.0-gentoo.patch, -uim-1.2.1.ebuild, -uim-1.3.1.ebuild,
+  -uim-1.4.0.ebuild, uim-1.4.1.ebuild:
+  Fixed HOMEPAGE and SRC_URI.
+  Removed old versions.
 
   10 Aug 2007; Raúl Porcel <armin76@gentoo.org> uim-1.4.1.ebuild:
   alpha stable wrt #184462
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 650c1601fd51..bc018be8c82c 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -2,51 +2,19 @@ AUX 50uim-el-gentoo.el 296 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b SHA1
 MD5 f2d1f1632eaf89b416b29ee2001c7987 files/50uim-el-gentoo.el 296
 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b files/50uim-el-gentoo.el 296
 SHA256 e572b2c766fcf5534dc687ec9a7e4384e3a5747431f91695c977a925392baeb4 files/50uim-el-gentoo.el 296
-AUX uim-1.2.1-nls.patch 403 RMD160 efed40529fc5e1e4d6d81790f95ecd297714213d SHA1 1a3446bd4228e4bcafd7c24b69cdbdb631265bde SHA256 c75860206f29310d211277208914e07bdcfe3582bd48e79f8645d06a874bffbf
-MD5 bd8a40eba076bb73f81601aba51c900e files/uim-1.2.1-nls.patch 403
-RMD160 efed40529fc5e1e4d6d81790f95ecd297714213d files/uim-1.2.1-nls.patch 403
-SHA256 c75860206f29310d211277208914e07bdcfe3582bd48e79f8645d06a874bffbf files/uim-1.2.1-nls.patch 403
-AUX uim-1.4.0-gentoo.patch 1508 RMD160 cd0b3487dde2a57b4368608547e92652c9f42fda SHA1 aa571c076f23261478b02fc45fafac7114632dbf SHA256 9bbb81e32934844c42478b291caed7397d53d35ea186adec4cae99b40d04556c
-MD5 f5d1b9e28774fcbd7e5b21b02122f686 files/uim-1.4.0-gentoo.patch 1508
-RMD160 cd0b3487dde2a57b4368608547e92652c9f42fda files/uim-1.4.0-gentoo.patch 1508
-SHA256 9bbb81e32934844c42478b291caed7397d53d35ea186adec4cae99b40d04556c files/uim-1.4.0-gentoo.patch 1508
-DIST uim-1.2.1.tar.gz 2149696 RMD160 09c10fd43cc031ac14434a34f9c9e55d162375a3 SHA1 1ac319345632327804e0ed07dc5af6da7fe01b48 SHA256 e2f257df389a516885ccfb18a068f7c153425cfb31de8487106e9e33bb1dcfbc
-DIST uim-1.3.1.tar.gz 2186681 RMD160 cf3d6b85586a87f49c6ec389b06df2fb98488dd5 SHA1 4490d49f9c2d6aa446d5c1dd816523fbe447bcba SHA256 12943eddc9131a82c512620af00dc8c1d8e33570b914a8a07227573d603aa513
-DIST uim-1.4.0.tar.bz2 2684329 RMD160 7bfa394d822b3bdc30736569b8543339d82ce10b SHA1 6bd4745947123cc3b4eb6f33e969cb7ff88768ff SHA256 0dc49075bace432a9be6116a966988e2991b8d052ed32043a9bdd60adaf92d2d
 DIST uim-1.4.1.tar.bz2 2634265 RMD160 84d95720af62990e0fca1bd3d1a53eeca25d5deb SHA1 5de27af0f59d2e9775c1688dcd6d3848a434fb26 SHA256 145e77ea713b0ebc7afd4be4e8775029b764c4cdd2d54b96594f00b999117771
-EBUILD uim-1.2.1.ebuild 3490 RMD160 f55d9726cba73c7ca90dbfaac9dfab9778d38212 SHA1 d2c6a3d9fbbe3b40b8336e81b53872b2840fa790 SHA256 ef1e64ddd1073ecb95f04ab196b32a8d6950d887a27839f298e5ab34cde65f63
-MD5 cfa71eff1370b910a29b074914e6dd18 uim-1.2.1.ebuild 3490
-RMD160 f55d9726cba73c7ca90dbfaac9dfab9778d38212 uim-1.2.1.ebuild 3490
-SHA256 ef1e64ddd1073ecb95f04ab196b32a8d6950d887a27839f298e5ab34cde65f63 uim-1.2.1.ebuild 3490
-EBUILD uim-1.3.1.ebuild 3694 RMD160 7097566299cdd840d9f20dab893ed1230a9ab8bb SHA1 0bea40de0e948d12458200abe3ec3f24d7f2400e SHA256 e8563270f1f30d88587e209b660cb8442f4f2ecd36f918f3188f9871cab2a9a2
-MD5 e46ea86b7f5c653d4a3f09c0f30bf224 uim-1.3.1.ebuild 3694
-RMD160 7097566299cdd840d9f20dab893ed1230a9ab8bb uim-1.3.1.ebuild 3694
-SHA256 e8563270f1f30d88587e209b660cb8442f4f2ecd36f918f3188f9871cab2a9a2 uim-1.3.1.ebuild 3694
-EBUILD uim-1.4.0.ebuild 3723 RMD160 33b28666316e9bb3748256eb866e31e6c98eba8a SHA1 05f8b432b49d99555ab684e2bc5d52475fb44762 SHA256 682b2b18fc5d9f39d4e22ca3044328406a3acad10af43e7a5ce53051a1b7763d
-MD5 533a0a6035bda170662dfeff3080aef5 uim-1.4.0.ebuild 3723
-RMD160 33b28666316e9bb3748256eb866e31e6c98eba8a uim-1.4.0.ebuild 3723
-SHA256 682b2b18fc5d9f39d4e22ca3044328406a3acad10af43e7a5ce53051a1b7763d uim-1.4.0.ebuild 3723
-EBUILD uim-1.4.1.ebuild 3973 RMD160 c10bb92cf9071b62085c188e4ee8d102558b302c SHA1 5a059bfe315c30beabcd0989b1a6fb17e06ecf30 SHA256 89b6f0f280d44cc3a9e3e7275b7385475da574436407fb023ff231bfd9fd4391
-MD5 b5624771e7efe76dd0ea84430e71f166 uim-1.4.1.ebuild 3973
-RMD160 c10bb92cf9071b62085c188e4ee8d102558b302c uim-1.4.1.ebuild 3973
-SHA256 89b6f0f280d44cc3a9e3e7275b7385475da574436407fb023ff231bfd9fd4391 uim-1.4.1.ebuild 3973
-MISC ChangeLog 23480 RMD160 3eee10d941219fded4b506a9111de291947850f2 SHA1 8ef5cfd99beb2344fe2be396a682af47a1bbc776 SHA256 bbae4ead75df33d1517cfafb088672a3e725bf1e37a30f68418e15652123ecfd
-MD5 578250659ecb8e3e75de6a0c3efaaced ChangeLog 23480
-RMD160 3eee10d941219fded4b506a9111de291947850f2 ChangeLog 23480
-SHA256 bbae4ead75df33d1517cfafb088672a3e725bf1e37a30f68418e15652123ecfd ChangeLog 23480
+EBUILD uim-1.4.1.ebuild 3959 RMD160 3be8d686ea0ecec61891e787c8d98c4d53c1f596 SHA1 d3843bab7a8df1d4371378a9f980dfe08e8f4129 SHA256 4e87f1bc1727e52c57a274895ec8aa7ff4c545652ee800ed5025faace4540d00
+MD5 f18eba0d9ce2fe2f8ac31da85c65cc09 uim-1.4.1.ebuild 3959
+RMD160 3be8d686ea0ecec61891e787c8d98c4d53c1f596 uim-1.4.1.ebuild 3959
+SHA256 4e87f1bc1727e52c57a274895ec8aa7ff4c545652ee800ed5025faace4540d00 uim-1.4.1.ebuild 3959
+MISC ChangeLog 23721 RMD160 a8047fd15dc16e2828c53389c301d0ced04845e9 SHA1 0b6ba313224f04af3bd00075dcb9a507e213d143 SHA256 31c9d20c406554a870cde7673cecf83afcfe1afbd303dfc6ba08c8b397ec520b
+MD5 30fe5d625df0f7264e73fb3a84b0a5ed ChangeLog 23721
+RMD160 a8047fd15dc16e2828c53389c301d0ced04845e9 ChangeLog 23721
+SHA256 31c9d20c406554a870cde7673cecf83afcfe1afbd303dfc6ba08c8b397ec520b ChangeLog 23721
 MISC metadata.xml 642 RMD160 4e733f159a595e48d0d02c410145909944b09554 SHA1 8187a74132d09878946f84871a8a33462481d6cb SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 RMD160 4e733f159a595e48d0d02c410145909944b09554 metadata.xml 642
 SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5 metadata.xml 642
-MD5 e4ad03226e7380b6aa074f0c110b38f9 files/digest-uim-1.2.1 232
-RMD160 ed2f608c9f7c57912640e947149cc2953a32046f files/digest-uim-1.2.1 232
-SHA256 3fb7fdfa4b61d82c0ac6dd36f4013e163046a844f65ea5f27229211451ebf433 files/digest-uim-1.2.1 232
-MD5 b4f0741e86f52bd5ad24b8c962f66cd7 files/digest-uim-1.3.1 232
-RMD160 6d6691b8d28e399cb21746d618e672a8cb8910d1 files/digest-uim-1.3.1 232
-SHA256 c088f8e316f34cc120b201360e9c30763415aaeaf7487395afbd08b73b104d6a files/digest-uim-1.3.1 232
-MD5 c46fef7e4ec723efa7ab5d1c395b4062 files/digest-uim-1.4.0 235
-RMD160 b654d88159ae9a8a9481ea57dc88f3002b303a4a files/digest-uim-1.4.0 235
-SHA256 fd1dda1c784054d6c4c9e9ffb2df45c96457e204da96b8c4429872d11e6c3f59 files/digest-uim-1.4.0 235
 MD5 d152f26c71ea00b72c2fe3f97111fd14 files/digest-uim-1.4.1 235
 RMD160 151fc716376cda004d69960cd01c5febbaa15232 files/digest-uim-1.4.1 235
 SHA256 039a5d4ace6c8645d94dd829e91aa326d7a50b859a9a28c84d6dbf9a7e5d9518 files/digest-uim-1.4.1 235
diff --git a/app-i18n/uim/files/digest-uim-1.2.1 b/app-i18n/uim/files/digest-uim-1.2.1
deleted file mode 100644
index 86f30a560f7c..000000000000
--- a/app-i18n/uim/files/digest-uim-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c27e96ea57e5fcd38ddc72876a1d6d1c uim-1.2.1.tar.gz 2149696
-RMD160 09c10fd43cc031ac14434a34f9c9e55d162375a3 uim-1.2.1.tar.gz 2149696
-SHA256 e2f257df389a516885ccfb18a068f7c153425cfb31de8487106e9e33bb1dcfbc uim-1.2.1.tar.gz 2149696
diff --git a/app-i18n/uim/files/digest-uim-1.3.1 b/app-i18n/uim/files/digest-uim-1.3.1
deleted file mode 100644
index 6ac288b9c5f4..000000000000
--- a/app-i18n/uim/files/digest-uim-1.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b90d3247cb9244701db59941a4e1f09 uim-1.3.1.tar.gz 2186681
-RMD160 cf3d6b85586a87f49c6ec389b06df2fb98488dd5 uim-1.3.1.tar.gz 2186681
-SHA256 12943eddc9131a82c512620af00dc8c1d8e33570b914a8a07227573d603aa513 uim-1.3.1.tar.gz 2186681
diff --git a/app-i18n/uim/files/digest-uim-1.4.0 b/app-i18n/uim/files/digest-uim-1.4.0
deleted file mode 100644
index acab32c76592..000000000000
--- a/app-i18n/uim/files/digest-uim-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3b5669a5eeee2d660dd179b3d7fec169 uim-1.4.0.tar.bz2 2684329
-RMD160 7bfa394d822b3bdc30736569b8543339d82ce10b uim-1.4.0.tar.bz2 2684329
-SHA256 0dc49075bace432a9be6116a966988e2991b8d052ed32043a9bdd60adaf92d2d uim-1.4.0.tar.bz2 2684329
diff --git a/app-i18n/uim/files/uim-1.2.1-nls.patch b/app-i18n/uim/files/uim-1.2.1-nls.patch
deleted file mode 100644
index d0cdc05a0cbe..000000000000
--- a/app-i18n/uim/files/uim-1.2.1-nls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: qt/qtgettext.h
-===================================================================
---- qt/qtgettext.h	(revision 4453)
-+++ qt/qtgettext.h	(revision 4454)
-@@ -57,6 +57,9 @@
- #define N_(String) (String)
- #endif /* gettext_noop */
- 
-+#else /* ENABLE_NLS */
-+
-+#define mygettext(String) QString::fromLocal8Bit( (const char *)(String) )
- #endif /* ENABLE_NLS */
- 
- #endif /* Not def: _QT_GETTEXT_H_ */
diff --git a/app-i18n/uim/files/uim-1.4.0-gentoo.patch b/app-i18n/uim/files/uim-1.4.0-gentoo.patch
deleted file mode 100644
index 5e08cd62e102..000000000000
--- a/app-i18n/uim/files/uim-1.4.0-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- intltool-update.in.orig	2007-01-26 01:43:29.000000000 +0900
-+++ intltool-update.in	2007-01-26 01:43:39.000000000 +0900
-@@ -64,7 +64,7 @@
- "ui|".			# Bonobo specific - User Interface desc. files
- "lang|".		# ?
- "glade2?(?:\\.in)*|".	# Glade specific - User Interface desc. files (Note: .in is not required)
--"scm-workaround(?:\\.in)*|".	# ? (Note: .in is not required)
-+"scm(?:\\.in)*|".	# ? (Note: .in is not required)
- "oaf(?:\\.in)+|".	# DEPRECATED: Replaces by Bonobo .server files 
- "etspec|".		# ?
- "server(?:\\.in)+|".	# Bonobo specific
-@@ -248,7 +248,7 @@
-    {
-        $gettext_type="glade";
-    }
--   elsif ($type =~ /scm-workaround(\.in)*$/) 
-+   elsif ($type =~ /scm(\.in)*$/) 
-    {
-        $gettext_type="scheme";
-    }
-@@ -341,11 +341,11 @@
- 
-     ## Check if we should ignore some found files, when
-     ## comparing with POTFILES.in
--    foreach my $ignore ("$SRCDIR/POTFILES.skip", "$SRCDIR/POTFILES.ignore")
-+    foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
-     {
- 	(-s $ignore) or next;
- 
--	if ("$ignore" eq "$SRCDIR/POTFILES.ignore")
-+	if ("$ignore" eq "POTFILES.ignore")
- 	{
- 	    print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n".
- 		  "content of this file to POTFILES.skip.\n";
-@@ -506,7 +506,7 @@
-     foreach (@buf_potfiles_sorted)
-     {
- 	chomp (my $dummy = $_);
--	if ("$dummy" ne "" and ! -f "$SRCDIR/../$dummy" and ! -f "../$dummy")
-+	if ("$dummy" ne "" and ! -f "$SRCDIR/../$dummy")
- 	{
- 	    push @buf_potfiles_notexist, $_;
- 	}
diff --git a/app-i18n/uim/uim-1.2.1.ebuild b/app-i18n/uim/uim-1.2.1.ebuild
deleted file mode 100644
index a009a8ef7d3f..000000000000
--- a/app-i18n/uim/uim-1.2.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.2.1.ebuild,v 1.18 2007/07/22 09:38:03 calchan Exp $
-
-inherit eutils kde-functions flag-o-matic multilib elisp-common
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib nls prime qt3 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? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	libedit? ( dev-libs/libedit )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt3? ( $(qt_min_version 3.3.4) )
-	sys-libs/ncurses
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )"
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		eerror "To support qt3 in this package is required to have"
-		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
-		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
-
-	fi
-	# 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}"
-	epatch "${FILESDIR}"/${P}-nls.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use gtk && (use anthy || use canna); then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	econf $(use_with X x) \
-		$(use_with anthy) \
-		$(use_with canna) \
-		$(use_enable eb) \
-		$(use_enable emacs) \
-		$(use_with gnome panel) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable nls) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	use emacs && elisp-site-file-install "${FILESDIR}"/50uim-el-gentoo.el
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-
-	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
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}"/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.3.1.ebuild b/app-i18n/uim/uim-1.3.1.ebuild
deleted file mode 100644
index 9f29fd5f8de6..000000000000
--- a/app-i18n/uim/uim-1.3.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.3.1.ebuild,v 1.4 2007/07/22 09:38:03 calchan Exp $
-
-inherit eutils kde-functions flag-o-matic multilib elisp-common
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 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? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs )
-	libedit? ( dev-libs/libedit )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt3? ( $(qt_min_version 3.3.4) )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )"
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		eerror "To support qt3 in this package is required to have"
-		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
-		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
-
-	fi
-	# 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}"
-	epatch "${FILESDIR}"/${PN}-1.2.1-nls.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use gtk && (use anthy || use canna); then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with anthy) \
-		$(use_with canna) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	use emacs && elisp-site-file-install "${FILESDIR}"/50uim-el-gentoo.el
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-
-	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
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}"/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.4.0.ebuild b/app-i18n/uim/uim-1.4.0.ebuild
deleted file mode 100644
index 17f99d7633be..000000000000
--- a/app-i18n/uim/uim-1.4.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.0.ebuild,v 1.3 2007/07/22 09:38:03 calchan Exp $
-
-inherit eutils qt3 multilib elisp-common flag-o-matic
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/uim/stable/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 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? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs )
-	libedit? ( dev-libs/libedit )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt3? ( $(qt_min_version 3.3.4) )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )"
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		eerror "To support qt3 in this package is required to have"
-		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
-		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
-
-	fi
-	# 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}"
-	epatch "${FILESDIR}"/${PN}-1.2.1-nls.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use gtk && (use anthy || use canna); then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with anthy) \
-		$(use_with canna) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		$(use_enable kde kde-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	use emacs && elisp-site-file-install "${FILESDIR}"/50uim-el-gentoo.el
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-
-	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 "or uim-im-switcher-qt."
-	elog
-
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}"/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}"/${GTK2_CONFDIR}/gtk.immodules
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.4.1.ebuild b/app-i18n/uim/uim-1.4.1.ebuild
index e91279c57bab..86961ae381f6 100644
--- a/app-i18n/uim/uim-1.4.1.ebuild
+++ b/app-i18n/uim/uim-1.4.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.11 2007/08/10 18:01:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.12 2007/08/10 22:27:21 matsuu Exp $
 
 inherit eutils qt3 multilib elisp-common flag-o-matic
 
 DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/uim/stable/${P}.tar.bz2"
+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"