Changed cjk USE flag to immqt-bc (binary compatible version of qt-immodule) and added immqt (binary incompatible version). Block old scim-qtimm and uim-qt. See also bug #60980 and #60629.

3 files changed, 33 insertions, 14 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 17c3c9b44ccb..b6464cf62ef6 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.163 2004/08/20 15:37:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.164 2004/08/20 16:14:51 usata Exp $
+
+  21 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.2.ebuild,
+  qt-3.3.3.ebuild:
+  Changed cjk USE flag to immqt-bc (binary compatible version of
+  qt-immodule) and added immqt (binary incompatible version).
+  Block old scim-qtimm and uim-qt. See also bug #60980 and #60629.
 
   20 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> qt-3.3.3.ebuild:
   Stable on sparc wrt #60855
diff --git a/x11-libs/qt/qt-3.3.2.ebuild b/x11-libs/qt/qt-3.3.2.ebuild
index 55e781cfc603..0f1348b45d37 100644
--- a/x11-libs/qt/qt-3.3.2.ebuild
+++ b/x11-libs/qt/qt-3.3.2.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/x11-libs/qt/qt-3.3.2.ebuild,v 1.15 2004/08/16 13:52:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.16 2004/08/20 16:14:51 usata Exp $
 
 inherit eutils
 
@@ -9,16 +9,14 @@ DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 
 IMMQT_P="qt-x11-immodule-unified-qt3.3.2-20040814"
-# If you want to build qt-immodule against Qt 3.3.3, you will also need
-# qt-x11-free-3.3.3-complemental-patch-for-immodule-20040814.diff
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	cjk? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
+	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
 
 LICENSE="QPL-1.0 | GPL-2"
 SLOT="3"
 KEYWORDS="x86 alpha ppc amd64 sparc hppa ~mips ppc64"
-IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib cjk"
+IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt-bc"
 
 DEPEND="virtual/x11 virtual/xft
 	media-libs/libpng media-libs/jpeg media-libs/libmng
@@ -54,7 +52,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/qt-no-rpath-uic.patch
 
-	if use cjk ; then
+	if use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
 		sh make-symlinks.sh || die "make symlinks failed"
 	fi
@@ -89,7 +87,7 @@ src_compile() {
 	use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
 	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
 	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
-	use cjk		&& myconf="${myconf} -im"
+	use immqt-bc	&& myconf="${myconf} -im"
 
 	export YACC='byacc -d'
 
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
index f2c4b3eb90be..6f623221f2f0 100644
--- a/x11-libs/qt/qt-3.3.3.ebuild
+++ b/x11-libs/qt/qt-3.3.3.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/x11-libs/qt/qt-3.3.3.ebuild,v 1.5 2004/08/20 15:57:27 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.6 2004/08/20 16:14:51 usata Exp $
 
 inherit eutils
 
@@ -12,12 +12,13 @@ IMMQT_P="qt-x11-immodule-unified-qt3.3.2-20040814"
 IMMQT_P2="qt-3.3.3-complemental-patch-for-immodule-20040814"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	cjk? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
+	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
+	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
 
 LICENSE="QPL-1.0 | GPL-2"
 SLOT="3"
 KEYWORDS="x86 ~alpha ppc ~amd64 sparc ~hppa ~mips ~ppc64"
-IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib cjk"
+IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
 
 DEPEND="virtual/x11 virtual/xft
 	media-libs/libpng media-libs/jpeg media-libs/libmng
@@ -34,7 +35,10 @@ DEPEND="virtual/x11 virtual/xft
 	zlib? ( sys-libs/zlib )
 	icc? ( dev-lang/icc )"
 
-RDEPEND="${DEPEND}"
+# old immodules may cause segfaults on some qt applications,
+# especially qtconfig
+PDEPEND="!<app-i18n/scim-qtimm-0.6_pre20040813
+	!<app-i18n/uim-qt-0.1.6_p20040815"
 
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
@@ -42,6 +46,16 @@ QTBASE=/usr/qt/3
 export QTDIR=${S}
 export PLATFORM=linux-g++
 
+pkg_setup() {
+	if use immqt ; then
+		ewarn
+		ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
+		ewarn "you have to recompile everything depending on Qt after you install it."
+		ewarn "Be aware."
+		ewarn
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -53,7 +67,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/qt-no-rpath-uic.patch
 
-	if use cjk ; then
+	if use immqt || use immqt-bc ; then
 		# epatch dies when patch returns an error, but we have to
 		# ignore it.
 		einfo "Applying immodule patch. Please ignore an error on qapplication_x11.cpp."
@@ -91,7 +105,8 @@ src_compile() {
 	use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
 	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
 	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
-	use cjk		&& myconf="${myconf} -im"
+	use immqt-bc	&& myconf="${myconf} -im"
+	use immqt	&& myconf="${myconf} -im -im-ext"
 
 	export YACC='byacc -d'