Compile fix for qt-3.3.3-r1.

5 files changed, 66 insertions, 7 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index aebfe488eb61..e346d2e35bf8 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-qtimm
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.6 2004/09/04 20:14:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.7 2004/09/10 16:47:17 usata Exp $
+
+*scim-qtimm-0.7-r1 (11 Sep 2004)
+
+  11 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +scim-qtimm-0.7-r1.ebuild,
+  scim-qtimm-0.7.ebuild:
+  Compile fix for qt-3.3.3-r1.
 
 *scim-qtimm-0.7 (05 Sep 2004)
 
diff --git a/app-i18n/scim-qtimm/Manifest b/app-i18n/scim-qtimm/Manifest
index d4e9a6d406ad..1b4c49771b74 100644
--- a/app-i18n/scim-qtimm/Manifest
+++ b/app-i18n/scim-qtimm/Manifest
@@ -1,4 +1,6 @@
-MD5 e1d92943a43953ec0b4b4a98fe99b406 ChangeLog 1306
+MD5 d41d8f538bf308699728eefea44ec57b ChangeLog 1473
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 09694fd63115a86d7b9a003311e90629 scim-qtimm-0.7.ebuild 1242
+MD5 08f71cb45523d26ea1c7764085251ddd scim-qtimm-0.7.ebuild 1269
+MD5 6a4faa09599c438826450773a775769c scim-qtimm-0.7-r1.ebuild 1357
 MD5 a6dc4a6c7fbfdc9004372662fe9cd37e files/digest-scim-qtimm-0.7 67
+MD5 a6dc4a6c7fbfdc9004372662fe9cd37e files/digest-scim-qtimm-0.7-r1 67
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.7-r1 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.7-r1
new file mode 100644
index 000000000000..103437d72963
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.7-r1
@@ -0,0 +1 @@
+MD5 8ddb0db30a54723ec4764979e52bfc2f scim-qtimm-0.7.tar.bz2 440261
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.7-r1.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.7-r1.ebuild
new file mode 100644
index 000000000000..172088592cb0
--- /dev/null
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/09/10 16:47:17 usata Exp $
+
+DESCRIPTION="Qt immodules input method framework plugin for SCIM"
+HOMEPAGE="http://scim.freedesktop.org/"
+SRC_URI="http://freedesktop.org/~cougar/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/scim-0.99.9
+	>=x11-libs/qt-3.3.3-r1
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+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 or immqt-bc USE flag enabled."
+	fi
+}
+
+src_compile() {
+	addpredict /usr/qt/3/etc/settings
+
+	sed -i -e "s/QCString/QString/g" src/qsciminputcontext.* || die
+
+	econf `use_enable nls` || 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 scim-qtimm 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
+}
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild
index b38d5ec06a45..fcdb82f3c131 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1 2004/09/04 20:14:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.7.ebuild,v 1.2 2004/09/10 16:47:17 usata Exp $
 
 DESCRIPTION="Qt immodules input method framework plugin for SCIM"
 HOMEPAGE="http://scim.freedesktop.org/"
@@ -12,12 +12,12 @@ KEYWORDS="~x86"
 IUSE="nls"
 
 DEPEND=">=app-i18n/scim-0.99.9
-	>=x11-libs/qt-3.3.2
+	|| ( =x11-libs/qt-3.3.3 =x11-libs/qt-3.3.2 )
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
 	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
-		die "You need to rebuild >=x11-libs/qt-3.3.2 with immqt or immqt-bc USE flag enabled."
+		die "You need to rebuild qt-3.3.3 or qt-3.3.2 with immqt or immqt-bc USE flag enabled."
 	fi
 }
 
@@ -38,7 +38,7 @@ pkg_postinst() {
 	einfo
 	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"
-	einfo "%	export QT_IM_MODULE=scim"
+	einfo "	% export QT_IM_MODULE=scim"
 	einfo
 	ewarn
 	ewarn "qtconfig is no longer used for selecting input methods."