make immqt error out

Package-Manager: portage-2.1.2-r8

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 59808f9026ab6ea3ff0952613fd84103caa05025..9e28c5bb30b6284b35db8368761edb20798c2b30 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -114,10 +114,10 @@ AUX qt4-sqlite-configure.patch 738 RMD160 0797534db076cf47da01f17fe51296300e7db1
 MD5 341ca0df76ba1dcb9fd0847566055a99 files/qt4-sqlite-configure.patch 738
 RMD160 0797534db076cf47da01f17fe51296300e7db167 files/qt4-sqlite-configure.patch 738
 SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e files/qt4-sqlite-configure.patch 738
-DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
+DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 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.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
 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
@@ -133,10 +133,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 11129 RMD160 6f3dd843fece34ec8d82eb3e257155050ed5882f SHA1 d7d2461539bd5eacaafee894b4bc9489a7827d8d SHA256 613b3b2b0e903f0b81a2e0a9dd08302a522000f141d08190b2ff4d46684dbe4a
-MD5 573bebfe75835d941660b7b27c5a8401 qt-3.3.8.ebuild 11129
-RMD160 6f3dd843fece34ec8d82eb3e257155050ed5882f qt-3.3.8.ebuild 11129
-SHA256 613b3b2b0e903f0b81a2e0a9dd08302a522000f141d08190b2ff4d46684dbe4a qt-3.3.8.ebuild 11129
+EBUILD qt-3.3.8.ebuild 11264 RMD160 c079767a723abcaa111dbaa6aed9b53acec5eb92 SHA1 782f19af4e17bdbd8877e8beb8e9ea99eadd8735 SHA256 fc50f645ff61cbfa1a8fa84d81b92026c1ab0a46748e1b62c5db25cc0ce4abbe
+MD5 7d6583dbf776a644a65c6ecd8f81fd95 qt-3.3.8.ebuild 11264
+RMD160 c079767a723abcaa111dbaa6aed9b53acec5eb92 qt-3.3.8.ebuild 11264
+SHA256 fc50f645ff61cbfa1a8fa84d81b92026c1ab0a46748e1b62c5db25cc0ce4abbe qt-3.3.8.ebuild 11264
 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

diff --git a/x11-libs/qt/qt-3.3.8.ebuild b/x11-libs/qt/qt-3.3.8.ebuild
index d5a75071423d573fd3529e45db347ba8177c74ec..328538fc555c4f224086fcd5490990b4ee2d49fe 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.1 2007/02/22 14:10:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8.ebuild,v 1.2 2007/02/22 18:37:02 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -49,18 +49,23 @@ 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
+#      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."
                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}