Version bumped. This closes bug #98321.

(Portage version: 2.0.51.22-r1)

8 files changed, 20 insertions, 65 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 0556e354d97a..19427fc7c345 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-qtimm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.24 2005/07/03 13:20:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.25 2005/07/08 09:13:24 usata Exp $
+
+*scim-qtimm-0.9.2 (08 Jul 2005)
+
+  08 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -scim-qtimm-0.8.5-r1.ebuild, -scim-qtimm-0.9.0.ebuild,
+  scim-qtimm-0.9.1.ebuild, +scim-qtimm-0.9.2.ebuild:
+  Version bumped. This closes bug #98321.
 
   03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
   scim-qtimm-0.8.95.ebuild:
diff --git a/app-i18n/scim-qtimm/Manifest b/app-i18n/scim-qtimm/Manifest
index 099d13367985..0c182d310039 100644
--- a/app-i18n/scim-qtimm/Manifest
+++ b/app-i18n/scim-qtimm/Manifest
@@ -1,12 +1,14 @@
-MD5 c6faec95455e1819478b36710f225383 scim-qtimm-0.8.9.ebuild 1540
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 33ff512995514613ae8ae7bbff987b09 ChangeLog 3724
-MD5 a7d79eb9081d43b7b1c6c352b1fbd876 scim-qtimm-0.9.1.ebuild 1496
+MD5 c6faec95455e1819478b36710f225383 scim-qtimm-0.8.9.ebuild 1540
 MD5 22747485a8aa4d8fc02e5188970ad8e0 scim-qtimm-0.8.95.ebuild 1541
 MD5 7c689695825e6da6e7dca8f160988d3d scim-qtimm-0.9.0.ebuild 1496
+MD5 a7d79eb9081d43b7b1c6c352b1fbd876 scim-qtimm-0.9.1.ebuild 1496
 MD5 359efb4c9a3d90ccd7ffd0a0ea12a98a scim-qtimm-0.8.5-r1.ebuild 1462
-MD5 afa2d5d8014e1aa90be96290e6e76d7e files/digest-scim-qtimm-0.9.0 69
-MD5 4430f786f093fcbd11d2a6507f8fa076 files/digest-scim-qtimm-0.8.5-r1 69
+MD5 a7d79eb9081d43b7b1c6c352b1fbd876 scim-qtimm-0.9.2.ebuild 1496
 MD5 950e54af1528a6bd79c51074b4cb9b1d files/digest-scim-qtimm-0.8.9 69
 MD5 ca25d0f0af2f019b21e0153c1f1b50aa files/digest-scim-qtimm-0.8.95 70
+MD5 afa2d5d8014e1aa90be96290e6e76d7e files/digest-scim-qtimm-0.9.0 69
 MD5 3811b7ea72abdefe6b02dce2c8318fe5 files/digest-scim-qtimm-0.9.1 69
+MD5 4430f786f093fcbd11d2a6507f8fa076 files/digest-scim-qtimm-0.8.5-r1 69
+MD5 b436588150ad1499ad64007ddfa75679 files/digest-scim-qtimm-0.9.2 69
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.8.5-r1 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.8.5-r1
deleted file mode 100644
index abc47b2c2f45..000000000000
--- a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.8.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 845ddf0b837acb6ce63fdab5fd16c3d1 scim-qtimm-0.8.5.tar.bz2 464976
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.0 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.0
deleted file mode 100644
index cdd9baaec6b4..000000000000
--- a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90a43926484c21915c397a985133c6f4 scim-qtimm-0.9.0.tar.bz2 525191
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.2 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.2
new file mode 100644
index 000000000000..d5ef08a91d3b
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.2
@@ -0,0 +1 @@
+MD5 e9b90329baa2db8a0a9f07ce734cdaee scim-qtimm-0.9.2.tar.bz2 544138
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.8.5-r1.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.8.5-r1.ebuild
deleted file mode 100644
index 76303ed6b8bf..000000000000
--- a/app-i18n/scim-qtimm/scim-qtimm-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,56 +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/scim-qtimm/scim-qtimm-0.8.5-r1.ebuild,v 1.2 2005/04/24 11:20:13 hansmi Exp $
-
-inherit kde-functions
-
-need-qt 3.3.4
-
-DESCRIPTION="Qt immodules input method framework plugin for SCIM"
-HOMEPAGE="http://scim.freedesktop.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
-	http://freedesktop.org/~scim/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="nls arts"
-
-DEPEND=">=app-i18n/scim-1.1.3
-	nls? ( sys-devel/gettext )
-	arts? ( kde-base/arts )"
-
-pkg_setup() {
-	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
-		die "You need to rebuild >=x11-libs/qt-3.3.3-r1 with immqt-bc(recommended) or immqt USE flag enabled."
-	fi
-}
-
-src_compile() {
-
-	# bug #84369
-	if which kde-config >/dev/null 2>&1 ; then
-		export KDEDIR=$(kde-config --prefix)
-		export kde_kcfgdir=/usr/share/config.kcfg
-		export kde_servicesdir=/usr/share/services
-	fi
-
-	econf --enable-mt \
-		$(use_enable nls) \
-		$(use_with arts) || die
-	emake -j1 || die "make failed."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README NEWS TODO
-}
-
-pkg_postinst() {
-	einfo
-	einfo "After you emerged ${PN}, use right click to switch immodules for Qt."
-	einfo "If you would like to use ${PN} as default instead of XIM, set"
-	einfo "	% export QT_IM_MODULE=scim"
-	einfo
-}
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.9.1.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.9.1.ebuild
index ca6fe2b6d0a9..e94449772de4 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.9.1.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.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/scim-qtimm/scim-qtimm-0.9.1.ebuild,v 1.1 2005/06/27 05:23:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.1.ebuild,v 1.2 2005/07/08 09:13:24 usata Exp $
 
 inherit kde-functions
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls arts"
 
 DEPEND="|| ( >=app-i18n/scim-1.3 >=app-i18n/scim-cvs-1.3 )
+	!>=app-i18n/scim-1.3.2
 	nls? ( sys-devel/gettext )
 	arts? ( kde-base/arts )"
 
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.9.0.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.9.2.ebuild
index 5d1ede9c4fba..3f511fbe2e2b 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.9.0.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.2.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/scim-qtimm/scim-qtimm-0.9.0.ebuild,v 1.2 2005/06/21 11:20:20 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.2.ebuild,v 1.1 2005/07/08 09:13:24 usata Exp $
 
 inherit kde-functions
 
@@ -20,6 +20,8 @@ DEPEND="|| ( >=app-i18n/scim-1.3 >=app-i18n/scim-cvs-1.3 )
 	nls? ( sys-devel/gettext )
 	arts? ( kde-base/arts )"
 
+S="${WORKDIR}/${PN}"
+
 pkg_setup() {
 	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
 		die "You need to rebuild >=x11-libs/qt-3.3.3-r1 with immqt-bc(recommended) or immqt USE flag enabled."