Version bump (bug #235102 by Vladimir), PS3 drivers have been merged

  upstream. Also install DBUS service files as 0.5.10 does (bug #212724 by
  Robert Piasek), and enable file debugging via USE=debug (bug #213023 by
  Adrian Bassett)
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64
RepoMan-Options: --force

3 files changed, 36 insertions, 8 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 4fa3ac76709a..33c59293b989 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,15 @@
 # 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.107 2008/08/11 11:52:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.108 2008/08/19 13:03:50 rbu Exp $
+
+*wpa_supplicant-0.6.4 (19 Aug 2008)
+
+  19 Aug 2008; Robert Buchholz <rbu@gentoo.org>
+  -wpa_supplicant-0.6.1.ebuild, +wpa_supplicant-0.6.4.ebuild:
+  Version bump (bug #235102 by Vladimir), PS3 drivers have been merged
+  upstream. Also install DBUS service files as 0.5.10 does (bug #212724 by
+  Robert Piasek), and enable file debugging via USE=debug (bug #213023 by
+  Adrian Bassett)
 
   11 Aug 2008; Raúl Porcel <armin76@gentoo.org>
   wpa_supplicant-0.5.10.ebuild, wpa_supplicant-0.6.3.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 84bf41f84c5c..1193f74a8075 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,12 +6,12 @@ AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1
 DIST wpa_supplicant-0.5.10.tar.gz 720661 RMD160 8559827e5df80b50a8c7a9ddd2190189c1c689be SHA1 db2bba1df664675ff06c7e334e22a60c4e3a7a49 SHA256 c5c5ae89b4d3a247d4f5dcfa37e86df248d7e483d42636ef1f82c0bc48597dde
 DIST wpa_supplicant-0.5.7.tar.gz 713251 RMD160 dffc3b5cbead92757840f71ccdd4548348698b28 SHA1 43f769d46fdca47b024e777331fb00577595c0ef SHA256 cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57
 DIST wpa_supplicant-0.5.8.tar.gz 714467 RMD160 322cd5cba8afffe8343bd8c574e8941fd595dbad SHA1 434545faf4758044629f574d82939511be8deb0b SHA256 2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
-DIST wpa_supplicant-0.6.1.tar.gz 888539 RMD160 a4b911942c73952570fb5e15e565df87bb4b3c12 SHA1 1b4daf9f19bc0aeeeb80f8b55cc50f5a1bdd8a0d SHA256 ff6732f8a8c7ac4b1abe389b642669776981107fe0d7ec93d3daf15b4f3a1c5a
 DIST wpa_supplicant-0.6.3.tar.gz 952273 RMD160 4aa954040e3eae572fe600fda8587885e1fface1 SHA1 0e15731bb3fc5c84a1292d665afd53e2fc176998 SHA256 f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2
+DIST wpa_supplicant-0.6.4.tar.gz 995486 RMD160 338b901726779a47cb3c3cb43b11d3d38af3fe7d SHA1 c17a992bdcbe0d2427f0968c5a921e54cf28306f SHA256 0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
 EBUILD wpa_supplicant-0.5.10.ebuild 6575 RMD160 f1b8234585d638bbc45cc342e6a48c01c9617732 SHA1 7cf4ac52c94aac1419c981f08059a654a5b0d0ab SHA256 2e2d47528fd0d94386079aeb2b18b9076560e4ae9f5a205fb9545a947e26b1ff
 EBUILD wpa_supplicant-0.5.7.ebuild 6319 RMD160 064b0c5b746be6b10a2febe41ca0d2aecbd40a3e SHA1 8979476e64e3b00406d4ad471328580296ff8541 SHA256 0fa7af5543bc0cd6df52e27ab127098036e1ee429f4d82d0172f88071518dc4e
 EBUILD wpa_supplicant-0.5.8.ebuild 6279 RMD160 05bfbc049c40d5be8b4cce449798c4fb1e44f102 SHA1 684fc05872c16fe9f1f132a2fc82e9312682250a SHA256 aa9092cb4c539172a3e836aec59f10712a56e1d04f5148e9e5789db94980bcfc
-EBUILD wpa_supplicant-0.6.1.ebuild 6326 RMD160 0dd9b029dd28cbb7a87e957d1b230702cbe3aa41 SHA1 6c8a5e258458202b5b67d8d5dd792b8769cb49ed SHA256 c3cf22da4fb19ae49281573d5ecf5650b5e119c2bea0b4309ec5c9a1946c0dea
 EBUILD wpa_supplicant-0.6.3.ebuild 6545 RMD160 e900f7384c20660e54176d0b295f670d40b29e3f SHA1 c41abeca8d0d3d57c60e798149785b13760ce855 SHA256 e9a44413e5c4f848cf03d48659063eeda364a95a3d29adcdab3df4d8b3329356
-MISC ChangeLog 23536 RMD160 e8c45fa1a2e7fa14435186d2c657007785e673d2 SHA1 6109e83a4033c33f73554c07fa5380c3e17586d9 SHA256 1a04d2cb9401180907214ed7352d590c264ae5a6ea3f59f83521504485c3909b
+EBUILD wpa_supplicant-0.6.4.ebuild 6689 RMD160 0c60d5823cccc67bc39913a06f3f5847dd3f9980 SHA1 ad7588f20cad2a95870e192007c4b2a43c112543 SHA256 9e6bc15cd2c553fa2c14721722477d5082e11c710874b0fd23466345ce19d8ab
+MISC ChangeLog 23918 RMD160 bcb3b8b9ac2e66b7df6479e0cf09a2bdfedb8d8b SHA1 59f1a01a988474d50058999eb87ad1e4af2a6d5f SHA256 538b2b2f47fd28a653102e197b9209bac672865346185e24764662ff0697f442
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
index 943ee884cbe3..df2d403a5b8b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.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.1.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.4.ebuild,v 1.1 2008/08/19 13:03:50 rbu Exp $
+
+EAPI="1"
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +13,8 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+IUSE="dbus debug gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux
+	kernel_FreeBSD ps3"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
@@ -22,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 )
@@ -46,6 +54,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+
 	cd "${S}"
 
 	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
@@ -82,6 +91,10 @@ src_unpack() {
 		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
 	fi
 
+	if use debug ; then
+		echo "CONFIG_DEBUG_FILE=y" >> .config
+	fi
+
 	if use gsm ; then
 		# smart card authentication
 		echo "CONFIG_EAP_SIM=y" >> .config
@@ -122,6 +135,9 @@ src_unpack() {
 			echo "CFLAGS += -I/usr/include/madwifi" >> .config
 			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
 		fi
+		if use ps3 ; then
+			echo "CONFIG_DRIVER_PS3=y" >> .config
+		fi
 	elif use kernel_FreeBSD ; then
 		# FreeBSD specific driver
 		echo "CONFIG_DRIVER_BSD=y" >> .config
@@ -170,7 +186,7 @@ src_install() {
 	insinto /etc/wpa_supplicant/
 	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
 
-	dodoc ChangeLog ../COPYING eap_testing.txt README todo.txt
+	dodoc ChangeLog eap_testing.txt README todo.txt
 	newdoc wpa_supplicant.conf wpa_supplicant.conf
 
 	doman doc/docbook/*.8
@@ -191,6 +207,9 @@ src_install() {
 	if use dbus ; then
 		insinto /etc/dbus-1/system.d
 		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service'
+		keepdir /var/run/wpa_supplicant
 	fi
 }