summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2009-05-17 10:32:54 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2009-05-17 10:32:54 +0000
commit8096345ce9315f2db155309bcdcf39a53b3a02fe (patch)
tree5d0f06908f03ae96c1b6a2b9495b318da1b56920 /net-wireless
parentIntroduce qemu specific USE_EXPAND (diff)
downloadhistorical-8096345ce9315f2db155309bcdcf39a53b3a02fe.tar.gz
historical-8096345ce9315f2db155309bcdcf39a53b3a02fe.tar.bz2
historical-8096345ce9315f2db155309bcdcf39a53b3a02fe.zip
Fixing bug #266394 and #266580, related to dependencies and icons.
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog6
-rw-r--r--net-wireless/wpa_supplicant/Manifest10
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild17
3 files changed, 21 insertions, 12 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/Manifest b/net-wireless/wpa_supplicant/Manifest
index 5b4f5d7fedf2..724bf61e5967 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -18,13 +18,13 @@ EBUILD wpa_supplicant-0.5.7.ebuild 6329 RMD160 0aed14875974e8b696a872328fffe5cad
EBUILD wpa_supplicant-0.5.8.ebuild 6289 RMD160 4c656f7f675f8ed1610da6ecc91895228db47420 SHA1 98d8e97dd2290812d3969f41e4081f6f2414afff SHA256 dda3a969516ec52fc8c52a0c1bcc0076eb128ed0a7893f72337d5ffc82629ce3
EBUILD wpa_supplicant-0.6.3.ebuild 6565 RMD160 4a235424a74e4b8ccd0bc6bc645332fe0b2bb2b8 SHA1 08bbed20b1e894af246f6d7365aa777280879c75 SHA256 edcc845695c6515fb35cb430d7c9b678fff9b9459de2908b9a7955547dca746d
EBUILD wpa_supplicant-0.6.4.ebuild 6709 RMD160 5be6f93f12fabf7328020f8acc82362aaa75fe59 SHA1 931c3150ff167647b3f52c87722485cc7f164b77 SHA256 6c411291a5bab03dff96ad6b5b5986f13c1f54883191180886819fc620980e6b
-EBUILD wpa_supplicant-0.6.9.ebuild 6896 RMD160 0723c6a023b576cb00653fd4b101a4c5bb8d23a0 SHA1 d2d80264cb540ad0f0d6fde33916cf1f39bdd4ee SHA256 6c30c55453f8df5654d6ce971dfd174e2f4f47eb346c5db89e8a197ef3d2425c
-MISC ChangeLog 25455 RMD160 f58116f78fcee3fa7c446c2a29e472216bf1399d SHA1 17aceb723e8048b5b47d8e779e4f981d9aafe49c SHA256 2a6633a2a13fa899ebc79265165148618c3c455a61711c9e16d50de0adcb9ecb
+EBUILD wpa_supplicant-0.6.9.ebuild 7040 RMD160 f2ba4ef725534956b37bc5b63969973889a4b9e5 SHA1 42de9aa59512a03668c5da37bfda852a82a9bb96 SHA256 556eb1f5e8ce979de257714f927d9d652bd58f5c265440ff0faebb3d742a9171
+MISC ChangeLog 25618 RMD160 fbbe3d9315cc681b3f8ae4595151483b8399f05e SHA1 5822692bfd2d357fac5d9dfe25901505d51d59ec SHA256 b9f0966171a5840748a4a8db00bb1172925c738310a5cf8dd0c386a0206b30a0
MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkoAq/sACgkQsR7PQhRXYEmLigCcC6hoTMM/w/ssFGhTQ5SY8S5j
-thkAnAvHlZNzVubkRsk0mDQ0q5wvA4q9
-=rQcm
+iEYEARECAAYFAkoP5+AACgkQsR7PQhRXYEmm3ACfapdWlu3WcZJzDOeA99+OsDG7
+AnoAnRhtyToEq6yTTNl0grMJIUa4LCra
+=9ZtQ
-----END PGP SIGNATURE-----
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