Update to the latest immqt patch from bug #169852

(Portage version: 2.1.2.2)

3 files changed, 20 insertions, 22 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 0ec59c68dc44..c05e3ad1a2f2 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.416 2007/03/08 13:58:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.417 2007/03/21 11:41:48 caleb Exp $
+
+  21 Mar 2007; Caleb Tennis <caleb@gentoo.org> qt-3.3.8.ebuild:
+  Update to the latest immqt patch from bug #169852
 
 *qt-4.2.3 (08 Mar 2007)
 
diff --git a/x11-libs/qt/files/digest-qt-3.3.8 b/x11-libs/qt/files/digest-qt-3.3.8
index e43c710dd190..5cda06f7046f 100644
--- a/x11-libs/qt/files/digest-qt-3.3.8
+++ b/x11-libs/qt/files/digest-qt-3.3.8
@@ -1,6 +1,6 @@
 MD5 37aec12c8c7b0e164957ec1aa3fd0189 qt-x11-free-3.3.8.tar.gz 17393124
 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 qt-x11-free-3.3.8.tar.gz 17393124
 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 qt-x11-free-3.3.8.tar.gz 17393124
-MD5 08e49b5372bd44f973d8f2263458a5b6 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
-RMD160 51e480e651261796622a0d824ad549fd5e90089a qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
-SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+MD5 7f056a1fa246004cb3ec19fc11a88dc1 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
+RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
+SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
diff --git a/x11-libs/qt/qt-3.3.8.ebuild b/x11-libs/qt/qt-3.3.8.ebuild
index ad83e0ffd2a3..c780a65d4599 100644
--- a/x11-libs/qt/qt-3.3.8.ebuild
+++ b/x11-libs/qt/qt-3.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8.ebuild,v 1.3 2007/02/28 22:27:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8.ebuild,v 1.4 2007/03/21 11:41:48 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -8,7 +8,7 @@ SRCTYPE="free"
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
 HOMEPAGE="http://www.trolltech.com/"
 
-IMMQT_P="qt-x11-immodule-unified-qt3.3.6-20060317-gentoo"
+IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
 	immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
@@ -49,23 +49,18 @@ S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 QTBASE=/usr/qt/3
 
 pkg_setup() {
-#	if use immqt && use immqt-bc ; then
-#		ewarn
-#		ewarn "immqt and immqt-bc are exclusive. You cannot set both."
-#		ewarn "Please specify either immqt or immqt-bc."
-#		ewarn
-#		die
-#	elif 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
-
-	if use immqt || use immqt-bc; then
-		eerror "This version of Qt hasn't been modified yet to work with immqt."
+	if use immqt && use immqt-bc ; then
+		ewarn
+		ewarn "immqt and immqt-bc are exclusive. You cannot set both."
+		ewarn "Please specify either immqt or immqt-bc."
+		ewarn
 		die
+	elif 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
 
 	export QTDIR=${S}