Moving to depend on dev-libs/libnl:3 instead of dev-libs/libnl:1.1

Package-Manager: portage-2.2.0_alpha135/cvs/Linux i686

4 files changed, 353 insertions, 5 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 13fd608459a3..600eb93dad14 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.183 2012/10/03 19:22:03 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.184 2012/10/04 13:47:35 gurligebis Exp $
+
+*wpa_supplicant-1.0-r1 (04 Oct 2012)
+
+  04 Oct 2012; <gurligebis@gentoo.org> +wpa_supplicant-1.0-r1.ebuild,
+  +files/wpa_supplicant-1.0-libnl_path_fix.patch:
+  Moving to depend on dev-libs/libnl:3 instead of dev-libs/libnl:1.1
 
   03 Oct 2012; <gurligebis@gentoo.org> wpa_supplicant-1.0.ebuild:
   Migrated to REQUIRED_USE, fixing bug #436824
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index da935c60cb86..69ee4bc57a73 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -10,6 +10,7 @@ AUX wpa_supplicant-0.7.3-generate-libeap-peer.patch 11221 SHA256 1afaabe0c2862f0
 AUX wpa_supplicant-1.0-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
 AUX wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
 AUX wpa_supplicant-1.0-generate-libeap-peer.patch 9739 SHA256 3e9945a95f15eda4ae701ac51b3e3bcf9259bd76629b49cded76a9e125144a56 SHA512 3194386e5ef79c2fccac02e5fa7b8c47d2f1f3fdf4aa60db7a25bad50b6098283053b6b103311f309126e1a3374cc72d0cc0db0c31a5e0cc13ba4116a0b901db WHIRLPOOL 1f1d60f6999fa957679f7f1b8ba48b9b57ba3f610cdc77f10904b41e3c49d7969f363cc49889a76d5fd2ef80150179d1fc93dbdef2848f495a0c90635fdea9a6
+AUX wpa_supplicant-1.0-libnl_path_fix.patch 892 SHA256 7ec9489fed14b7f3916d0aab63e34886bcf39d07c257101df53e16ef4db2b95d SHA512 10b1db56ec2bb8a2ab04dcd50b5a0442efdd4814ef6a4effc50d0157d61fc993ebb6f2f6775566fc0341668ad314dd2d4ec4e91177d59d76c59b8ceb2bf4c2f4 WHIRLPOOL ae16d72eb649d7267191a2542c204da92493279f3d09dc9de4349ca4a8db9d7e5f46d3d824e4b22900ad257e1bdcf86b26fb46eee63cbb8af48bd739b0d27ea0
 AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 SHA512 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 WHIRLPOOL 5508d1598bd952ec773db0d5e5ab440134337de6e26d7b8c7c6b00789c570559a54457ac507357b65e8604da849f9ab52dff90d27197d9be11ed2cc66eaae1e7
 AUX wpa_supplicant-gcc470.patch 407 SHA256 a2cc1d8ce27fee214b6845cf228e3ceb4c1ba54cea03e99ee653b0aed4f82fcf SHA512 98d67be5d876a5cf754328189f80617727b9c0128447efcfed4418eb890c440e5e4a0e98d9629f8d8438696aac5a57b0f4d11941a66ebb83e967838b50c932e1 WHIRLPOOL 61990de6e2ff41e3b3cb19d03a85490605630742e2b0d0dd2dafaf6e711b27deb2f059472bd9f333fb052570b3a20c48e67783c7dbfcb60b7a5c8cf06be4bde9
 AUX wpa_supplicant-init.d 1249 SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0 SHA512 6b245dad8861f71bab7187d9349464d4ae5986202d097928886e26db9ca9c08dedd82852c52dd72d232bd23139f47a76cd8c87e020596796b403fd0c4ac0ffc7 WHIRLPOOL d5edcd9842d3039cbc9b57e24a770b6443a1e869ab3492a86eac60f920aa2a4537b0fdb3d73cbf4b8f85dd257a529839786e16e98ddd4556445d464c43deb012
@@ -19,13 +20,14 @@ AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb7
 DIST wpa_supplicant-0.7.3.tar.gz 1638224 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 SHA512 81c633eac9168ac2438ea3ad7505c25dcde98befee8b65ea562b9cc6ee658e998ff147f7646531968edc596d44a38c3acef3e30c43b1db4a8cbeeab22287e888 WHIRLPOOL 594f70b2e4e78a302809ac0b3bf9eccaaba92d8a052efc22184623b1690ade39d418a221933f7f8ba885ee6c59b5a189158db333c2e11e60c8bb51ec68537929
 DIST wpa_supplicant-1.0.tar.gz 1948417 SHA256 91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c SHA512 50207c9f7e088e80315f33d1d1c32b6496c9eed606d909ace25813b33f10d9efaf45d83a1386bbec8ac690a9baf398331197d526665107b04d096fbd19239bd1 WHIRLPOOL 1c3f694fbfd9a0b049c567386a52c83a3f509d825d2fd740f0863456f26fd840810feab8753bb474a0a716d3b634b37cdc4b3bff7779f190b180cecf7f8da0c1
 EBUILD wpa_supplicant-0.7.3-r5.ebuild 9001 SHA256 249285c8839b7b6b7a6d46ab7f51ce55652c732d9cdd343242cb1293e6431fd6 SHA512 8b28b2b491e91c7d6290ec03b038fc91b12b07aa6aa8a6349510b3cbf8153778041943d9b7bfcbe1f2a0fa61f0602a2573f71941ee88f8b34e7690cfb61aff00 WHIRLPOOL 4788ca0626c7e2d8b817a341ad920a9e16ebb7a3e82287171e54a8a0feb5573f90696b3383dece0c653f84864ba6bca477b2397a48f4fddd782bfd3e635e2dcf
+EBUILD wpa_supplicant-1.0-r1.ebuild 8997 SHA256 3bd74efa8b855f6667fd21ba51171014064649f72cd86dfe6bd2d0d27db4ad1c SHA512 207e8b98a3eaa5cbccc2e14b50efc86f15fcac40e4f9d1ce901b4acc2d07ae7548e33643439b1fe27d5985350507b9aa35698e8fc89a3bb4edc5efc06b49afdb WHIRLPOOL 5580521abfd8290982727a134119d46c6f507fea683f84d9c041d7b0e2c3c32a2503a876251b2689addd620c997ebbd4d2b546454c691dcdff76297f27bf143c
 EBUILD wpa_supplicant-1.0.ebuild 8925 SHA256 a8a244cee988cd4f2c2866d272f3799c80e7b536c585b3af4ba51c84bbc60dbb SHA512 ea6a4bb1499059da8910edf95d677ef6d848fd8a272d2b14948a545018ad433e68ecc8c0eff12e7473480f559b05ac46bcad69f1bdda3ce24e49271ed7bf7bce WHIRLPOOL 3d7a483a9746e98f3a231a401321c75c15a4fe3afaf76b3c47ddf17455a319a04a80041d420a42fa121f76d91a2b320602bb739c5ae53c5d830cff277e96fb21
-MISC ChangeLog 37674 SHA256 14001a258c0ce8b6e6b8e905cfe53093c795584f467d825cef223379566322c7 SHA512 d1bf7660320b76e704222eb412cc51b844a250ef3ea4d3c47adce0178a6b2744691f15b604086532724392af53bd43e6436839af9657ec3fcb329c43849fbad1 WHIRLPOOL 28e6a707f37c56e19b28b6744f35268411e7f5e758e7681f792d35c2544318e9a79a283489d96e9319d3950c62b9be3b9b44792f009ebd09a38ddd21420c57a6
+MISC ChangeLog 37902 SHA256 f5768b3ac6ad62ecd4b1f6a7707ce45453d5f88d656a22d2b997a50c76746d03 SHA512 565f8ab04befc86bd65e4039671c3ae74b60f456ab6222128fc7c6d62cd722c88f2e1674574632687427c176ace47a070835726a0b40543173c52dca35b3800d WHIRLPOOL 371bb47977fa75cf65a501f3181d64976b547ede6f4e462ab5d9f4c83205a4845f9a0ff94d5daa9489cd62a069721ac59d4d9a13ccf13c9fa81b0e06de82fa14
 MISC metadata.xml 832 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c SHA512 99152717877b9867d7cc384249fc570e5ba3114aad6eacec59833a3b3c3852f14f7d41515d2b8a837d1380b531d5037c40d3fa90dd2b98ba18178140bf18e54b WHIRLPOOL e875fa80c9ded898c24d18c1482fe18477da5949f3ab1e5364b6201cc873c2954ca3ca66391749db2d6c4ecaac8e5dfd138ef16bf2c46d2dc779c4ab4dbdcd44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBskF4ACgkQsR7PQhRXYElrrgCfYHVfmjulTubq5//Cb32N+VAO
-SIAAnicVsSVAdiVj7CJFAwL+q0ZebCHf
-=59A9
+iEYEAREIAAYFAlBtk3gACgkQsR7PQhRXYEkTDACfZa21majb7NXmMrapcdLqgPbs
+u4sAn3nrZ2F5dNqjDwX0jrIY1tbJMbw+
+=BPSZ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-libnl_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-libnl_path_fix.patch
new file mode 100644
index 000000000000..abf15a6e7e07
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-libnl_path_fix.patch
@@ -0,0 +1,24 @@
+diff -aurp a/src/drivers/drivers.mak b/src/drivers/drivers.mak
+--- a/src/drivers/drivers.mak	2012-10-03 19:42:16.387634128 +0000
++++ b/src/drivers/drivers.mak	2012-10-03 19:43:16.246693744 +0000
+@@ -48,7 +48,7 @@ NEED_RFKILL=y
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20
++  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
+ else
+   ifdef CONFIG_LIBNL_TINY
+     DRV_LIBS += -lnl-tiny
+diff -aurp a/src/drivers/drivers.mk b/src/drivers/drivers.mk
+--- a/src/drivers/drivers.mk	2012-10-03 19:42:16.385634126 +0000
++++ b/src/drivers/drivers.mk	2012-10-03 19:43:23.333700780 +0000
+@@ -48,7 +48,7 @@ NEED_RFKILL=y
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20
++  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
+ else
+   ifdef CONFIG_LIBNL_TINY
+     DRV_LIBS += -lnl-tiny
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-1.0-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.0-r1.ebuild
new file mode 100644
index 000000000000..d5f2f42df024
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-1.0-r1.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0-r1.ebuild,v 1.1 2012/10/04 13:47:35 gurligebis Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs qt4-r2 systemd multilib
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="fasteap? ( !gnutls !ssl )"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		eap-sim? ( sys-apps/pcsc-lite )
+		madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )
+		dev-libs/libnl:3
+		net-wireless/crda
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+	)
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
+	ssl? ( dev-libs/openssl )
+	!ssl? ( gnutls? ( net-libs/gnutls ) )
+	!ssl? ( !gnutls? ( dev-libs/libtommath ) )
+	selinux? ( sec-policy/selinux-networkmanager )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/${PN}"
+
+pkg_setup() {
+	if use gnutls && use ssl ; then
+		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
+	fi
+}
+
+src_prepare() {
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# People seem to take the example configuration file too literally (bug #102361)
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	if use dbus; then
+		epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
+	fi
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	if use wimax; then
+		cd "${WORKDIR}/${P}"
+		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
+	fi
+
+	# bug (320097)
+	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# bug (409285)
+	epatch "${FILESDIR}/wpa_supplicant-gcc470.patch"
+
+	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
+	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
+	# bug (374089)
+	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
+
+	# libnl path fix
+	cd ..
+	epatch "${FILESDIR}/${P}-libnl_path_fix.patch"
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	# Basic setup
+	echo "CONFIG_CTRL_IFACE=y" >> .config
+	echo "CONFIG_BACKEND=file" >> .config
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	echo "CONFIG_EAP_GTC=y"         >> .config
+	echo "CONFIG_EAP_MD5=y"         >> .config
+	echo "CONFIG_EAP_OTP=y"         >> .config
+	echo "CONFIG_EAP_PAX=y"         >> .config
+	echo "CONFIG_EAP_PSK=y"         >> .config
+	echo "CONFIG_EAP_TLV=y"         >> .config
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
+	echo "CONFIG_PKCS12=y"          >> .config
+	echo "CONFIG_PEERKEY=y"         >> .config
+	echo "CONFIG_EAP_LEAP=y"        >> .config
+	echo "CONFIG_EAP_MSCHAPV2=y"    >> .config
+	echo "CONFIG_EAP_PEAP=y"        >> .config
+	echo "CONFIG_EAP_TLS=y"         >> .config
+	echo "CONFIG_EAP_TTLS=y"        >> .config
+
+	if use dbus ; then
+		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
+		echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
+		echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config
+	fi
+
+	if use debug ; then
+		echo "CONFIG_DEBUG_FILE=y" >> .config
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		echo "CONFIG_EAP_SIM=y"       >> .config
+		echo "CONFIG_EAP_AKA=y"       >> .config
+		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
+		echo "CONFIG_PCSC=y"          >> .config
+	fi
+
+	if use fasteap ; then
+		echo "CONFIG_EAP_FAST=y" >> .config
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		echo "CONFIG_READLINE=y" >> .config
+	fi
+
+	# SSL authentication methods
+	if use ssl ; then
+		echo "CONFIG_TLS=openssl"    >> .config
+		echo "CONFIG_SMARTCARD=y"    >> .config
+	elif use gnutls ; then
+		echo "CONFIG_TLS=gnutls"     >> .config
+		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
+	else
+		echo "CONFIG_TLS=internal"   >> .config
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
+		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
+		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
+		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
+		echo "CONFIG_DRIVER_IPW=y"         >> .config
+		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
+		echo "CONFIG_DRIVER_NL80211=y"     >> .config
+		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
+		echo "CONFIG_DRIVER_RALINK=y"      >> .config
+		echo "CONFIG_DRIVER_WEXT=y"        >> .config
+		echo "CONFIG_DRIVER_WIRED=y"       >> .config
+
+		if use madwifi ; then
+			# Add include path for madwifi-driver headers
+			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
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		echo "CONFIG_WPS=y" >> .config
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	if use qt4 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		eqmake4 wpa_gui.pro
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt4 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		einfo "Building wpa_gui"
+		emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym /usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	doman doc/docbook/*.{5,8}
+
+	if use qt4 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+		keepdir /var/run/wpa_supplicant
+		popd > /dev/null
+	fi
+
+	# systemd stuff
+	systemd_dounit "${FILESDIR}"/wpa_supplicant.service
+	systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service'
+}
+
+pkg_postinst() {
+	einfo "If this is a clean installation of wpa_supplicant, you"
+	einfo "have to create a configuration file named"
+	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file is available for reference in"
+	einfo "/usr/share/doc/${PF}/"
+
+	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	if use madwifi ; then
+		echo
+		einfo "This package compiles against the headers installed by"
+		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
+		einfo "You should re-emerge ${PN} after upgrading these packages."
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
+				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+}