new handling for config file, enable new features, enable optional new features

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 393 insertions, 7 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 786e8cc47244..7bb15ade5388 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.219 2014/10/16 17:24:30 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.220 2014/10/27 19:33:46 zerochaos Exp $
+
+*wpa_supplicant-2.3-r1 (27 Oct 2014)
+
+  27 Oct 2014; Rick Farina <zerochaos@gentoo.org> +wpa_supplicant-2.3-r1.ebuild,
+  metadata.xml:
+  new handling for config file, enable new features, enable optional new
+  features
 
   16 Oct 2014; <gurligebis@gentoo.org> wpa_supplicant-2.3.ebuild:
   Changing to using upstream supplied systemd files, fixing bug #525436
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 1cc7bb6c5a00..19aefc067830 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wpa_cli.sh 1407 SHA256 a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179 SHA512 613345f142f2e87f7ebe9eaf3a9a60f4cee08f50596d307bd9c0acd88d1c470080bd27c645455ae32cb4fb7fe96ae131ee09fd6c7657cc298fc3476e4dfdc059 WHIRLPOOL c7d461efcde44f9ce98e99217ef27ef713082269380d1a45da17a9e679c5d816c156cb5c00665034a88680b241144e7e71c901a7c73bae075dfca7eb55b10ffd
 AUX wpa_supplicant-2.0-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
@@ -24,13 +24,24 @@ DIST wpa_supplicant-2.2.tar.gz 2382570 SHA256 e0d8b8fd68a659636eaba246bb2caacbf5
 DIST wpa_supplicant-2.3.tar.gz 2398722 SHA256 eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a SHA512 dc64c0ff5581ca36e9c41f7663883d5bf6626a4418423233fa69b2c4b57c24fa120e0699c95613152be7775835a45bd9edbe5cc95456ac3ce699b546ddaee71e WHIRLPOOL 015a19f5fcbc144ccf1b695b67aa6d5cf0cd127ed1306808ed94d422224e16978046e4b3cb5edcec46736ddde8926341c8df8f4a5dfa41f52438d6bea3e49e40
 EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90
 EBUILD wpa_supplicant-2.2-r1.ebuild 9088 SHA256 4a4b88507373a245ef76d48cfc874a793d0ef0c3b36ff811fa027150571953fa SHA512 3b380a49a73818cd18a67539c534d8501c20fbd751a2571fce13a558fa81e616c9d168263b4be5161b3f602a15d13422a1ed112da79239a2daa207b71a96cb70 WHIRLPOOL b62c28fc7fcbfa36902fd021f1a24360eb3fcf993aeca733204e5eee514ed5843126bd16cb912321111c37fcfe5bdc769ad38b139b3ddfa01241cf5d5fa833ac
+EBUILD wpa_supplicant-2.3-r1.ebuild 9824 SHA256 e5ce0875d76899fc8867c054ee5a985ee152ee8dee2a96f3246b698bccc0748b SHA512 1cfafa045c8d4b0128aa7b901a24f10fc44f883506b42002539d4d68e1b0bfcfa412d9f34538eebd828c89db71ca938702bd7873e7dc1cc83f0b546ca6c81c7f WHIRLPOOL 68ebda6d6dc275f48873293fbc5ee02cc482735bca2649b22531f516842995c38c64d7710b241ce6309e10ca5cc19f538734f47540f53a1d4e6cb3d9dfa5934b
 EBUILD wpa_supplicant-2.3.ebuild 9003 SHA256 3ef7a16d5172483bbe13df80441ca0cf6b0a433c618d573c3264216cb72c8ca7 SHA512 4ca708a34b9df2ad3a8ae92a0d716f1699092785530e1856545ba1f25007083c6972599647d9462ceab2056f100be0ac30071097031bcd6f367ebd98a74b7d47 WHIRLPOOL 4e94d835db253b0e490338d4f36e97745937a6a364555d807fe31459c84577fedd58a1a04501a29cb8b0ea8f9f5e133e26146eb93126dd18a06fce187c583886
-MISC ChangeLog 45396 SHA256 b674a6001635ee8bc9e85dc30cb322b2b3b10a1c67829e08668782aff6fcb29e SHA512 db05e63524830882f95700c24bad3d3f958bbd23d5e397c6ddb7a254b5b4ae9e299d8b3487994dfa8e5a5fb5f73cb669a7d30d4a2f320b38bb61702675cde12e WHIRLPOOL 70b3973ec7f428a88def665481324e64dc58f6e7ccbaa44980548e2ec2b5d82b5fa36287c93a2bd5b049121c3606d14a4727ebb247ee4d6299080eef20e7fb89
-MISC metadata.xml 1012 SHA256 37d9c37d5abbfa07506679cc02a17074e70d6441607fa7331e91e6698cb661ce SHA512 3253cecb7ccacc69f8bd1d75f89ac951248852bc388957aea4acebd854a70127edb6fa518b71feeeec207912aef599ea5c67e0686f06f26bce6f1489a54f3eed WHIRLPOOL 9b92b86940a039b7be7d7a3ce0c87bf8843d438e5fc0aca3fc103adca8f3ed09a605a4a7db8d4da6d0e87add4c7dcb37258012f8cee45ba427f5771d740e5509
+MISC ChangeLog 45615 SHA256 ea6b98287b789fb357bfc7998150a1c106773262f62e898f09dd5b49a2d17e3f SHA512 2dd494ec84a760bcf49167d0637f2b1f48ae3d575cef75d64f1c5f66a8a4140af8e8d154b723c4c228c8ef0d2243f8fe858967196dac1473eaecb30c725c619f WHIRLPOOL 583fd8c0c5d5122d5b113414852859de278b132af585407f204395cafd5d7b3c610c9f08f1f230a24ce18da402a5de09a3418f52c5a498b5c6d01162c4b94361
+MISC metadata.xml 1253 SHA256 a4e9c1eca186fd6158512a3cb8cb42f519c48d3b2c43f5af5c56afd51a356c10 SHA512 f534ef753089dbcc2b634ead459d6f47d6e1a1682591c01a3b99d5fdaaa0602bac48e80b41afdf04517d8ac43ec0ff93cc082eed0f209d937cc2199884365be1 WHIRLPOOL fd163dc937c19face2e496e22efbd1ad0b97b963eb14b2998e32c7e06c374c799bf8dc6a3f5f75d6d15d31b4d65a1cb4a4242ed7f47c92cc6c462532ac68dd7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ//1MACgkQsR7PQhRXYEla/ACcDsoGt/ojLtOis6smEvDPuFL2
-q7gAnipK/e4qd7MnEJM3O4LZwGRfj1Oq
-=sur+
+iQIcBAEBCgAGBQJUTp6pAAoJEKXdFCfdEflKdSoP/iZVYPlumngujUEZqqitdtvE
+LFoZ2Prf3wnPjIaQxVojlPuRqgwcA2AhBUtROBh2ISL15k8Byp+Jf0KiDex/JPJO
++kmHY68Fyl6EeQJHDly/dssHpTiUXJwtlHX/DA2UyT/u63pk9K+xbpq5wK264NbY
+UorPu5NjjGGAOnnoMyx1vxNZJsPilpUUwB6lTSxyAcXEX03zIZU6rDWH4bapIXDC
+idwc5D2xXbRN+GKjQyo0HJvsP0hsaSwTqG6TpPW3xZV4W4Wz8IcUIX6tJ0wSqIug
+Y7xTmm5D8BaZepFq54Q+PjL6pKNuz5Fc3htYeaPgHuxGOGCe+Qd2rRHo6FTtOZWs
+SRxo3VJZDxmqng1hllNWdlTh0KdgkHJGz/iinxa/u0hpoLyBaMvqHXvbSbMU0qDQ
+Cu761L7TCr/2pxb1K6ATI2jgyVuGxGYF8N0DrpewhfQwe9mONobi5c1oeHZ/B94M
+wbCzFSam5KEu9J/MNJhpoeMSBXkEor+G5l0FJ5ZCwws6QXfc9/yligTsxMZ+fcZw
+NWJhOphfgb6iHSlPHXz2OQj0Bs8eIpwAoHf81JFj9/ZStiw6gEahU7eul1OUEprI
+GohW0Lbpaa66eDHzM81deprLGgnIMFctGtwce81+1TimlHF3NaYIHwLEn5lwD7J6
+zwFz+sqzsNFQUSEPoKdH
+=b3F1
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index b2b6a1eef87c..79520bc1ca11 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -13,8 +13,11 @@
 		<flag name='ap'>Add support for access point mode</flag>
 		<flag name='eap-sim'>Add support for EAP-SIM authentication algorithm</flag>
 		<flag name='fasteap'>Add support for FAST-EAP authentication algorithm</flag>
+		<flag name='hs2.0'>Add support for 802.11u and Passpoint for HotSpot 2.0</flag>
 		<flag name='p2p'>Add support for Wi-Fi Direct mode</flag>
 		<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
+		<flag name='tdls'>Add support for Tunneled Direct Link Setup (802.11z)</flag>
+		<flag name='uncommon-eap-types'>Add support for Wi-Fi Protected Setup</flag>
 		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
 		<flag name='wimax'>Add support for Wimax EAP-PEER authentication algorithm</flag>
 		<flag name='smartcard'>Add support for smartcards</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r1.ebuild
new file mode 100644
index 000000000000..d6e86613ac48
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r1.ebuild,v 1.1 2014/10/27 19:33:46 zerochaos Exp $
+
+EAPI=5
+
+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="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ap dbus gnutls eap-sim fasteap +hs2.0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		eap-sim? ( sys-apps/pcsc-lite )
+		dev-libs/libnl:3
+		net-wireless/crda
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg: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}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+		else
+			#ensure item commented out
+			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+		fi
+}
+
+pkg_setup() {
+	if use gnutls && use ssl ; then
+		elog "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
+
+	cd "${WORKDIR}/${P}"
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+		epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.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"
+
+	# 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"
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	cp defconfig .config
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	Kconfig_style_config EAP_OTP
+	Kconfig_style_config EAP_PAX
+	Kconfig_style_config EAP_PSK
+	Kconfig_style_config EAP_TLV
+	Kconfig_style_config EAP_EXE
+	Kconfig_style_config IEEE8021X_EAPOL
+	Kconfig_style_config PKCS12
+	Kconfig_style_config PEERKEY
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	fi
+
+	# Enable support for writing debug info to a log file.
+	Kconfig_style_config DEBUG_FILE
+
+	if use hs2.0 ; then
+		Kconfig_style_config INTERWORKING
+		Kconfig_style_config HS20
+	fi
+
+	if use uncommon-eap-types; then
+		Kconfig_style_config EAP_GPSK
+		Kconfig_style_config EAP_SAKE
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	# SSL authentication methods
+	if use ssl ; then
+		Kconfig_style_config TLS openssl
+	elif use gnutls ; then
+		Kconfig_style_config TLS gnutls
+		Kconfig_style_config GNUTLS_EXTRA
+	else
+		Kconfig_style_config TLS internal
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		Kconfig_style_config DRIVER_BSD
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		Kconfig_style_config WPS_NFC
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		Kconfig_style_config AP
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	# 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
+		Kconfig_style_config LIBNL32
+	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 V=1 BINDIR=/usr/sbin
+
+	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
+
+	newdoc .config build-config
+
+	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
+		popd > /dev/null
+	fi
+
+	# systemd stuff
+	systemd_dounit systemd/*.service
+}
+
+pkg_postinst() {
+	elog "If this is a clean installation of wpa_supplicant, you"
+	elog "have to create a configuration file named"
+	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
+	elog
+	elog "An example configuration file is available for reference in"
+	elog "/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
+
+	# 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
+}