Version bumped; bug #83952.

Package-Manager: portage-2.0.51.18

5 files changed, 22 insertions, 15 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 5aea2b6b2b49..4c0befc8c75a 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.12 2005/02/27 11:17:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.13 2005/03/05 13:24:58 usata Exp $
+
+*scim-qtimm-0.8.5 (05 Mar 2005)
+
+  05 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -scim-qtimm-0.7.ebuild,
+  scim-qtimm-0.8.0.ebuild, +scim-qtimm-0.8.5.ebuild:
+  Version bumped; bug #83952.
+  Thanks to Federico Zenith <zenith@chemeng.ntnu.no>.
 
   27 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> scim-qtimm-0.7.5.ebuild:
   Stable on x86.
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.7 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.7
deleted file mode 100644
index 103437d72963..000000000000
--- a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ddb0db30a54723ec4764979e52bfc2f scim-qtimm-0.7.tar.bz2 440261
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.8.5 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.8.5
new file mode 100644
index 000000000000..abc47b2c2f45
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.8.5
@@ -0,0 +1 @@
+MD5 845ddf0b837acb6ce63fdab5fd16c3d1 scim-qtimm-0.8.5.tar.bz2 464976
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.8.0.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.8.0.ebuild
index 41b8e412dc4e..bd1dd41a4bcf 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.8.0.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.8.0.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.8.0.ebuild,v 1.1 2005/02/10 11:58:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.8.0.ebuild,v 1.2 2005/03/05 13:24:58 usata Exp $
 
 DESCRIPTION="Qt immodules input method framework plugin for SCIM"
 HOMEPAGE="http://scim.freedesktop.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="nls"
 
 DEPEND=">=app-i18n/scim-1.1
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.8.5.ebuild
index a853d15c797e..6865bf9d411a 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.8.5.ebuild
@@ -1,30 +1,33 @@
 # 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.7.ebuild,v 1.4 2005/01/01 14:39:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.8.5.ebuild,v 1.1 2005/03/05 13:24:58 usata 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="http://freedesktop.org/~cougar/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
+	http://freedesktop.org/~scim/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="nls"
 
-DEPEND=">=app-i18n/scim-0.99.9
-	|| ( =x11-libs/qt-3.3.3 =x11-libs/qt-3.3.2 )
+DEPEND=">=app-i18n/scim-1.1.3
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
 	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
-		die "You need to rebuild qt-3.3.3 or qt-3.3.2 with immqt-bc(recommended) or immqt USE flag enabled."
+		die "You need to rebuild >=x11-libs/qt-3.3.3-r1 with immqt-bc(recommended) or immqt USE flag enabled."
 	fi
 }
 
 src_compile() {
-	addpredict /usr/qt/3/etc/settings
 
-	econf `use_enable nls` || die
+	econf $(use_enable nls) || die
 	emake -j1 || die "make failed."
 }
 
@@ -40,7 +43,4 @@ pkg_postinst() {
 	einfo "If you would like to use ${PN} as default instead of XIM, set"
 	einfo "	% export QT_IM_MODULE=scim"
 	einfo
-	ewarn
-	ewarn "qtconfig is no longer used for selecting input methods."
-	ewarn
 }