diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-12-11 13:01:41 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-12-11 13:01:41 +0000 |
| commit | 996c23b59725ea768fede0ca26c68264575146fc (patch) | |
| tree | 11bdfb6a04353a3730643e313ead32e20e0288ec /net-wireless | |
| parent | Stable on ia64. (diff) | |
| download | gentoo-2-996c23b59725ea768fede0ca26c68264575146fc.tar.gz gentoo-2-996c23b59725ea768fede0ca26c68264575146fc.tar.bz2 gentoo-2-996c23b59725ea768fede0ca26c68264575146fc.zip | |
qt4 requires qt3support, #155548 thanks to Caleb.
(Portage version: 2.1.2_rc3-r1)
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild | 9 |
2 files changed, 11 insertions, 4 deletions
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 <uberlord@gentoo.org> + wpa_supplicant-0.5.6.ebuild: + qt4 requires qt3support, #155548 thanks to Caleb. 02 Dec 2006; Tony Vroon <chainsaw@gentoo.org> wpa_supplicant-0.5.6.ebuild: Add ~ppc64 keyword. Tested on 64ul with GCC 4, BCM4306 hardware. 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() { |