gentoo resync : 29.10.2017

11 files changed, 19 insertions, 631 deletions

diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 9cf059a5ba43..93f877664875 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,6 +1,6 @@
 DIST blueberry-1.1.13.tar.gz 1382261 SHA256 6a1e53d1d543417ec788e1f3dc89126a3e1a4392812977095be383f111cc915c SHA512 587165b33f087720f9ae72dfb37feda9c6c3e4c4ad166a5a410c078a63bea0d33182b781f8f0c7840575917d06faec752866009c9b3664241b7ca23ab1586b94 WHIRLPOOL 63ddd2fbe1871b13b623ff47df599ca7ac222cc20dba04ffb17a76b28ae3340fc1a9df2c47a16c46a53544327f592ceeec05411972e5cf600c93755ae2e47eeb
 DIST blueberry-1.1.8.tar.gz 1342620 SHA256 f794a278d1c58e7b1717da1b89bff0939c4ae47206b6917f335d1b19f7569f55 SHA512 e516294ad9a4c40dee3c1acad2a30d8110631fff9627b2212f0f3168e13e615ca0b44b93ee1da0adf99b0b858effdd61db2a4898000c5cf040d638746a45b1bc WHIRLPOOL ed527e7cfbd41ab8e128c072da251825d2db27347ec452b158efe0e9e766e866cd8a8c131849ef2d29872fac09d97644fcf18b9f7336a3e0e57ad09f90e92dad
-EBUILD blueberry-1.1.13.ebuild 1294 SHA256 b29054d9a7ff7ec628574439363540fb781a66a1e26d3e098fe27d42a013f555 SHA512 d4b7b1fd7d03ec59a1d0b7fe683a541d32855bc75771a1fa2b16b371d2683fa8b998dca9b0350555f38514e179a8ecba7c88533f7baef78a40aa439efb8f0a1a WHIRLPOOL abf281d0a8069b1e592b34fa3e7be508fcda246f1a7a736499aeaa6639ccf5d56a8f733a1bcd671898fc47487f5255de5c41c589cce569a299410f28fd1ba496
-EBUILD blueberry-1.1.8.ebuild 1121 SHA256 bcde5e0e16ed783b950ecacbb7f0da208e094aaf936ec480563cbc32ca3bd0f9 SHA512 7a31601641ccf99978031b061357da58c607bf73529ff2a0dd9df1abbb7eec494c7a6e0131c0f07309cbcf08f64cce66c44a07bec23326b4ceb13226df809d53 WHIRLPOOL 6639d6539c439ab9f66cdbdce18a57b1529be5be64717e933290fcbbbb8ea4705e8d3c9ba7721c116eb2e117907642f51bb5875f0980ca4f3a5d2ee899f22149
+EBUILD blueberry-1.1.13-r1.ebuild 1337 SHA256 31ebb9bf8694bff5eef68fa79efc975769979441f1dd8fdc2d6564d7a8403ac2 SHA512 a3e0fd5df76c02c9cb920120a0b5a57dfe777d5cbdfe870d5bc33440a28c4c39890fb86f4cff72bcf0dd86517317dc1759d5aac5fa03720a4e792abd458b20b8 WHIRLPOOL 1d15975ca776312c1114e1971453e4f7b04b4cad37449c0a3bf58c2d0425e1681f96d150db23534af9e1d45bdc593db590f5d9293422e3a97a4c6885ac38e656
+EBUILD blueberry-1.1.8-r1.ebuild 1164 SHA256 d27b18cda69a14cdc9ae7a8ec20ff7a28a7fbbc3887a89e4ee59da444cb8d851 SHA512 4e4629de42015edeeff44beb59e76a787b2ff75b3f5dfaea1b70014a22e41c456bc57f301c39d3d47f37c45cc1f61562c7ca1677f4b40fcd14e04fa489b4e41a WHIRLPOOL 93c8f6095a7dc7e8fdc899d9986f0f4a2f66f0bd31656c960f696686fedcbed64d43ee972eb77df3f41294634e399fd5b7a79ce1c162251ff65134062674c613
 MISC ChangeLog 387 SHA256 7a9e6d782175478e3025367e982b62d47d2ff25827fedec5998351bdf3177382 SHA512 a1ae8dab3f6dfca758974364100b2e02de09e662f8c3b865e2df9397d50d300ea2e899c30c24b234123c5d3aac39a15b0f810716dfec1927f13dd0e3eab0601c WHIRLPOOL bd49b03031824544be310941012c7ed79287bdf76ddf36f9d26403085cc09a4c19ee72ce0c684b383cf65af84e77ced9b4fad6e36048ce558aad3fdc0de776a1
 MISC metadata.xml 579 SHA256 11b3a3ea497d51740490b018f1f81e7e17376f193cf126b924189caf882be526 SHA512 26def52514f520317b750df8519813d4f62969f9f62942c44f1b7fec69b38c17f457aa9cd728f27e71723b5a9b7ef555766c7d1c7df453e08539fc6216906840 WHIRLPOOL 246f5e60abd85d0afbe9f390b13f76037e5894f6c7f9c9a2e6dede898b3cc66de1908c0822a32d2d1a625820e01e47f7be3fb20a17bbf9f4b2c0939187010799
diff --git a/net-wireless/blueberry/blueberry-1.1.13.ebuild b/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
index 60f995f28aaa..82e74e30c65b 100644
--- a/net-wireless/blueberry/blueberry-1.1.13.ebuild
+++ b/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
@@ -24,7 +24,10 @@ RDEPEND="${PYTHON_DEPS}
 	>=net-wireless/gnome-bluetooth-3.14[introspection]
 	net-wireless/bluez[obex]
 	net-wireless/bluez-tools
-	net-wireless/rfkill
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
 	x11-libs/libnotify[introspection]
 	x11-misc/wmctrl"
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/blueberry/blueberry-1.1.8.ebuild b/net-wireless/blueberry/blueberry-1.1.8-r1.ebuild
index 036859a11bd0..d8c1532b0750 100644
--- a/net-wireless/blueberry/blueberry-1.1.8.ebuild
+++ b/net-wireless/blueberry/blueberry-1.1.8-r1.ebuild
@@ -20,7 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=net-wireless/gnome-bluetooth-3.14[introspection]
-	net-wireless/rfkill
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
 	x11-misc/wmctrl"
 DEPEND="${RDEPEND}"
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 9a9f7efd7815..3f0ab43bf71d 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -10,7 +10,6 @@ AUX hostapd-init.d 739 SHA256 3678565083106e698ca30c305c4561152a2b043fe894b8b773
 AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae67e02d7292558d8f SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29 WHIRLPOOL 3e415fa8068aa429cb37c7957d396d5e261b5843ae06eb81370728be36573e59e90707c7047b336eb82562e98017608e712ceb28afe2bae385b2821e1cdbd856
 DIST hostapd-2.6.tar.gz 1822341 SHA256 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda WHIRLPOOL fa093c371a66f3aa834d44060330259dc20e3a1937ffacc4450c5c645291c2bd4b31bbe1827f7d27bfca724c5e26f53ea59f2e3aa69a4c87177212bb491b119a
 EBUILD hostapd-2.6-r1.ebuild 6385 SHA256 877d3d7ae0db1a37d581b763e6ec66a2fa45b129c23dc7613d4902e7cdc71704 SHA512 bae75fa20068a5b6e4458d36e4b931bfd467775fa782c630f2a6c9940b16faa0dc0df90ff43f23851b50fd4cb4ae5c560764703afe33c69190af6883796a1461 WHIRLPOOL e0c2826ce75abe4ac3ff9c6786831ccf718fdeb0c9a1d58bcae8ca7a28a48d3f991ff01f5e97a5152e4fd5086e23b2cea2618d428a097cb461e1eef49235a66e
-EBUILD hostapd-2.6.ebuild 5605 SHA256 16afa0cfed68e19f323fad2fbe0936941a236124061a4497de1cfc670c8e5faf SHA512 d73ae79008ed99fa3bac557b43aedda6a8ae225998f3c6820668cc22585bf5efaa66a6c6674244a1656cf5639cf4edf6dc46ca8f787908253dd5fe0ff2271fc5 WHIRLPOOL cfec9547b3d6df34449ccad13cf8e380587c9375c9ebee18589e317603f25e81036a0bfaf453fd79c5914f6a971cf68974432480dea0c1cb4eb5c756c98e4ac8
 MISC ChangeLog 6816 SHA256 5d5d77e87c7e2d1a5eb966cff140f01772fcc993ecd16528d046d9a4fc5ac772 SHA512 548dab0b9d7843847c2ebccb36551fde405e1de5422d1579570d3f16c3073a7e25b5d3bb6813c8e01becb8ba81eebbe482c2639b810ca67b4ecaf3e7fb77e52a WHIRLPOOL aa9919ca20fffb5d9b647fb7bff2066a7c6363d7fdc47db7a6876fc2f1351b9cdb913cc76e1d8dad967688673821fa77903a62fa142c16516dcf039df7cb6c9b
 MISC ChangeLog-2015 28569 SHA256 3ba81aa1723ad809f53045b2c8712d882108a7178b603e3edcfdcc55f1b679b2 SHA512 c569a575176d90ea119280751ccec7b0bc1cf8b405e0d757aca8692ce13d27f5d26152613b28d5b845dacd45e72807cc8e79b4078c63c1e4990f7561e0f7d4e9 WHIRLPOOL 113bfd63779a7d79c63a3537e0585b827b167f4b0ebd194de864bee7118681dedd000cf263bac109fe98ae95df11d1e4dc3b5c141f5cd69ab131f3cf085c9d22
 MISC metadata.xml 803 SHA256 1da3a09cc6e259123e1ab88bfb0bbdad458764141abfb22073482e5d73a19ea4 SHA512 1622b5584f14b0fdea3836a6902ef7562bea4e03cf526fdd68d4e0995354cae2036136a68b1c5ee2439d47c5cf28a73cc9754c8b1be56efb4ad84aec0c073c87 WHIRLPOOL a113189f955b206b2caad18c76cfa6888f3c3f2a1ff98caa033120cb5b32af23312d5f6c1d48f7a4f6b07303d71ccf480db750ec621b3bb578b5e6ab618ce008
diff --git a/net-wireless/hostapd/hostapd-2.6.ebuild b/net-wireless/hostapd/hostapd-2.6.ebuild
deleted file mode 100644
index deae4e47f998..000000000000
--- a/net-wireless/hostapd/hostapd-2.6.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils systemd
-
-# bogus commit to force manifest regeneration #596462
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	# Allow users to apply patches to src/drivers for example,
-	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
-	default
-	popd >/dev/null || die
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_ERP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-		echo "CONFIG_TLSV11=y" >> ${CONFIG}
-		echo "CONFIG_TLSV12=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-
-	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
-	echo "CONFIG_HS20=y" >> ${CONFIG}
-	echo "CONFIG_WNM=y" >> ${CONFIG}
-	echo "CONFIG_FST=y" >> ${CONFIG}
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
-	echo "CONFIG_ACS=y" >> ${CONFIG}
-
-	if use netlink; then
-		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
-	fi
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	if use sqlite; then
-		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# 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
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	emake V=1
-
-	if use ssl; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	use ssl && dobin nt_password_hash hlr_auc_gw
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are running openRC you need to follow this instructions:"
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/rfkill/Manifest b/net-wireless/rfkill/Manifest
index c928bf358687..9e0db5df1f63 100644
--- a/net-wireless/rfkill/Manifest
+++ b/net-wireless/rfkill/Manifest
@@ -1,6 +1,6 @@
 DIST rfkill-0.5.tar.xz 7776 SHA256 e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a SHA512 6ad4d28e7bf7ec69ec6a600cd774b7b3c60e85849ae3fca0f5509ed6a283ed5656d37cfd770df45ff1ceca59edd814807d116b30e199fca303baf496441419d7 WHIRLPOOL 7f874d05b24f17d7926a8cabb85fad2c41ddad9085286527f8090144e2bc658e2332f9e197f26932770ba67f948e979402f7e8c0c6926f1e2244a0684551ebe8
-EBUILD rfkill-0.5-r1.ebuild 652 SHA256 8e975a614d6bdaa04c02da4782f183b107820d6da7b7c799b58efb6f61bac332 SHA512 dcd48d513018baa4da8b80c8fa54f95fe1a7d99a5dd458dc55b95b718c369bdf59322d14abdaf1b874cb957da76eadf7c3237f72620c0276a9c5fb376b8d568d WHIRLPOOL 568279749dc46c4aabca6cd55bff93487376f29508cb7dd25e481901d211bec7bbf7d28eb65b0fc14349f2e11c00533909dea9f41cebac187e59dfdd4a183353
-EBUILD rfkill-0.5.ebuild 617 SHA256 ad8f0f399f8a459bab980f2d0ab52581ca0d3ba28981c1d5376df650494f041c SHA512 69059256166d30b721722c9333b6c1d9370798c935b9bb46f44bcfe2ce2a44219d05a22b52a7a06df86ad45a29e8cf5566e53dbb4212a98a4a76f028e59fad70 WHIRLPOOL f19d5626f401248470141eba6026a112b51fdb0986728e74e6f48e174bd85e8487cb81185174d23bb121d35d46d007e507dfe8c682c72edd6a505a5f5e3a7530
+EBUILD rfkill-0.5-r2.ebuild 648 SHA256 74cbe90516691827ecce5a1d133b1f5397c2d21cf755c87337d195b91c8fb1c6 SHA512 dc2ce86ace708658872b0fd1d86c5dd83f98bc6270a461746046eaedea1a1e22f73f02664926e8b50a7f764c4e4a932c8d8a903ea2b1a22b7307be93eaf4a451 WHIRLPOOL 2a243ceb107be179c4d558fc788b5693e36043e48b6eb7ef3dfafd7760798f15afac9ad273b25a2b0dca9b0363e111063a029d4181497cef8ddb1d3719c94b1c
+EBUILD rfkill-0.5-r3.ebuild 683 SHA256 fccd4d4f99130b3645d469ce4fd419d8ca473b3a8ce97e66aca0810acf54cb11 SHA512 7a798f04998604d75a2e84c52ed8780502373898611565c07cfc87435ee33e081e517fb6d56b24672272c39dd96a38e45beb2811eda0a1aee1f0441054aa5bc7 WHIRLPOOL 300d936e74eed5623c6ed87e1a2bbab69ae25d432e23ed4d5a3f9bb569499f8b86e8d44e9001fd3dab48e0b10ea048de9ffd333dbc982099ed7997ef81f64ef0
 MISC ChangeLog 3410 SHA256 112d417e3e30512114141529fb4b31743cbdb631c024208ceb035a376b42c6a6 SHA512 3cf065cbf503df7df6c520a2c4b5d095874aa5afd3355e9042930397b277420454ebc4aaeed00fb76b4bb8bc30647f89fc2dd454cb031bcb73c08439a1549cba WHIRLPOOL 428154c04540da48329335cbbaebf6436028a52a5e87d488271a67b97f34538d74a48c9fe36af0a6f058b45dbafea09d152ec462eb7176239ce2f4d605e9e848
 MISC ChangeLog-2015 2567 SHA256 4130b6d6d626dc539b2a7e288be492c44091d600be8b213c8420c998840d366c SHA512 9edbefcaf9f80f3c9f2fcc38b2250f20380702df6c2f7017ed11880dc9d30e6318f51327edc145183afe3fd162100f1c6e5ca07ce436be10e755ce64ca12bd93 WHIRLPOOL 41eeb013204de6e4809cb0442874be8817fcd16e0f187f358f21c20403baeea5fe3e7f8e86f1f8d897bc355c0f87a1cdfbdcdbe41f93f335e6d188a93d7b073f
 MISC metadata.xml 354 SHA256 2d7aa32c3d54bb1de2b052f3a427c92b598e569628662b3d372e72abe7b8a772 SHA512 a20e530ace90b8649cb2c22ea255049aa31142a7b1c839f1f112ab0cfc22927c1d7508625e92b2e13ae2fcb65e8f2088ea16ba1194069911741c5eba45293e17 WHIRLPOOL 67616c97a29bba568dafbe8b2349ee4fdfa572073ca6299c88fdc7852d5ae70fe12de3e42fff99c74978c279fa771700d096388b66d0944387254257575ea206
diff --git a/net-wireless/rfkill/rfkill-0.5.ebuild b/net-wireless/rfkill/rfkill-0.5-r2.ebuild
index 86d4f3feaa82..ab6b3fa74faf 100644
--- a/net-wireless/rfkill/rfkill-0.5.ebuild
+++ b/net-wireless/rfkill/rfkill-0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="!>=sys-apps/util-linux-2.31_rc1"
 DEPEND=""
 
 src_compile() {
diff --git a/net-wireless/rfkill/rfkill-0.5-r1.ebuild b/net-wireless/rfkill/rfkill-0.5-r3.ebuild
index 65a79620fa8e..dad893b293f8 100644
--- a/net-wireless/rfkill/rfkill-0.5-r1.ebuild
+++ b/net-wireless/rfkill/rfkill-0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="!>=sys-apps/util-linux-2.31_rc1"
 DEPEND=""
 
 src_prepare() {
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index dbf6e3965d2f..7c4fa431c3cc 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -23,8 +23,7 @@ AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038
 AUX wpa_supplicant-init.d 1250 SHA256 98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7 SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403 WHIRLPOOL 01a81c7527561845148102863a6c80c1a0decab56320611a7dc96d7fd0772a75767a5bfcff5fd93a40842e52b517fd417ac21e8233f68e173add847608321a6b
 AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548
 DIST wpa_supplicant-2.6.tar.gz 2753524 SHA256 b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 SHA512 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 WHIRLPOOL 63f91b9f72fee65df5412e90f5a4b38f327f47b44724164aa27a6933a68c68672a129d7c01e658c7fed1f7018fe9e4b743f3c6cef2f69fd75c3f5b9a1cb67c1b
-EBUILD wpa_supplicant-2.6-r3.ebuild 11021 SHA256 7d8a05495ac8254c52af1a7db3f28e3d17d37570aec1ad94dbd9d4868fe878d5 SHA512 e2f99b2b7df5b0203f77e472109739afa5acc0a065d769a7c9874f9f13dada6514292e9613c5220d97d2e849d6ba434fddce5a62db661481052a9227b75606d9 WHIRLPOOL 0141e1cab568c0375e0e970416a497c1126acb5940f1a3096a40b30db93a5194e4ee8598a81701478840e2e5c81dddfbfbb3782c255e0b87e76da2e8b408b736
-EBUILD wpa_supplicant-2.6.ebuild 10387 SHA256 88bcb24afd034a61d838a5ea30a4cdedaf40a46140aaf7c1bad5699c4492ec1f SHA512 f5b2bea3e358363ec89d56efacfcbdf7de6adefc1c8869e80407db300bfa9630db11b0c549cdff0ecd0ca67cc655955f2ca1d468991ddddaaa082274c37cf638 WHIRLPOOL 32a4058cf743743e9545f10bbaad05ca474cd33bb977b470e4d651136f086d1d1a0a998191c743fd5e29fcfeb1b9f4626ee02dd613233489a9642ce7e9bdd1cb
+EBUILD wpa_supplicant-2.6-r3.ebuild 11009 SHA256 4153d626390b54c8aa80118a251ff9574a3b14e0bcafeac360e6fc42005214db SHA512 4c4e0bb9ab8b226e16640daf7751362db531c247f379257b12a0ea341ac1122964dd6e99ee22351f8ca5425c98541e113dab96843aa98c63d0f9b88252afd753 WHIRLPOOL 4a2a6ca59f24b335cd930f156bb7ee6801295c31fc483b29dfba3a47efba06cb82f2019efd07055265d3fb51f1ff9b5a1b73c87ed2941c3287fedd972a343f66
 MISC ChangeLog 11682 SHA256 efbca267d21a112d16d2c31ec937decb8835cb2daf8d49888a65512c5d290561 SHA512 5468ebc87b83245f4f950bf3bf08a027a746e5872b932a65690b5996997028dcfc627e0048f7dafaf427ed944b9afde51adbe194dc5a1ee468e7a6ae1e4f3630 WHIRLPOOL 2da07e6d6d160319f0ecacd2aee323792ae9d05257377521a955f624f1c988cb7ae2fc90659dba6ae8244edd006ba85af7356ee16202ed6b31b556785beb8f41
 MISC ChangeLog-2015 51458 SHA256 b9aa43f72daf3df019ae96e8f49a0825f910d19149712e6e6a30a4fc56dd7476 SHA512 84963b76764be27e85bbf40a74c714702fea51406d6de813624e95408018c66ecf36ef50298fe150278a9ca930c5d21946766d3c0aa624627dd29340abc95eae WHIRLPOOL 10bbade886984c1668850770ddb14a92cd990236f150eb7aa9bfdf421035fb7a864a9551f5ba8a5785da2f53d7bd463488905f3ec3479b498ff6b50b298cd887
 MISC metadata.xml 1298 SHA256 fb99224e36989c66fe85f2e8222521a0a88e1cac6f6a963b6170261e5b720a19 SHA512 166af06f1caf533381cdde208f98863d2e38a7de1ab89a0ec3b7e9e1ffa3e173540564fafd2e032df79197f596e7ad227f8eb6c2c748b2fc1368999f09588044 WHIRLPOOL d6a9ec37350c417dece67ba992b5aaa914e3f9ed11c4b2d5e9cb88ad4db664db84f4e5572e619be1be3e5a96628ff4305a6f87e6f6b52816f96b91de32253eb8
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
index 0c7ca6fbc325..756782604758 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 inherit eutils qmake-utils systemd toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
 SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="fasteap? ( !ssl ) smartcard? ( ssl )"
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild
deleted file mode 100644
index e9c1c8a53ef5..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs qt4-r2 qmake-utils 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 ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )"
-
-CDEPEND="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
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-	)
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	!ssl? (
-		gnutls? (
-			net-libs/gnutls
-			dev-libs/libgcrypt:*
-		)
-		!gnutls? ( dev-libs/libtommath )
-	)
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-networkmanager )
-"
-
-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"
-
-		# 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"
-
-	# bug (596332)
-	epatch "${FILESDIR}/${P}-libressl.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
-
-	# Enabling mesh networks.
-	Kconfig_style_config MESH
-
-	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 and syslog.
-	Kconfig_style_config DEBUG_FILE
-	Kconfig_style_config DEBUG_SYSLOG
-
-	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
-	if use qt5 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		eqmake5 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 || use qt5; 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 || use qt5 ; 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
-
-		# This unit relies on dbus support, bug 538600.
-		systemd_dounit systemd/wpa_supplicant.service
-	fi
-
-	systemd_dounit "systemd/wpa_supplicant@.service"
-	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
-	systemd_dounit "systemd/wpa_supplicant-wired@.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
-
-	systemd_reenable wpa_supplicant.service
-}