8 files changed, 44 insertions, 97 deletions
diff --git a/app-i18n/uim-qt/ChangeLog b/app-i18n/uim-qt/ChangeLog
index d39e4d8e61d0..3b99d86ce2ef 100644
--- a/app-i18n/uim-qt/ChangeLog
+++ b/app-i18n/uim-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/uim-qt
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-qt/ChangeLog,v 1.3 2004/08/21 20:35:31 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-qt/ChangeLog,v 1.4 2004/09/05 12:22:06 usata Exp $
+
+*uim-qt-0.1.7 (05 Sep 2004)
+
+  05 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/uim-qt-0.1.7-thread.diff, -uim-qt-0.1.6_p20040815.ebuild,
+  -uim-qt-0.1.6_p20040821.ebuild, +uim-qt-0.1.7.ebuild:
+  Version bumped. Removed old SVN snapshots.
 
 *uim-qt-0.1.6_p20040821 (22 Aug 2004)
 
diff --git a/app-i18n/uim-qt/Manifest b/app-i18n/uim-qt/Manifest
index bb5c4dee7bad..3aba46a79755 100644
--- a/app-i18n/uim-qt/Manifest
+++ b/app-i18n/uim-qt/Manifest
@@ -2,5 +2,7 @@ MD5 709108f00ce2f7562db05bf3502b3d8f ChangeLog 715
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 5429e5c8a543c8e02f49d8a4ec7b6206 uim-qt-0.1.6_p20040821.ebuild 1988
 MD5 7ee37ba91a6ce094c59ce3126d1acd32 uim-qt-0.1.6_p20040815.ebuild 1931
+MD5 6ca904483e28f13a0d8c34100a6c81b6 uim-qt-0.1.7.ebuild 1869
 MD5 f3a49c6e26e5f23881e9c4160ddcf4ba files/digest-uim-qt-0.1.6_p20040821 72
 MD5 6104b3b5189dd43b0acc3fc0ef50fa4e files/digest-uim-qt-0.1.6_p20040815 72
+MD5 f25e7d996a501e01443a0f31caf33284 files/digest-uim-qt-0.1.7 63
diff --git a/app-i18n/uim-qt/files/digest-uim-qt-0.1.6_p20040815 b/app-i18n/uim-qt/files/digest-uim-qt-0.1.6_p20040815
deleted file mode 100644
index cc2265c49f6d..000000000000
--- a/app-i18n/uim-qt/files/digest-uim-qt-0.1.6_p20040815
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22f582941b7b037eb8de3de509574571 uim-qt-0.1.6-20040815.tar.gz 47057
diff --git a/app-i18n/uim-qt/files/digest-uim-qt-0.1.6_p20040821 b/app-i18n/uim-qt/files/digest-uim-qt-0.1.6_p20040821
deleted file mode 100644
index 037b9c4065c5..000000000000
--- a/app-i18n/uim-qt/files/digest-uim-qt-0.1.6_p20040821
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1b07c76682659071f179210e4f84d3b uim-qt-0.1.6-20040821.tar.gz 41586
diff --git a/app-i18n/uim-qt/files/digest-uim-qt-0.1.7 b/app-i18n/uim-qt/files/digest-uim-qt-0.1.7
new file mode 100644
index 000000000000..ce277c4abe6c
--- /dev/null
+++ b/app-i18n/uim-qt/files/digest-uim-qt-0.1.7
@@ -0,0 +1 @@
+MD5 7d75d796e53cf915e415439cfc29f76e uim-qt-0.1.7.tar.gz 18253
diff --git a/app-i18n/uim-qt/files/uim-qt-0.1.7-thread.diff b/app-i18n/uim-qt/files/uim-qt-0.1.7-thread.diff
new file mode 100644
index 000000000000..d61784ff617d
--- /dev/null
+++ b/app-i18n/uim-qt/files/uim-qt-0.1.7-thread.diff
@@ -0,0 +1,11 @@
+--- quiminputcontextplugin.pro.orig	2004-09-05 10:19:56.000000000 +0900
++++ quiminputcontextplugin.pro	2004-09-05 21:04:28.000000000 +0900
+@@ -4,7 +4,7 @@
+ 
+ TEMPLATE = lib
+ INCLUDEPATH += . /usr/local/include/uim
+-CONFIG += qt plugin
++CONFIG += qt plugin thread
+ LIBS += -luim
+ DEFINES += 
+ 
diff --git a/app-i18n/uim-qt/uim-qt-0.1.6_p20040821.ebuild b/app-i18n/uim-qt/uim-qt-0.1.6_p20040821.ebuild
deleted file mode 100644
index e4eb8eafa056..000000000000
--- a/app-i18n/uim-qt/uim-qt-0.1.6_p20040821.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-qt/uim-qt-0.1.6_p20040821.ebuild,v 1.1 2004/08/21 20:35:31 usata Exp $
-
-MY_PN="quiminputcontextplugin"
-#MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_PN}"
-#MY_P="${MY_PN}-bc-${PV/*_p/}"
-#S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Qt immodules input method framework plugin for UIM"
-HOMEPAGE="http://uim.freedesktop.org/"
-#SRC_URI="http://mover.cool.ne.jp/others/immodule/${MY_P}.tar.gz"
-#SRC_URI="http://freedesktop.org/~tkng/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${P/_p/-}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${P/_p/-}.tar.gz"
-
-LICENSE="GPL-2 | BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="app-i18n/uim
-	>=x11-libs/qt-3.3.2"
-
-pkg_setup() {
-	ewarn
-	ewarn "You need to install >=x11-libs/qt-3.3.2 with immqt or immqt-bc"
-	ewarn "USE flag enabled. (NOTE: This has been changed from cjk.)"
-	ewarn
-	if [ ! -e /usr/qt/3/include/qinputcontext.h ] ; then
-		die "You need to rebuild >=x11-libs/qt-3.3.2 with immqt or immqt-bc USE flag enabled."
-	fi
-	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
-		die "Your Qt was not built against the latest immodule API. Please rebuild >=x11-libs/qt-3.3.2."
-	fi
-}
-
-src_compile() {
-	sed -e 's,${QTDIR},${D}${QTDIR},g' install > ${T}/install
-
-	qmake || die "qmake failed"
-	emake -j1 || die "make failed."
-}
-
-src_install() {
-	sh ${T}/install || die "install failed"
-
-	dodoc COPYING ChangeLog README* TODO
-}
-
-src_test() {
-	#cd edittest
-	#qmake -project || die "qmake -project failed"
-	#qmake || die "qmake failed"
-	#emake || die "emake failed"
-	#
-	# This programme needs human interaction to test. (i.e. You need to
-	# manually check whether quiminputcontextplugin is working or not
-	# with GUI interface)
-	#./edittest
-	return
-}
-
-pkg_postinst() {
-	einfo
-	einfo "After you emerged ${PN}, run"
-	einfo "	% qtconfig"
-	einfo "and select your immodule to enable ${PN}."
-	einfo
-}
diff --git a/app-i18n/uim-qt/uim-qt-0.1.6_p20040815.ebuild b/app-i18n/uim-qt/uim-qt-0.1.7.ebuild
index 5a182c56f371..73adf478d21a 100644
--- a/app-i18n/uim-qt/uim-qt-0.1.6_p20040815.ebuild
+++ b/app-i18n/uim-qt/uim-qt-0.1.7.ebuild
@@ -1,40 +1,35 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-qt/uim-qt-0.1.6_p20040815.ebuild,v 1.2 2004/08/21 20:35:31 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-qt/uim-qt-0.1.7.ebuild,v 1.1 2004/09/05 12:22:06 usata Exp $
 
-MY_PN="quiminputcontextplugin"
-#MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_PN}"
-#MY_P="${MY_PN}-bc-${PV/*_p/}"
-#S="${WORKDIR}/${MY_P}"
+inherit eutils
 
 DESCRIPTION="Qt immodules input method framework plugin for UIM"
-HOMEPAGE="http://uim.freedesktop.org/"
-#SRC_URI="http://mover.cool.ne.jp/others/immodule/${MY_P}.tar.gz"
-#SRC_URI="http://freedesktop.org/~tkng/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${P/_p/-}.tar.gz"
+HOMEPAGE="http://freedesktop.org/Software/UimQt"
+SRC_URI="http://freedesktop.org/~kzk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="app-i18n/uim
+DEPEND=">=app-i18n/uim-0.4.3
 	>=x11-libs/qt-3.3.2"
 
+S="${WORKDIR}/${PN}"
+
 pkg_setup() {
-	ewarn
-	ewarn "You need to install >=x11-libs/qt-3.3.2 with immqt or immqt-bc"
-	ewarn "USE flag enabled. (NOTE: This has been changed from cjk.)"
-	ewarn
-	if [ ! -e /usr/qt/3/include/qinputcontext.h ] ; then
-		die "You need to rebuild >=x11-libs/qt-3.3.2 with immqt or immqt-bc USE flag enabled."
-	fi
 	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
-		die "Your Qt was not built against the latest immodule API. Please rebuild >=x11-libs/qt-3.3.2."
+		die "You need to rebuild >=x11-libs/qt-3.3.2 with immqt or immqt-bc USE flag enabled."
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-thread.diff
+}
+
 src_compile() {
 	sed -e 's,${QTDIR},${D}${QTDIR},g' install > ${T}/install
 
@@ -45,7 +40,7 @@ src_compile() {
 src_install() {
 	sh ${T}/install || die "install failed"
 
-	dodoc COPYING ChangeLog README* TODO
+	dodoc COPYING ChangeLog README* TODO THANKS
 }
 
 src_test() {
@@ -63,8 +58,12 @@ src_test() {
 
 pkg_postinst() {
 	einfo
-	einfo "After you emerged ${PN}, run"
-	einfo "	% qtconfig"
-	einfo "and select your immodule to enable ${PN}."
+	einfo "After you emerged ${PN}, use right click to switch immodules for Qt."
+	einfo "If you would like to use scim-qtimm as default instead of XIM, set QT_IM_MODULE to uim-*."
+	einfo "e.g.)"
+	einfo "	% export QT_IM_MODULE=uim-anthy"
 	einfo
+	ewarn
+	ewarn "qtconfig is no longer used for selecting input methods."
+	ewarn
 }