Drop unsecure versions
authorMikle Kolyada <zlogene@gentoo.org>
Tue, 28 Apr 2015 08:06:32 +0000 (08:06 +0000)
committerMikle Kolyada <zlogene@gentoo.org>
Tue, 28 Apr 2015 08:06:32 +0000 (08:06 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

net-wireless/wpa_supplicant/ChangeLog
net-wireless/wpa_supplicant/Manifest
net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild [deleted file]
net-wireless/wpa_supplicant/wpa_supplicant-2.2-r1.ebuild [deleted file]

index 870c97dbaaf6f6cbccf74eddde24fd3fa2a1433b..298677f3ffe8487d2eb0c32f751c245f2714f8ef 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.236 2015/04/27 18:29:34 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.237 2015/04/28 08:06:27 zlogene Exp $
+
+  28 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> -wpa_supplicant-2.0-r2.ebuild,
+  -wpa_supplicant-2.2-r1.ebuild:
+  Drop unsecure versions
 
   27 Apr 2015; Rick Farina <zerochaos@gentoo.org> wpa_supplicant-2.4-r1.ebuild:
   arm stable, bug #524928
index 4f801d1276b45260d376e7ae92c092acc03947fe..31d1f183e5d95478572033c9d93d31c1287798a9 100644 (file)
@@ -20,28 +20,16 @@ AUX wpa_supplicant-init.d 1249 SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7
 AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548
 AUX wpa_supplicant.service 264 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e384869e874585cf5720c39 SHA512 b5ff8db22a7e23e8a54a6bd018c495093c7d31f5734eb83cb652184193193d7cd0c03b7ca286eeef59b0a12f1472d5fa37990d7c10511e22f2eaf410ee15d056 WHIRLPOOL f29f175636def13bedd8519d9837fffb802dcc219e3714ac8b285ae1d411a2c19f55ae1d8c1bad3446a4172dd28ff3d5d9d8baedfdea29e2a057678b82589e3c
 AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c SHA512 400e2e4b69408a4fe044409fee9639338e1fd6423e00a544b46065fe1d0215717b17b44ce1abadf0ce5da365724977ea0beffbf75d96c0c6ee1f24618c92428d WHIRLPOOL 1603e4651072e0dfb5381c9a063db64bb412c2bc640226137b7cfd56f2525a6c1e198cb042553f5a25fc234773d1d9438eea09d65fdde71d81dddfd86b5273b0
-DIST wpa_supplicant-2.0.tar.gz 2044281 SHA256 2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 SHA512 c3a599e1dfa5e0bb4b8d35ed49501696ce68c807ff458c1e3bff9ed5619c780f7117c6d8d7cb9a11351e9fad27cf83fc114f255c92552e7ba084de70c5f8e254 WHIRLPOOL 603f9ac54505166690516a0f1e3112a8279a7184a54066699ad24b1f6269ad90c46a01a87d23bb62df782cdf561aa6f8b5a11e7ee59914cb36be8daea470389e
-DIST wpa_supplicant-2.2.tar.gz 2382570 SHA256 e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed SHA512 34dd3eb2c7c65baadbd8108cfb879be5b68e70d925fe65cda566bcfb9bcc31b3e2c521ee719d056d2b4f7fd17a8d387ee1217cb4ebbbaf384962bbcbc27ea57a WHIRLPOOL e53c55e23760b8d8a60845e9dcdc926e7c9672ad06c1494f1a931f916f4f6c77b51c13cbcf5f5ffc4c9fd8a0b7ac5292d0ecd6daca4480cbe931ae44857a06a8
 DIST wpa_supplicant-2.4.tar.gz 2525648 SHA256 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122 SHA512 03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b WHIRLPOOL 092ae97e2c0f55d7055fd4e5d688e2ba538f785089a13c754129829854b20a98de832d9d0925dce5823a060d10a3bb5882b0bf3d6cf55f8de9bbc2b00fbb7392
-EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90
-EBUILD wpa_supplicant-2.2-r1.ebuild 9106 SHA256 1097976c50991b82b1e027cf32ddae7d115cbbaffb254a174894cf16314381ad SHA512 ea0fe5d9623e00a4eed9d5c3e6129c7988c19895f226085dd70f393021dcfef7c84d7f03f18cf7bd157791f5fac6418841896bc7f871920cc7eb34c4b0516acf WHIRLPOOL 15c610f222ddffb6426f8646dd9992dac9fb19237b126164591a70867ec9ed756e994dd0268762ec3fb2508882b710dd26aea08e70aa4f06eeada26840f42a8b
 EBUILD wpa_supplicant-2.4-r1.ebuild 10128 SHA256 88594c2ea4088cf2ec3f29a7cd56616868292f928c0b10c53df4d2dcc005964b SHA512 f09bbee52b680b259bf915f535212ffc0c1b0508a4068a6dae849d819f7b4455efdddd1720cd15bfc44f2d4ffdd9805949d13321fc7d11bb0ff98e34ac7b7d04 WHIRLPOOL e883943e3cde33e304bd31c657c302206885b782764fc109803db150683118537f93892741a324faebeb07db0264be108411344910d8f50101c7a7ae4eefeed7
-MISC ChangeLog 48557 SHA256 76784432d04affdaca968760d6bdbdfccf411eaa1bac3c5ccb306690eaa4309a SHA512 373bf404e199323448fa6ce9267f3ce56449e713b1591262c4c852d96fdbbfa217b713b28f958888cf8a357efa8b8a85bc0ed8a27cb92ba3bdae83b996010e6b WHIRLPOOL f4c1e1e766326ec5c04f70c54bfe1ac00554ae6e17161ade1a82b15bf85bab06bc598e786c8c191195141ae16913ceb1ad43af1168704190d983ae106eb59c4d
+MISC ChangeLog 48695 SHA256 017837b75636e433e315850c8e637291314e738f160caed2b3de9a4280199b61 SHA512 8c17a9b3665a430dc7159c8dbcb1f24324b45150c4e53528fae03216ed5136b8449fb12521057efffeed5abb1484dafecefc3dc1ee00664ef9d3dec648f9d687 WHIRLPOOL 256c260dfc8b200e50ef61b70471af98bb957ad60132d8875d39a2db8208999f0ae38b5254436938bb27d4b4ef67ed971c0b14af516a040d77159e749ad6b9ae
 MISC metadata.xml 1253 SHA256 4f58fccaf5db494ac8815c1ca7caf7275e46afe3db674859255bab89ca43837a SHA512 a266e13d347579626be1a28470ab44fc4d47e5c8df1e80166061f6c9bd40eb4a4af7ca0ce007ed5e20be7648b421b57fb13916405af7502d1822b59c7ee9ace4 WHIRLPOOL 56913efc84be9c8ca5bfb82fa5da85771d06358938556c5e6aca6c3e7eb4d922781a6033200ee0d68a764b9c8701dd118c03510cda0c81fa51f3e5df37b3a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPoAWAAoJEKXdFCfdEflKrsMP/1hCUxIcF8+gVVjYCfGGAAZ7
-YKsRbEBOoXf+DCg2p2esWsEeyerZM9tIz+68NT+8TfW+PAgOg+8x9sHv/2iY4Mt+
-Q4Ujy+SPHQuNyaxa5I2O4chHulcogoKYZLN7pbAteHP5ZhKNtQzDxriHy9VcpTGt
-ARpdB/Kd144Z3KFtMCZedo21ryBkinvG1QJbu/OTArZUk13cVzKPZdmaevTIT97h
-rhS9BDf/zDYbaM4bL+hkZyf/fWudB/QtNbLmefu/S1MHuP5kWilhxcd7F/ZPWjFW
-uifs0w+ivvrMKemb779lc/gwwe7eb4uG1VvLfzJb+R2DotAWBYuCa+cXUuQz4lwF
-de0MC31mNtR5DaOTRU4HMRmRwXp5HojXkQ4p/6LW8GidWY+xULJ2QVTDLI5Lc+Sr
-xeYpC9bOQtrH/M3CuQ6auG+fnX+2cbWrDNvNwQykZ9BRIjHEoUqfJ/leXIQX03ek
-6Tu8be3ZLkgcvgFldmoXuMqR4WTLdRumUNzfy0hPDhmx5nFqC/JCPPU6wu/8HWpi
-4m4RsWnUxgFGaj6Hhcj1Bf54wamHfIqZuQqkGoNhbVniRYQjamtWbEKud7aHZoEV
-bYJpLLfLHSX8ZFmEbjDPMP7R6//laZ2hGsFp3HVZ4u1W13EZ9xPW1Dy9A1EjCNQ2
-++f3Vyc4xWrwCW4A5mVC
-=Mu7b
+iJwEAQEIAAYFAlU/Pw8ACgkQG9wOWsQutdbPFwQAoQuL3AIxHLm7+T+bGNFhYASg
+GuMvyHd3BVFxhOw2gYpN5F4vKyfHm6xij0hHvUOxX47mQkMwh71qJJPlaV7jdV8P
+F0Lu8cgDvmFNl0clV7ecRnZyq8cZUCsWUsagSrgR2M8Upb2YxCQUFbEMCP0ZgYfg
+IZI+O7h9QJxo8P9qnkw=
+=qJ8Q
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild
deleted file mode 100644 (file)
index e34c12c..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2013 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.0-r2.ebuild,v 1.6 2013/12/22 12:03:58 ago 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="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl 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/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}"
-
-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
-
-       # 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
-
-       # Enable support for writing debug info to a log file.
-       echo "CONFIG_DEBUG_FILE=y" >> .config
-
-       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
-       elif use gnutls ; then
-               echo "CONFIG_TLS=gnutls"     >> .config
-               echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-       else
-               echo "CONFIG_TLS=internal"   >> .config
-       fi
-
-       if use smartcard ; then
-               echo "CONFIG_SMARTCARD=y"    >> .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 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
-               echo "CONFIG_WPS2=y" >> .config
-               # USB Flash Drive
-               echo "CONFIG_WPS_UFD=y" >> .config
-               # External Registrar
-               echo "CONFIG_WPS_ER=y" >> .config
-               # Universal Plug'n'Play
-               echo "CONFIG_WPS_UPNP=y" >> .config
-               # Near Field Communication
-               echo "CONFIG_WPS_NFC=y" >> .config
-       fi
-
-       # Wi-Fi Direct (WiDi)
-       if use p2p ; then
-               echo "CONFIG_P2P=y" >> .config
-       fi
-
-       # Access Point Mode
-       if use ap ; then
-               echo "CONFIG_AP=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 V=1
-
-       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() {
-       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
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.2-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.2-r1.ebuild
deleted file mode 100644 (file)
index 9d7ad58..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2015 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.2-r1.ebuild,v 1.7 2015/04/19 07:00:52 pacho 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="~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
-
-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
-       )
-       readline? (
-               sys-libs/ncurses
-               sys-libs/readline
-       )
-       ssl? ( dev-libs/openssl )
-       !ssl? ( gnutls? ( net-libs/gnutls ) )
-       !ssl? ( !gnutls? ( dev-libs/libtommath ) )
-"
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-networkmanager )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-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
-
-       # Basic setup
-       echo "CONFIG_CTRL_IFACE=y" >> .config
-       echo "CONFIG_BACKEND=file" >> .config
-       echo "CONFIG_IBSS_RSN=y"   >> .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_EAP_EXE=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
-
-       # Enabling background scanning.
-       echo "CONFIG_BGSCAN_SIMPLE=y"   >> .config
-       echo "CONFIG_BGSCAN_LEARN=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
-
-       # Enable support for writing debug info to a log file.
-       echo "CONFIG_DEBUG_FILE=y" >> .config
-
-       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
-       elif use gnutls ; then
-               echo "CONFIG_TLS=gnutls"     >> .config
-               echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-       else
-               echo "CONFIG_TLS=internal"   >> .config
-       fi
-
-       if use smartcard ; then
-               echo "CONFIG_SMARTCARD=y"    >> .config
-       fi
-
-       if use kernel_linux ; then
-               # Linux specific drivers
-               echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-               echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-               echo "CONFIG_DRIVER_IPW=y"         >> .config
-               echo "CONFIG_DRIVER_NL80211=y"     >> .config
-               echo "CONFIG_DRIVER_RALINK=y"      >> .config
-               echo "CONFIG_DRIVER_WEXT=y"        >> .config
-               echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-               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
-               echo "CONFIG_WPS2=y" >> .config
-               # USB Flash Drive
-               echo "CONFIG_WPS_UFD=y" >> .config
-               # External Registrar
-               echo "CONFIG_WPS_ER=y" >> .config
-               # Universal Plug'n'Play
-               echo "CONFIG_WPS_UPNP=y" >> .config
-               # Near Field Communication
-               echo "CONFIG_WPS_NFC=y" >> .config
-       fi
-
-       # Wi-Fi Direct (WiDi)
-       if use p2p ; then
-               echo "CONFIG_P2P=y" >> .config
-       fi
-
-       # Access Point Mode
-       if use ap ; then
-               echo "CONFIG_AP=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 V=1
-
-       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
-               popd > /dev/null
-       fi
-
-       # systemd stuff
-       systemd_dounit "${FILESDIR}"/wpa_supplicant.service
-       systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.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
-}