Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/wpa_supplicant: wpa_supplicant-0.6.9.ebuild ChangeLog wpa_supplicant-0.6.4.ebuild wpa_supplicant-0.5.8.ebuild wpa_supplicant-0.5.10.ebuild wpa_supplicant-0.6.3.ebuild wpa_supplicant-0.5.7.ebuild
Date: Thu, 25 Jun 2009 18:59:10
Message-Id: E1MJuA7-0004dm-PJ@stork.gentoo.org
1 yngwin 09/06/25 18:59:07
2
3 Modified: wpa_supplicant-0.6.9.ebuild ChangeLog
4 wpa_supplicant-0.6.4.ebuild
5 Removed: wpa_supplicant-0.5.8.ebuild
6 wpa_supplicant-0.5.10.ebuild
7 wpa_supplicant-0.6.3.ebuild
8 wpa_supplicant-0.5.7.ebuild
9 Log:
10 Drop old ebuilds. Fix Qt4 deps (including bugs 245123 and 269337).
11 (Portage version: 2.2_rc33/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.4 net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
15
16 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild?rev=1.4&view=markup
17 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild?rev=1.4&content-type=text/plain
18 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild?r1=1.3&r2=1.4
19
20 Index: wpa_supplicant-0.6.9.ebuild
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v
23 retrieving revision 1.3
24 retrieving revision 1.4
25 diff -u -r1.3 -r1.4
26 --- wpa_supplicant-0.6.9.ebuild 17 May 2009 10:32:54 -0000 1.3
27 +++ wpa_supplicant-0.6.9.ebuild 25 Jun 2009 18:59:07 -0000 1.4
28 @@ -1,6 +1,6 @@
29 # Copyright 1999-2009 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $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 $
32 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.4 2009/06/25 18:59:07 yngwin Exp $
33
34 EAPI="2"
35
36 @@ -25,7 +25,8 @@
37 )
38 )
39 !kernel_linux? ( net-libs/libpcap )
40 - qt4? ( x11-libs/qt-gui:4 )
41 + qt4? ( x11-libs/qt-gui:4
42 + x11-libs/qt-svg:4 )
43 !qt4? ( qt3? ( x11-libs/qt:3 ) )
44 readline? ( sys-libs/ncurses sys-libs/readline )
45 ssl? ( dev-libs/openssl )
46
47
48
49 1.120 net-wireless/wpa_supplicant/ChangeLog
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?rev=1.120&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?rev=1.120&content-type=text/plain
53 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?r1=1.119&r2=1.120
54
55 Index: ChangeLog
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v
58 retrieving revision 1.119
59 retrieving revision 1.120
60 diff -u -r1.119 -r1.120
61 --- ChangeLog 18 May 2009 22:27:58 -0000 1.119
62 +++ ChangeLog 25 Jun 2009 18:59:07 -0000 1.120
63 @@ -1,6 +1,12 @@
64 # ChangeLog for net-wireless/wpa_supplicant
65 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
66 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.119 2009/05/18 22:27:58 gurligebis Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.120 2009/06/25 18:59:07 yngwin Exp $
68 +
69 + 25 Jun 2009; Ben de Groot <yngwin@g.o>
70 + -wpa_supplicant-0.5.7.ebuild, -wpa_supplicant-0.5.8.ebuild,
71 + -wpa_supplicant-0.5.10.ebuild, -wpa_supplicant-0.6.3.ebuild,
72 + wpa_supplicant-0.6.4.ebuild, wpa_supplicant-0.6.9.ebuild:
73 + Drop old ebuilds. Fix Qt4 deps (including bugs 245123 and 269337).
74
75 *wpa_supplicant-9999 (18 May 2009)
76
77
78
79
80 1.8 net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
81
82 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild?rev=1.8&view=markup
83 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild?rev=1.8&content-type=text/plain
84 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild?r1=1.7&r2=1.8
85
86 Index: wpa_supplicant-0.6.4.ebuild
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v
89 retrieving revision 1.7
90 retrieving revision 1.8
91 diff -u -r1.7 -r1.8
92 --- wpa_supplicant-0.6.4.ebuild 5 May 2009 21:13:20 -0000 1.7
93 +++ wpa_supplicant-0.6.4.ebuild 25 Jun 2009 18:59:07 -0000 1.8
94 @@ -1,10 +1,10 @@
95 # Copyright 1999-2009 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v 1.7 2009/05/05 21:13:20 gurligebis Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v 1.8 2009/06/25 18:59:07 yngwin Exp $
99
100 -EAPI="1"
101 +EAPI="2"
102
103 -inherit eutils toolchain-funcs
104 +inherit eutils toolchain-funcs qt4
105
106 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
107 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
108 @@ -25,13 +25,10 @@
109 )
110 )
111 !kernel_linux? ( net-libs/libpcap )
112 - qt4? (
113 - || ( ( x11-libs/qt-core:4
114 - x11-libs/qt-gui:4 )
115 - <x11-libs/qt-4.4:4
116 - )
117 + qt4? ( x11-libs/qt-gui:4[qt3support]
118 + x11-libs/qt-svg:4
119 )
120 - !qt4? ( qt3? ( =x11-libs/qt-3* ) )
121 + !qt4? ( qt3? ( x11-libs/qt:3 ) )
122 readline? ( sys-libs/ncurses sys-libs/readline )
123 ssl? ( dev-libs/openssl )
124 gnutls? ( net-libs/gnutls )
125 @@ -52,16 +49,14 @@
126 fi
127 }
128
129 -src_unpack() {
130 - unpack ${A}
131 -
132 - cd "${S}"
133 -
134 +src_prepare() {
135 # net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
136 sed -i \
137 -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
138 ../src/l2_packet/l2_packet_freebsd.c || die
139 +}
140
141 +src_configure() {
142 # toolchain setup
143 echo "CC = $(tc-getCC)" > .config
144
145 @@ -162,8 +157,9 @@
146 emake || die "emake failed"
147
148 if use qt4 ; then
149 - qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
150 + #qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
151 cd "${S}"/wpa_gui-qt4
152 + eqmake4 wpa_gui.pro
153 emake || die "emake wpa_gui-qt4 failed"
154 elif use qt3 ; then
155 [[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
Report Message
Find on MARC Find on Google Groups