Version bumped. Removed old versions.

Package-Manager: portage-2.0.51-r15

7 files changed, 23 insertions, 80 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 3987b444bbe1..b6dcfe67e254 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.82 2005/02/20 14:04:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.83 2005/02/20 14:30:50 usata Exp $
+
+*uim-0.4.6_beta2 (20 Feb 2005)
+
+  20 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> -uim-0.4.2.1.ebuild,
+  -uim-0.4.6_alpha1.ebuild, +uim-0.4.6_beta2.ebuild:
+  Version bumped. Removed old versions.
 
 *uim-0.4.5.1 (20 Feb 2005)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 9a78d79483ab..0ecfa85a488d 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,16 +1,14 @@
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 ab6460c8c596c19084ed3a36c747cbf1 ChangeLog 12599
+MD5 b89e856e002c3e3627a2a0ae00b37950 ChangeLog 12795
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 18acee6c4d7c6c7f8ef204bc9fc30f57 uim-0.4.1.ebuild 1785
 MD5 13b00719e566723c9d684cac75c7439e uim-0.4.5.ebuild 2267
-MD5 6d242be81b4f8e51e63c5997d12f4523 uim-0.4.2.1.ebuild 1795
 MD5 0fc1074427094c2b21bd58fc88e83558 uim-0.4.5.1.ebuild 2264
-MD5 2fe33c163792c93e1024bc5f17ee381b uim-0.4.6_alpha1.ebuild 2672
+MD5 46f0f14b7bc6aeeebd77d58cd129a923 uim-0.4.6_beta2.ebuild 2731
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 bb951055d72fd152ee21f5f8cfc9140f files/digest-uim-0.4.1 61
 MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
 MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
-MD5 00537e2c63ca679a4889917d52b74a60 files/digest-uim-0.4.2.1 63
 MD5 fc4ac83ce1c4a273be674bbcdb3dea5b files/digest-uim-0.4.5 62
-MD5 9c0341999a72cda7ff17ef9e87383660 files/digest-uim-0.4.6_alpha1 68
 MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
+MD5 8bb656894106076ea0bfb11149c57135 files/digest-uim-0.4.6_beta2 67
diff --git a/app-i18n/uim/files/digest-uim-0.4.2.1 b/app-i18n/uim/files/digest-uim-0.4.2.1
deleted file mode 100644
index 2ba6ce98f530..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f82891e41b8328f1df34b30b15648e4 uim-0.4.2.1.tar.gz 955719
diff --git a/app-i18n/uim/files/digest-uim-0.4.6_alpha1 b/app-i18n/uim/files/digest-uim-0.4.6_alpha1
deleted file mode 100644
index fdd3d75c5797..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.6_alpha1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc6e8f061b128ca7153c6f6a7a084a4c uim-0.4.6alpha1.tar.gz 1353517
diff --git a/app-i18n/uim/files/digest-uim-0.4.6_beta2 b/app-i18n/uim/files/digest-uim-0.4.6_beta2
new file mode 100644
index 000000000000..fe251dbb6d85
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.6_beta2
@@ -0,0 +1 @@
+MD5 c445bbd2fe7241c964ccf9985bc880d5 uim-0.4.6beta2.tar.gz 1414000
diff --git a/app-i18n/uim/uim-0.4.2.1.ebuild b/app-i18n/uim/uim-0.4.2.1.ebuild
deleted file mode 100644
index d9fe1b81f568..000000000000
--- a/app-i18n/uim/uim-0.4.2.1.ebuild
+++ /dev/null
@@ -1,65 +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.2.1.ebuild,v 1.5 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 ~amd64 ~ppc64 ~sparc"
-IUSE="gtk nls debug X m17n-lib"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep"
-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
-	epatch ${FILESDIR}/${PN}-pinyin-big5-gentoo.diff
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-
-	use debug && append-flags -g
-	econf `use_enable nls` \
-		`use_with X x` \
-		`use_with gtk gtk2` \
-		`use_with m17n-lib m17nlib` \
-		|| die "econf failed"
-	emake || 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 (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge >=app-i18n/prime-0.8."
-	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.6_alpha1.ebuild b/app-i18n/uim/uim-0.4.6_beta2.ebuild
index 5b95b679d670..a1095f8033bd 100644
--- a/app-i18n/uim/uim-0.4.6_alpha1.ebuild
+++ b/app-i18n/uim/uim-0.4.6_beta2.ebuild
@@ -1,8 +1,8 @@
 # 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_alpha1.ebuild,v 1.1 2005/02/11 15:53:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6_beta2.ebuild,v 1.1 2005/02/20 14:30:50 usata Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic kde-functions
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -14,7 +14,7 @@ SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~ppc64 ~sparc"
-IUSE="gtk immqt immqt-bc nls debug X m17n-lib canna"
+IUSE="gtk qt immqt immqt-bc nls debug X m17n-lib canna"
 
 RDEPEND="X? ( virtual/x11 )
 	gtk? ( >=x11-libs/gtk+-2 )
@@ -23,7 +23,8 @@ RDEPEND="X? ( virtual/x11 )
 	!app-i18n/uim-fep
 	canna? ( app-i18n/canna )
 	immqt? ( >=x11-libs/qt-3.3.3-r1 )
-	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )"
+	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )
+	qt? ( >=x11-libs/qt-3.3.3-r1 )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
@@ -47,6 +48,9 @@ src_compile() {
 		myconf="${myconf} --enable-qt-immodule"
 		export CPPFLAGS="${CPPFLAGS} -I${S}/qt"
 	fi
+	if use qt ; then
+		set-qtdir 3
+	fi
 
 	use debug && append-flags -g
 	econf $(use_enable nls) \
@@ -54,6 +58,7 @@ src_compile() {
 		$(use_with gtk gtk2) \
 		$(use_with m17n-lib m17nlib) \
 		$(use_with canna) \
+		$(use_with qt) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }
@@ -68,9 +73,8 @@ src_install() {
 pkg_postinst() {
 	einfo
 	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-canna you should emerge app-i18n/canna."
 	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-0.8."
+	einfo "To use uim-prime you should emerge app-i18n/prime"
 	einfo
 
 	ewarn
@@ -83,7 +87,8 @@ pkg_postinst() {
 	ewarn "(define default-im-name 'anthy)"
 	ewarn "to your ~/.uim."
 	ewarn
-	ewarn "All input methods can be found by running uim-pref-gtk or uim-pref-qt."
+	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}/etc/gtk-2.0/gtk.immodules