update the check for the qt4 bindings based on comments from bug #150888

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7339797c90e93f4d6d07f85c3deffd140ce33bd5..cd01beeb51e8ca413804b92cc7232a3037cba395 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.384 2006/11/06 10:59:32 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.385 2006/11/06 13:54:50 caleb Exp $
+
+  06 Nov 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.1.ebuild:
+  update the check for the qt4 bindings based on comments from bug #150888
 
   06 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org> qt-3.3.6-r4.ebuild:
   Stable on Alpha. Bug #151838

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index de02706b892424b0a3a04a0f548381f456acea8f..2ede65148038034329a2890f4def2566419d878d 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -132,14 +132,14 @@ EBUILD qt-4.1.4-r2.ebuild 6847 RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 S
 MD5 9aa16bc9eba1a97600f040fa47afc568 qt-4.1.4-r2.ebuild 6847
 RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 qt-4.1.4-r2.ebuild 6847
 SHA256 8f442105c43eb4d7902497b762461d6712611d0be0df6336bb1837010366762e qt-4.1.4-r2.ebuild 6847
-EBUILD qt-4.2.1.ebuild 7645 RMD160 1277bc80bd604d2a797ecb87b65c241e206fe205 SHA1 1972056a9a80c7ade1cf9a12d93de06543e4fc99 SHA256 19eb97b090760a90327990056bc2f53fd35391f00f4162d0b52da2d7fbe57435
-MD5 a7f6f2b603e149d7a477413db61f6b2f qt-4.2.1.ebuild 7645
-RMD160 1277bc80bd604d2a797ecb87b65c241e206fe205 qt-4.2.1.ebuild 7645
-SHA256 19eb97b090760a90327990056bc2f53fd35391f00f4162d0b52da2d7fbe57435 qt-4.2.1.ebuild 7645
-MISC ChangeLog 20285 RMD160 02957e3584a7b6501ed193531f602767190fd53b SHA1 4cd1c4a82a699f81aa9ec2a8371c6c1df7039701 SHA256 61669d44cb8c5705b22251c6284f57873c9eb2486fd8a46f3ed7b94d88edaee6
-MD5 0c86e2c9269b9800a8734f21c3ff0552 ChangeLog 20285
-RMD160 02957e3584a7b6501ed193531f602767190fd53b ChangeLog 20285
-SHA256 61669d44cb8c5705b22251c6284f57873c9eb2486fd8a46f3ed7b94d88edaee6 ChangeLog 20285
+EBUILD qt-4.2.1.ebuild 7833 RMD160 adcc4bf9d1356fed06bdc247dea2e2ea4c768610 SHA1 b12df8a4822ba6d84bff1a8facc78453ea6c2d7d SHA256 39571517ccc33e636b867dc1cf03f8cf58206c26fbd8c2b5efbd9ed0abe9f58f
+MD5 885c2e17455d6a27211280fc210ebf9d qt-4.2.1.ebuild 7833
+RMD160 adcc4bf9d1356fed06bdc247dea2e2ea4c768610 qt-4.2.1.ebuild 7833
+SHA256 39571517ccc33e636b867dc1cf03f8cf58206c26fbd8c2b5efbd9ed0abe9f58f qt-4.2.1.ebuild 7833
+MISC ChangeLog 20425 RMD160 3a3b135486786059139ed91106447e2b8c2c64f3 SHA1 73963a535b9b8bcbd7ca8d2f1c0d8a617e038304 SHA256 580a1bcf45e83a5d5256e062cd9f67a253d5e4792e9951b604f4925048ec8696
+MD5 ab0463b1ddfb2e9e93adc35e9d06061f ChangeLog 20425
+RMD160 3a3b135486786059139ed91106447e2b8c2c64f3 ChangeLog 20425
+SHA256 580a1bcf45e83a5d5256e062cd9f67a253d5e4792e9951b604f4925048ec8696 ChangeLog 20425
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156

diff --git a/x11-libs/qt/qt-4.2.1.ebuild b/x11-libs/qt/qt-4.2.1.ebuild
index dae817b8478e44f68a15d407c5eee414a66e2ae6..f5c5f191bb2880eea93dbaf9223449c0d5358d3a 100644 (file)
--- a/x11-libs/qt/qt-4.2.1.ebuild
+++ b/x11-libs/qt/qt-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.7 2006/11/03 14:33:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.8 2006/11/06 13:54:50 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -62,12 +62,16 @@ pkg_setup() {
 
        PLATFORM=$(qt_mkspecs_dir)
 
-       if built_with_use =sys-apps/dbus-0.62* qt4; then
-               eerror "You have built the dbus-0.62 bindings installed with Qt4 support."  
-               eerror "Unfortunately, Qt-4.2 is not supported for these bindings. For now,"
-               eerror "you will need to package.mask =x11-libs/qt-4.2*.  Soon, we hope to provide"
-               eerror "built in dbus support for Qt-4.2.  See Gentoo bug #150888 for details"
-               die
+       # If the user current has qt4 bindings for dbus, we can't let them upgrade since they aren't
+       # yet supported for Qt4.2
+       if [ ! -z $(best version =sys-apps/dbus-0.62*) ]; then
+               if built_with_use =sys-apps/dbus-0.62* qt4; then
+                       eerror "You have built the dbus-0.62 bindings installed with Qt4 support."  
+                       eerror "Unfortunately, Qt-4.2 is not supported for these bindings. For now,"
+                       eerror "you will need to package.mask =x11-libs/qt-4.2*.  Soon, we hope to provide"
+                       eerror "built in dbus support for Qt-4.2.  See Gentoo bug #150888 for details"
+                       die
+               fi
        fi
 }