From: Roy Marples Date: Mon, 11 Dec 2006 13:01:41 +0000 (+0000) Subject: qt4 requires qt3support, #155548 thanks to Caleb. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17542b745a36bd3e7b4d35f81025d06f4048c51e;p=gentoo.git qt4 requires qt3support, #155548 thanks to Caleb. Package-Manager: portage-2.1.2_rc3-r1 --- diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 93a69e585908..8522c5618a6f 100644 --- 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.86 2006/12/02 12:49:55 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.87 2006/12/11 13:01:41 uberlord Exp $ + + 11 Dec 2006; Roy Marples + wpa_supplicant-0.5.6.ebuild: + qt4 requires qt3support, #155548 thanks to Caleb. 02 Dec 2006; Tony Vroon wpa_supplicant-0.5.6.ebuild: Add ~ppc64 keyword. Tested on 64ul with GCC 4, BCM4306 hardware. diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index e656b5908bd5..3a58fb6e9c7e 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8 MD5 b7347d266a11ceada07f132fcde0a318 files/wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 files/wpa_cli.sh 1312 @@ -45,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 5884 RMD160 33342df869a9649b8c62de1d29ac00882bc6e1dc SHA1 73487a0b2d4f6a58523f6a29143141518386bce1 SHA256 32bbb1807eb4c408af29c5b4c54aba94691ab95750a45594e3a0f851e15cd55d -MD5 29d42c8f563ca154ab694375038614c0 wpa_supplicant-0.5.6.ebuild 5884 -RMD160 33342df869a9649b8c62de1d29ac00882bc6e1dc wpa_supplicant-0.5.6.ebuild 5884 -SHA256 32bbb1807eb4c408af29c5b4c54aba94691ab95750a45594e3a0f851e15cd55d wpa_supplicant-0.5.6.ebuild 5884 -MISC ChangeLog 19710 RMD160 97a7a6e8866c0a6b390b52743f24db04d215f9b6 SHA1 8f1199d46e899a549d2d37c41a2e6748b7e72642 SHA256 af278cd8437951eebd50268d93fba521b7d61f5d69fb7be905a97ae5e569b28b -MD5 a8a865b4b65d7acf188f93103215b708 ChangeLog 19710 -RMD160 97a7a6e8866c0a6b390b52743f24db04d215f9b6 ChangeLog 19710 -SHA256 af278cd8437951eebd50268d93fba521b7d61f5d69fb7be905a97ae5e569b28b ChangeLog 19710 +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 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250 @@ -69,10 +66,3 @@ SHA256 65a0548f39630b87564a5192c8f9a8812ce4d69b204dd6eaada607e77ad112b2 files/di MD5 b5ccb88b2fa4e9a8ed6ef6f0a2d13698 files/digest-wpa_supplicant-0.5.6 262 RMD160 99cebda2ff98f9bd98e44e6e521461a0bb6100f0 files/digest-wpa_supplicant-0.5.6 262 SHA256 beb9ceed89120a41c72fa2e31f5ed2112788104c20bd2b912ff342a95a85e738 files/digest-wpa_supplicant-0.5.6 262 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) - -iD8DBQFFcXZ7p5vW4rUFj5oRAueEAJ9vEzmg8nOyNY9FSc5m9VZplDYxdwCdEBiy -SnBfNGZ7QxkPN4QxhlRhs7I= -=R7er ------END PGP SIGNATURE----- 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 725fd1a8caf2..2fda69bbaad1 100644 --- 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.2 2006/12/02 12:49:55 chainsaw Exp $ +# $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 $ inherit eutils toolchain-funcs @@ -13,8 +13,6 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD" -#When dbus-core is out of package mask, this is how it works -#RDEPEND="dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )" RDEPEND="dbus? ( sys-apps/dbus ) kernel_linux? ( gsm? ( sys-apps/pcsc-lite ) @@ -38,6 +36,11 @@ pkg_setup() { if use qt3 && use qt4; then 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" + fi } src_unpack() {