Update to the latest immqt patch from bug #169852

Package-Manager: portage-2.1.2.2

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 0ec59c68dc44be31e4b06f2fae90b8da58578d87..c05e3ad1a2f22e36f30d1ed5cec3c6c8cf5e91f6 100644 (file)
--- 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/Manifest b/x11-libs/qt/Manifest
index d291e061b10503a0c294f81f62a4ac20fb370a32..06182943162580137dee5b710fd35ed63070905e 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -119,6 +119,7 @@ DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc7
 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
+DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
 DIST qt-x11-opensource-src-4.2.2.tar.gz 37636491 RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 SHA1 8bee428d975f855ed02517763010002ca99715cc SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
 DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
@@ -134,10 +135,10 @@ EBUILD qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced
 MD5 9e4b234be100199e8a74f09e748ecd52 qt-3.3.6-r5.ebuild 11117
 RMD160 464d1a225f2ba385cc80e662046de4998c720ced qt-3.3.6-r5.ebuild 11117
 SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225 qt-3.3.6-r5.ebuild 11117
-EBUILD qt-3.3.8.ebuild 11255 RMD160 1ef3d457357b01974a3f2ef60cb0c85265544d57 SHA1 8cf12f8144dbcf3b4e03015b3959eba2911c007a SHA256 5ee242fa6afd236098fbc5e81232ce774f17c1ea9948980d4d4b5b364889afc8
-MD5 a16e40441456eb9291f8f96df80e6aba qt-3.3.8.ebuild 11255
-RMD160 1ef3d457357b01974a3f2ef60cb0c85265544d57 qt-3.3.8.ebuild 11255
-SHA256 5ee242fa6afd236098fbc5e81232ce774f17c1ea9948980d4d4b5b364889afc8 qt-3.3.8.ebuild 11255
+EBUILD qt-3.3.8.ebuild 11118 RMD160 1e80a4582ce8411767493eeea30352e3ce8c3a72 SHA1 bf9e754f45c40982e03e745151b48c5b1d49a879 SHA256 b2ee8433a55b84917f50146bb752d7198d94fd0bd242caf224466cf378128ea6
+MD5 eeca010d7b7224053404f56eba9a0ba6 qt-3.3.8.ebuild 11118
+RMD160 1e80a4582ce8411767493eeea30352e3ce8c3a72 qt-3.3.8.ebuild 11118
+SHA256 b2ee8433a55b84917f50146bb752d7198d94fd0bd242caf224466cf378128ea6 qt-3.3.8.ebuild 11118
 EBUILD qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff SHA1 dffa6d4bae33a49c7c75e6d75736b70f0228fb25 SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff
 MD5 8f9beb1a3080a83dac2e8941aba8a06d qt-4.1.4-r2.ebuild 6855
 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff qt-4.1.4-r2.ebuild 6855
@@ -150,10 +151,10 @@ EBUILD qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 SHA1
 MD5 371dc767bce4f830b97bc0155280eb95 qt-4.2.3.ebuild 7699
 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 qt-4.2.3.ebuild 7699
 SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 qt-4.2.3.ebuild 7699
-MISC ChangeLog 24915 RMD160 f176ffbdeac956fb3d40b9a10cdee12bc169f429 SHA1 2ec842d0fb8bb9d959a645585255debb5031ca8f SHA256 c0a5e9308bb786e9c8f96b885b0d9117b88defc1e616cf7aa1784162dcd8b8d9
-MD5 82bbdb3a79d2729890c56856d7189575 ChangeLog 24915
-RMD160 f176ffbdeac956fb3d40b9a10cdee12bc169f429 ChangeLog 24915
-SHA256 c0a5e9308bb786e9c8f96b885b0d9117b88defc1e616cf7aa1784162dcd8b8d9 ChangeLog 24915
+MISC ChangeLog 25032 RMD160 d665940f38560a603ea3627a0ad885183a9292d2 SHA1 4ca1369294cd7c463b8435ee9f0c633059364476 SHA256 968f7342c12d161714c938b1fe83e746f21802a1f88d822034dfe6f8ff238435
+MD5 84b309355a15732045931500d113aafb ChangeLog 25032
+RMD160 d665940f38560a603ea3627a0ad885183a9292d2 ChangeLog 25032
+SHA256 968f7342c12d161714c938b1fe83e746f21802a1f88d822034dfe6f8ff238435 ChangeLog 25032
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -167,9 +168,9 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di
 MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r5 611
 RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r5 611
 SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r5 611
-MD5 cf87e67df16b90795b2313a0a0bf3acb files/digest-qt-3.3.8 608
-RMD160 c11ee954e00866f191758810ed4ef8d8ebda0102 files/digest-qt-3.3.8 608
-SHA256 b7e595acecd8a41b6d405b6a71225eaff8c5fbb00d3ee6ebff968c9ae2f5d55a files/digest-qt-3.3.8 608
+MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8 608
+RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8 608
+SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8 608
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289

diff --git a/x11-libs/qt/files/digest-qt-3.3.8 b/x11-libs/qt/files/digest-qt-3.3.8
index e43c710dd1907b4751e524990ed3051dfae17c09..5cda06f7046f02c6f91c8c6240979d787f4397df 100644 (file)
--- 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 ad83e0ffd2a3f46992b825ad2dd108357dbb0356..c780a65d4599a03c2843f9ee3d150eb1c51721a3 100644 (file)
--- 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}