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)
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64, RepoMan options: --force)

2 files changed, 33 insertions, 5 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/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
 }