diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2009-05-17 10:32:54 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2009-05-17 10:32:54 +0000 |
| commit | eb48f3f7c97d184942a31964292e3c88a1555964 (patch) | |
| tree | 7f4a407c1efd87c8a298ff18beb19c7a94aa7442 /net-wireless | |
| parent | Introduce qemu specific USE_EXPAND (diff) | |
| download | gentoo-2-eb48f3f7c97d184942a31964292e3c88a1555964.tar.gz gentoo-2-eb48f3f7c97d184942a31964292e3c88a1555964.tar.bz2 gentoo-2-eb48f3f7c97d184942a31964292e3c88a1555964.zip | |
Fixing bug #266394 and #266580, related to dependencies and icons.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index d814ffc2b2f0..8a7704b5c378 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.117 2009/05/05 21:13:20 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.118 2009/05/17 10:32:54 gurligebis Exp $ + + 17 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org> + wpa_supplicant-0.6.9.ebuild: + Fixing bug #266384 and #266580, related to dependencies and icons. 05 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org> metadata.xml, wpa_supplicant-0.5.7, wpa_supplicant-0.5.8, wpa_supplicant-0.5.10, diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild index 4f45c72e566b..8890d7b761fd 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.9.ebuild,v 1.2 2009/05/05 21:13:20 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.3 2009/05/17 10:32:54 gurligebis Exp $ EAPI="2" @@ -28,9 +28,9 @@ DEPEND="dev-libs/libnl qt4? ( x11-libs/qt-gui:4 ) !qt4? ( qt3? ( x11-libs/qt:3 ) ) readline? ( sys-libs/ncurses sys-libs/readline ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( ssl? ( dev-libs/openssl ) ) - !gnutls? ( !ssl? ( dev-libs/libtommath ) )" + ssl? ( dev-libs/openssl ) + !ssl? ( gnutls? ( net-libs/gnutls ) ) + !ssl? ( !gnutls? ( dev-libs/libtommath ) )" RDEPEND="${DEPEND}" S="${WORKDIR}/${P}/${PN}" @@ -182,8 +182,12 @@ src_install() { dobin wpa_cli wpa_passphrase || die # baselayout-1 compat - dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die - dosym /usr/bin/wpa_cli /bin/wpa_cli || die + if has_version "<sys-apps/baselayout-2.0.0"; then + dodir /sbin + dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die + dodir /bin + dosym /usr/bin/wpa_cli /bin/wpa_cli || die + fi exeinto /etc/wpa_supplicant/ newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh @@ -202,6 +206,7 @@ src_install() { fi if use qt3 || use qt4 ; then + doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found" make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" fi |