--- /home2/sys/gentoo/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild	2009-04-15 16:45:22.000000000 -0500
+++ /home2/sys/facorread/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9-r1.ebuild	2009-04-16 09:22:52.560476974 -0500
@@ -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.1 2009/04/15 21:45:22 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9-r1.ebuild
 
 EAPI="2"
 
@@ -182,8 +182,12 @@
 	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 @@
 	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