Updated immodule patch. This closes bug #106386.

(Portage version: 2.0.52-r1)

4 files changed, 24 insertions, 22 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index ba59492a74b6..4179da115238 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.265 2005/11/28 15:25:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.266 2005/12/04 03:56:28 usata Exp $
+
+  04 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.5.ebuild:
+  Updated immodule patch. This closes bug #106386.
 
   28 Nov 2005; Caleb Tennis <caleb@gentoo.org>
   +files/qt-4.1.0-configure-no-mysql.diff, qt-4.1.0_rc1.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index d876460bcb1b..b8c8bfff8650 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,25 +1,25 @@
 MD5 6b70c9bf38486f54b7a58605bc4afba4 ChangeLog 3074
-MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
-MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
-MD5 3d30d5b1a92ec492ff8bfd173fba293c files/digest-qt-3.3.5 166
-MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 72c3db1196133df4d2699bf677da8923 qt-4.1.0_rc1.ebuild 5779
+MD5 aeb3cd64b68372f53b26d25f88d6fb6f qt-4.0.1.ebuild 5724
+MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
+MD5 c1b0d767e9efb0e514d66d4926552f3a qt-3.3.5.ebuild 9962
 MD5 80e462c816f7784088a6395aedcf6de9 files/digest-qt-4.1.0_rc1 85
+MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
+MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
+MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
+MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
-MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
+MD5 7c3ccffe55767c77fab3a32c5bb296ac files/digest-qt-3.3.5 166
+MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
+MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
-MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
-MD5 6e6b449aab7d3239d42cbe3168b7e050 qt-3.3.5.ebuild 10009
-MD5 aeb3cd64b68372f53b26d25f88d6fb6f qt-4.0.1.ebuild 5724
-MD5 72c3db1196133df4d2699bf677da8923 qt-4.1.0_rc1.ebuild 5779
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
+MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
diff --git a/x11-libs/qt/files/digest-qt-3.3.5 b/x11-libs/qt/files/digest-qt-3.3.5
index 74022b2c629e..84e50108ae6b 100644
--- a/x11-libs/qt/files/digest-qt-3.3.5
+++ b/x11-libs/qt/files/digest-qt-3.3.5
@@ -1,2 +1,2 @@
 MD5 05d04688c0c0230ed54e89102d689ca4 qt-x11-free-3.3.5.tar.bz2 14431679
-MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
+MD5 2d1a6979301ee81da404f63670211416 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
diff --git a/x11-libs/qt/qt-3.3.5.ebuild b/x11-libs/qt/qt-3.3.5.ebuild
index 918d9957be48..f1a9e0971859 100644
--- a/x11-libs/qt/qt-3.3.5.ebuild
+++ b/x11-libs/qt/qt-3.3.5.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/x11-libs/qt/qt-3.3.5.ebuild,v 1.3 2005/10/09 06:58:21 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.4 2005/12/04 03:56:28 usata 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.4-20041203"
+IMMQT_P="qt-x11-immodule-unified-qt3.3.5-20051018"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
 	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
@@ -104,7 +104,6 @@ src_unpack() {
 
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
-		epatch ${FILESDIR}/${P}-immodule-focus.patch
 		sh make-symlinks.sh || die "make symlinks failed"
 	fi