diff options
author | 2008-08-11 11:52:50 +0000 | |
---|---|---|
committer | 2008-08-11 11:52:50 +0000 | |
commit | 5a1ff75377702a68bafd59a3b2174b0d0b3ff8c6 (patch) | |
tree | 49cfb1bc5b5377961edc56482ed103f6c7cc2e9a /net-wireless | |
parent | Convert end-of-lines from CR LF to LF. (diff) | |
download | gentoo-2-5a1ff75377702a68bafd59a3b2174b0d0b3ff8c6.tar.gz gentoo-2-5a1ff75377702a68bafd59a3b2174b0d0b3ff8c6.tar.bz2 gentoo-2-5a1ff75377702a68bafd59a3b2174b0d0b3ff8c6.zip |
Add qt split deps, bug #217178, patch by Jorge Manuel B. S. Vicetto <jmbsvicetto at gentoo dot org>
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 7 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild | 12 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild | 11 |
3 files changed, 25 insertions, 5 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index b30ea040d341..4fa3ac76709a 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.106 2008/06/03 02:26:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.107 2008/08/11 11:52:50 armin76 Exp $ + + 11 Aug 2008; Raúl Porcel <armin76@gentoo.org> + wpa_supplicant-0.5.10.ebuild, wpa_supplicant-0.6.3.ebuild: + Add qt split deps, bug #217178, patch by Jorge Manuel B. S. Vicetto + <jmbsvicetto at gentoo dot org> 03 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> wpa_supplicant-0.5.7.ebuild, wpa_supplicant-0.5.8.ebuild, diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild index b23daedea5da..a0a641f01a8f 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 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.10.ebuild,v 1.3 2008/06/03 02:26:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild,v 1.4 2008/08/11 11:52:50 armin76 Exp $ + +EAPI="1" inherit eutils toolchain-funcs @@ -22,7 +24,13 @@ RDEPEND="dbus? ( sys-apps/dbus ) ) ) !kernel_linux? ( net-libs/libpcap ) - qt4? ( =x11-libs/qt-4* ) + qt4? ( + || ( ( x11-libs/qt-core:4 + x11-libs/qt-gui:4 + x11-libs/qt-qt3support:4 ) + <x11-libs/qt-4.4:4 + ) + ) !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild index fce3b71e744c..43fb0bfb5a32 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 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.6.3.ebuild,v 1.2 2008/06/03 02:26:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild,v 1.3 2008/08/11 11:52:50 armin76 Exp $ + +EAPI="1" inherit eutils toolchain-funcs @@ -23,7 +25,12 @@ RDEPEND="dbus? ( sys-apps/dbus ) ) ) !kernel_linux? ( net-libs/libpcap ) - qt4? ( =x11-libs/qt-4* ) + qt4? ( + || ( ( x11-libs/qt-core:4 + x11-libs/qt-gui:4 ) + <x11-libs/qt-4.4:4 + ) + ) !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) |