Updated immqt patch; bug #80056.

Package-Manager: portage-2.0.51-r15

4 files changed, 57 insertions, 48 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 84599a89951d..6057a457c77d 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.187 2005/01/30 02:52:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.188 2005/01/30 20:17:17 usata Exp $
+
+  31 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.4.ebuild:
+  Updated immqt patch; bug #80056.
 
 *qt-3.3.4 (29 Jan 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 1b6eaeb7a4ff..c55851e3f70f 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,52 +1,62 @@
-MD5 6eabb11b45974186ee77341995c7b215 qt-4.0.0_beta1-r1.ebuild 5702
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2bb4b537f9400f9e1972df49e56d161b ChangeLog 31651
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
 MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+MD5 dd2127b3c7bc12b24621d172b6a075af qt-3.2.3-r1.ebuild 5159
 MD5 fbe7f8bc183824f9c17974b1a493c94d qt-3.3.2.ebuild 6895
-MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
+MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
+MD5 3d1cc787b98b33e20bdb4768bd8e8ecc qt-3.3.3-r2.ebuild 8375
+MD5 6eabb11b45974186ee77341995c7b215 qt-4.0.0_beta1-r1.ebuild 5702
 MD5 0c35ff70fb6ff95611499d6fb69d8afc qt-3.3.1-r2.ebuild 5745
-MD5 7e97379b94036d9db24b3ca93c21b6e7 qt-3.3.3-r3.ebuild 8737
-MD5 26cadf915744a41f8657067f95a58f61 qt-3.3.4.ebuild 8621
 MD5 9f69253aeb04d45bc83c008fc4a46a31 qt-4.0.0_beta1-r2.ebuild 5736
-MD5 3d1cc787b98b33e20bdb4768bd8e8ecc qt-3.3.3-r2.ebuild 8375
 MD5 13c659d1e84ee9edb8e9c64d08fb06a9 qt-4.0.0_beta1.ebuild 4777
-MD5 512dc1785b104b560d41c0e57ea26df3 ChangeLog 31549
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 7e97379b94036d9db24b3ca93c21b6e7 qt-3.3.3-r3.ebuild 8737
+MD5 1f95b05c8230a39edeaa207a4fb5e796 qt-3.3.4.ebuild 8434
 MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
-MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
-MD5 dd2127b3c7bc12b24621d172b6a075af qt-3.2.3-r1.ebuild 5159
+MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
-MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
-MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 07a5c97eddc68da556434cdd09a7a903 files/digest-qt-3.3.4 72
-MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
-MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
-MD5 057d98ec124a99d94abfb0b7487f969e files/digest-qt-4.0.0_beta1-r2 99
-MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
-MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r2 238
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r3 238
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
 MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r2 238
 MD5 1402aee539796a7165cdd4646346da50 files/digest-qt-4.0.0_beta1 81
+MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
-MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
+MD5 057d98ec124a99d94abfb0b7487f969e files/digest-qt-4.0.0_beta1-r2 99
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r3 238
+MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
+MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
+MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4 166
 MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB/T7LVWNWqTUmv+0RAkaPAJ4uEiDTPmQPaYE1FVuHQ4A2WdDs1wCfdSqi
+tOQ6i4dQGsA/hoNAEnIqYCg=
+=zluZ
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-3.3.4 b/x11-libs/qt/files/digest-qt-3.3.4
index ad1fcbb68270..d12b1ee1a446 100644
--- a/x11-libs/qt/files/digest-qt-3.3.4
+++ b/x11-libs/qt/files/digest-qt-3.3.4
@@ -1 +1,2 @@
 MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722
+MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
diff --git a/x11-libs/qt/qt-3.3.4.ebuild b/x11-libs/qt/qt-3.3.4.ebuild
index 9495b0777467..6dfbeed3130d 100644
--- a/x11-libs/qt/qt-3.3.4.ebuild
+++ b/x11-libs/qt/qt-3.3.4.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.4.ebuild,v 1.1 2005/01/30 02:52:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4.ebuild,v 1.2 2005/01/30 20:17:17 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,11 +8,11 @@ SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 
-# IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040910"
+IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203"
 
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
-#	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
-#	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
+	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
 #	ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )"
 
 LICENSE="|| ( QPL-1.0 GPL-2 )"
@@ -33,11 +33,6 @@ DEPEND="virtual/x11 virtual/xft
 	cups? ( net-print/cups )
 	zlib? ( sys-libs/zlib )"
 
-# old immodules may cause segfaults on some qt applications,
-# especially qtconfig
-PDEPEND="!<=app-i18n/scim-qtimm-0.7
-	!<=app-i18n/uim-qt-0.1.7"
-
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
 QTBASE=/usr/qt/3