Version bumped.

(Portage version: 2.0.51.22-r1)

7 files changed, 35 insertions, 42 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 9af3ad5d3627..c78f51e079ab 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2005/06/26 14:56:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.101 2005/07/18 10:30:16 usata Exp $
+
+*uim-0.4.7.1 (18 Jul 2005)
+
+  18 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> uim-0.4.6-r2.ebuild,
+  -uim-0.4.7_beta1.ebuild, uim-0.4.7.ebuild, +uim-0.4.7.1.ebuild:
+  Version bumped.
 
 *uim-0.4.7 (26 Jun 2005)
 
@@ -48,7 +54,7 @@
   +uim-0.4.6-r1.ebuild:
   Updated prime.scm.
 
-  27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> uim-0.4.5.1.ebuild:
+  27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> uim-0.4.5.1.ebuild:
   Stable on alpha, bug 82678.
 
 *uim-0.4.6 (27 Feb 2005)
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index a9a2ec4bec90..554e55ad2a73 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
 MD5 6e79cb82a3efa10e9c1d946d1e39eaab ChangeLog 14860
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 be78e68a1d5e448f6e3ad5c8a89b830c uim-0.4.7.ebuild 3251
-MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
 MD5 221153655e1fe7bac2daef5d116032a0 uim-0.4.6-r2.ebuild 3520
+MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
+MD5 be78e68a1d5e448f6e3ad5c8a89b830c uim-0.4.7.1.ebuild 3251
 MD5 71192dbb01fa84bbc56874ea43cbae3f uim-0.4.7_beta1.ebuild 3257
+MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 4661795c7be34416dbbb12571cb9f585 files/digest-uim-0.4.7 127
 MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
-MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 457b374b1271701f1b29274d2d4551c7 files/digest-uim-0.4.7_beta1 132
 MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
-MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
+MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1 129
 MD5 cc10c5d38fe1cce5a6e17fad95da53d7 files/uim-0.4.6-gtk2_4-gentoo.diff 441
+MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
+MD5 457b374b1271701f1b29274d2d4551c7 files/digest-uim-0.4.7_beta1 132
+MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
 MD5 faf7d637e9266fbc6613cdf8ee56e427 files/uim-0.4.6-nls.diff 404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCvr/2VWNWqTUmv+0RArdRAKCPQQvnj06rdSen/2dZaHjLHseLeQCffTY3
-gm/QTPfqc//bXmgj6Uf1RxA=
-=1bNW
------END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/digest-uim-0.4.7.1 b/app-i18n/uim/files/digest-uim-0.4.7.1
new file mode 100644
index 000000000000..f130072068a3
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.7.1
@@ -0,0 +1,2 @@
+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.7_beta1 b/app-i18n/uim/files/digest-uim-0.4.7_beta1
deleted file mode 100644
index 9a0129c5671c..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.7_beta1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5aa631c68c205abc4fadba3c3aa83f43 uim-0.4.7beta1.tar.gz 1545443
-MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/uim-0.4.6-r2.ebuild b/app-i18n/uim/uim-0.4.6-r2.ebuild
index 1318d79dc64a..2ccea0cc68bc 100644
--- a/app-i18n/uim/uim-0.4.6-r2.ebuild
+++ b/app-i18n/uim/uim-0.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.6-r2.ebuild,v 1.6 2005/06/18 16:15:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6-r2.ebuild,v 1.7 2005/07/18 10:30:16 usata Exp $
 
 inherit eutils kde-functions
 
@@ -26,9 +26,10 @@ RDEPEND="X? ( virtual/x11 )
 	canna? ( app-i18n/canna )
 	immqt? ( >=x11-libs/qt-3.3.3-r1 )
 	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )
-	qt? ( >=x11-libs/qt-3.3.3-r1
-		!app-i18n/uim-kdehelper )
-	!<app-i18n/prime-0.9.4"
+	qt? ( >=x11-libs/qt-3.3.3-r1 )
+	!<app-i18n/prime-0.9.4
+	!app-i18n/uim-kdehelper
+	!app-i18n/uim-qt"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
diff --git a/app-i18n/uim/uim-0.4.7_beta1.ebuild b/app-i18n/uim/uim-0.4.7.1.ebuild
index 2d75958f61ff..0c337f7d38ba 100644
--- a/app-i18n/uim/uim-0.4.7_beta1.ebuild
+++ b/app-i18n/uim/uim-0.4.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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_beta1.ebuild,v 1.1 2005/06/20 04:36:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.1.ebuild,v 1.1 2005/07/18 10:30:16 usata Exp $
 
 inherit eutils kde-functions
 
@@ -9,8 +9,7 @@ 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"
+SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
@@ -26,9 +25,10 @@ RDEPEND="X? ( virtual/x11 )
 	canna? ( app-i18n/canna )
 	immqt? ( >=x11-libs/qt-3.3.3-r1 )
 	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )
-	qt? ( >=x11-libs/qt-3.3.3-r1
-		!app-i18n/uim-kdehelper )
-	!<app-i18n/prime-0.9.4"
+	qt? ( >=x11-libs/qt-3.3.3-r1 )
+	!<app-i18n/prime-0.9.4
+	!app-i18n/uim-qt
+	!app-i18n/uim-kdehelper"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
@@ -75,18 +75,11 @@ src_compile() {
 	# --with-scim is not stable enough
 	econf ${myconf} --without-scim || die "econf failed"
 	emake -j1 || die "emake failed"
-
-	cd ${WORKDIR}/prime-1.0.0.1
-	econf || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	make DESTDIR="${D}" install-uim || die "make install-uim failed"
-	cd -
-
 	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
 	use X && dodoc doc/XIM-SERVER
diff --git a/app-i18n/uim/uim-0.4.7.ebuild b/app-i18n/uim/uim-0.4.7.ebuild
index e5445ed5393a..bb361be713c6 100644
--- a/app-i18n/uim/uim-0.4.7.ebuild
+++ b/app-i18n/uim/uim-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2005/06/26 14:56:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.ebuild,v 1.2 2005/07/18 10:30:16 usata Exp $
 
 inherit eutils kde-functions
 
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
 #IUSE="${IUSE} scim"
 
@@ -26,9 +26,10 @@ RDEPEND="X? ( virtual/x11 )
 	canna? ( app-i18n/canna )
 	immqt? ( >=x11-libs/qt-3.3.3-r1 )
 	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )
-	qt? ( >=x11-libs/qt-3.3.3-r1
-		!app-i18n/uim-kdehelper )
-	!<app-i18n/prime-0.9.4"
+	qt? ( >=x11-libs/qt-3.3.3-r1 )
+	!<app-i18n/prime-0.9.4
+	!app-i18n/uim-kdehelper
+	!app-i18n/uim-qt"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser