Only qt-4.2.2 supports qt3support, #155548 thanks to Jakub Moc.

Package-Manager: portage-2.1.2_rc3-r4

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 8522c5618a6f0b0dc6e1e597db96c15d0a7778ba..4d28a74fed7bbf9aee1f72b32251596a2b3756b7 100644 (file)
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.87 2006/12/11 13:01:41 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.88 2006/12/13 18:26:50 uberlord Exp $
+
+  13 Dec 2006; Roy Marples <uberlord@gentoo.org>
+  wpa_supplicant-0.5.6.ebuild:
+  Only qt-4.2.2 supports qt3support, #155548 thanks to Jakub Moc.
 
   11 Dec 2006; Roy Marples <uberlord@gentoo.org>
   wpa_supplicant-0.5.6.ebuild:

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 3a58fb6e9c7e43f0927ed85bb03159047b54e896..8df525cb660f198e59829419d3ae124e4e02901d 100644 (file)
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -42,14 +42,14 @@ EBUILD wpa_supplicant-0.5.5.ebuild 6190 RMD160 c5bbede293fb14c6975802b4f87acedaf
 MD5 bdaa9579901b28dd7979bed86d5f2d86 wpa_supplicant-0.5.5.ebuild 6190
 RMD160 c5bbede293fb14c6975802b4f87acedaf9bd56af wpa_supplicant-0.5.5.ebuild 6190
 SHA256 75c70cb803711e318217eef13600370a1af32e3045d8c8e8a78075d2462ee2c0 wpa_supplicant-0.5.5.ebuild 6190
-EBUILD wpa_supplicant-0.5.6.ebuild 5921 RMD160 edc159dec7306397df925a9a831b2b4368f09893 SHA1 e5988780d29ca1ffca8c771b30c4bf7bba1cf32a SHA256 7521a041b83cdffe4171bd6effebf226dcb06124b7ea76701fab7e8449897994
-MD5 695036ca86a2d651ad78e05357245064 wpa_supplicant-0.5.6.ebuild 5921
-RMD160 edc159dec7306397df925a9a831b2b4368f09893 wpa_supplicant-0.5.6.ebuild 5921
-SHA256 7521a041b83cdffe4171bd6effebf226dcb06124b7ea76701fab7e8449897994 wpa_supplicant-0.5.6.ebuild 5921
-MISC ChangeLog 19843 RMD160 c0e503bf40585029205462697799ae31627f635b SHA1 5c351ec62be2af1b2b424fffcca43e158b75703b SHA256 6f56b83a42a18653e2ce51a1dd1d668214c6433348f6529e9ae349dceedb5ee0
-MD5 cfb8fff5178316185f1f589651bc0b78 ChangeLog 19843
-RMD160 c0e503bf40585029205462697799ae31627f635b ChangeLog 19843
-SHA256 6f56b83a42a18653e2ce51a1dd1d668214c6433348f6529e9ae349dceedb5ee0 ChangeLog 19843
+EBUILD wpa_supplicant-0.5.6.ebuild 5988 RMD160 9dd48ebe430ef850bb614252b2c420a408aaf713 SHA1 9f386af9f35b4ed2d25d901fa18d5408110dc586 SHA256 f7743d2ee46159a263c4fa31ea8b5a492dad380b8ca491f60a55dafa0bd446e3
+MD5 3cda46bea6f45c76cb9e0797bd2c2cb5 wpa_supplicant-0.5.6.ebuild 5988
+RMD160 9dd48ebe430ef850bb614252b2c420a408aaf713 wpa_supplicant-0.5.6.ebuild 5988
+SHA256 f7743d2ee46159a263c4fa31ea8b5a492dad380b8ca491f60a55dafa0bd446e3 wpa_supplicant-0.5.6.ebuild 5988
+MISC ChangeLog 19990 RMD160 b76b2f48de280269e1051430e61b8f53ae491385 SHA1 e0050ca58c6c3a0e43ce7137490f2b8b315d2270 SHA256 b381e3e50cd53be43595f16350148d61847ef672527c248212c056058c0067da
+MD5 dee827491654865c240b9d64347e71eb ChangeLog 19990
+RMD160 b76b2f48de280269e1051430e61b8f53ae491385 ChangeLog 19990
+SHA256 b381e3e50cd53be43595f16350148d61847ef672527c248212c056058c0067da ChangeLog 19990
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild
index 2fda69bbaad117d8412c908b35cc057c7de625ad..e12f451b170e2ff4cc135adddce4b776dc7b8ffb 100644 (file)
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.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/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild,v 1.3 2006/12/11 13:01:41 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild,v 1.4 2006/12/13 18:26:50 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,9 +37,11 @@ pkg_setup() {
                einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
        fi
 
-       if use qt4 && ! built_with_use x11-libs/qt qt3support ; then
-               eerror "qt4 requires qt3support"
-               die "rebuild x11-libs/qt with the qt3support USE flag"
+       if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
+               if ! built_with_use x11-libs/qt qt3support ; then
+                       eerror ">=qt4.2.2 requires qt3support"
+                       die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
+               fi
        fi
 }