diff options
| -rw-r--r-- | net-wireless/wpa_supplicant/Manifest | 16 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.8 | 3 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0 | 3 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild) | 45 |
4 files changed, 17 insertions, 50 deletions
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 23cddae..4782d7e 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -6,11 +6,11 @@ AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 MD5 e44e6d1a019f31d680b30211607fbe43 files/wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 files/wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a files/wpa_supplicant.conf 183 -DIST wpa_supplicant-0.6.0.tar.gz 842023 RMD160 17ba4903389a00527de772072dcd8e234d759fe9 SHA1 966dc49c5c2386d58696515ee8b20b1f4f45cd85 SHA256 24ce7873cbf2b23c00f931dd7f20326bea5463dd2a50a865b3d9bffd3f5780b7 -EBUILD wpa_supplicant-0.6.0.ebuild 6052 RMD160 8d73f3f691e4faeb2b2835bd82032a86e68b9521 SHA1 63da37ce80bf5667920f79bfaa83621632c84a47 SHA256 f143033eacdf86651ab2bff2a64e74f44cac2bbd7b5de2f55006e1549082d69d -MD5 be0f61aa7063118f8a72ab314097f9a7 wpa_supplicant-0.6.0.ebuild 6052 -RMD160 8d73f3f691e4faeb2b2835bd82032a86e68b9521 wpa_supplicant-0.6.0.ebuild 6052 -SHA256 f143033eacdf86651ab2bff2a64e74f44cac2bbd7b5de2f55006e1549082d69d wpa_supplicant-0.6.0.ebuild 6052 -MD5 623f22d8d019dd6a82b1914a9d0117e0 files/digest-wpa_supplicant-0.6.0 262 -RMD160 f6087ecdb37a0272251973beb4cd606071853a46 files/digest-wpa_supplicant-0.6.0 262 -SHA256 1d32355d1b7d9383eef2d322c345ff7b8c08279f423d2ff1e50f6a4dd85b8263 files/digest-wpa_supplicant-0.6.0 262 +DIST wpa_supplicant-0.5.8.tar.gz 714467 RMD160 322cd5cba8afffe8343bd8c574e8941fd595dbad SHA1 434545faf4758044629f574d82939511be8deb0b SHA256 2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0 +EBUILD wpa_supplicant-0.5.8.ebuild 5079 RMD160 4636fba59f84bb93e6098104f5956a1dbed9d57e SHA1 1b68204b43900207061614b094729c957444b0fd SHA256 37d88aab3352630c86f2920d7d6a61afa5964e139f798e667db7c2f82f477b29 +MD5 72b602b14535d4e9d0eae5fa5dbfd503 wpa_supplicant-0.5.8.ebuild 5079 +RMD160 4636fba59f84bb93e6098104f5956a1dbed9d57e wpa_supplicant-0.5.8.ebuild 5079 +SHA256 37d88aab3352630c86f2920d7d6a61afa5964e139f798e667db7c2f82f477b29 wpa_supplicant-0.5.8.ebuild 5079 +MD5 ce41071107f25b534a1142fd2a2f2fb1 files/digest-wpa_supplicant-0.5.8 262 +RMD160 9c13f503ef5dd901b07e0ee379c7d40c36322dfc files/digest-wpa_supplicant-0.5.8 262 +SHA256 fbb0b992caa9af953fe3e9bb825616650ef580912c2f4a3dd24e8b5abae8033e files/digest-wpa_supplicant-0.5.8 262 diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.8 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.8 new file mode 100644 index 0000000..3755c1a --- /dev/null +++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.8 @@ -0,0 +1,3 @@ +MD5 7bb22f2bcdeed54b3fb5407d6d8bc9bb wpa_supplicant-0.5.8.tar.gz 714467 +RMD160 322cd5cba8afffe8343bd8c574e8941fd595dbad wpa_supplicant-0.5.8.tar.gz 714467 +SHA256 2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0 wpa_supplicant-0.5.8.tar.gz 714467 diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0 deleted file mode 100644 index 55d395c..0000000 --- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 635c7af7cecb39954997146b5c734b1c wpa_supplicant-0.6.0.tar.gz 842023 -RMD160 17ba4903389a00527de772072dcd8e234d759fe9 wpa_supplicant-0.6.0.tar.gz 842023 -SHA256 24ce7873cbf2b23c00f931dd7f20326bea5463dd2a50a865b3d9bffd3f5780b7 wpa_supplicant-0.6.0.tar.gz 842023 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild index 504c5e1..e87109d 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild @@ -11,36 +11,19 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD" +IUSE="dbus gnutls gsm madwifi qt3 readline ssl kernel_linux" RDEPEND="dbus? ( sys-apps/dbus ) kernel_linux? ( gsm? ( sys-apps/pcsc-lite ) - madwifi? ( net-wireless/madwifi-ng-tools-0.9.3.1 madwifi-ng-svn ) + madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 madwifi-ng-svn ) ) !kernel_linux? ( net-libs/libpcap ) - qt4? ( =x11-libs/qt-4* ) - !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) !ssl? ( !gnutls? ( dev-libs/libtommath ) )" -S="${WORKDIR}/${P}/${PN}" - -pkg_setup() { - if use qt3 && use qt4; then - einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" - fi - - if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then - if ! built_with_use x11-libs/qt qt3support ; then - eerror ">=qt4.2.2 requires qt3support" - die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag" - fi - fi -} - src_unpack() { unpack ${A} cd "${S}" @@ -48,7 +31,7 @@ src_unpack() { # 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 + l2_packet_freebsd.c || die # toolchain setup echo "CC = $(tc-getCC)" > .config @@ -105,11 +88,8 @@ src_unpack() { 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_PRISM54=y" >> .config echo "CONFIG_DRIVER_WEXT=y" >> .config echo "CONFIG_DRIVER_WIRED=y" >> .config @@ -119,9 +99,6 @@ src_unpack() { echo "CFLAGS += -I/usr/include/madwifi" >> .config echo "CONFIG_DRIVER_MADWIFI=y" >> .config fi - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - echo "CONFIG_DRIVER_BSD=y" >> .config fi # people seem to take the example configuration file too literally @@ -142,11 +119,7 @@ src_unpack() { src_compile() { emake || die "emake failed" - if use qt4 ; then - qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro - cd "${S}"/wpa_gui-qt4 - emake || die "emake wpa_gui-qt4 failed" - elif use qt3 ; then + if use qt3 ; then [[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings "${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro cd "${S}"/wpa_gui @@ -164,21 +137,15 @@ src_install() { insinto /etc/wpa_supplicant/ newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf - dodoc ChangeLog ../COPYING eap_testing.txt README todo.txt + dodoc ChangeLog COPYING eap_testing.txt README todo.txt newdoc wpa_supplicant.conf wpa_supplicant.conf doman doc/docbook/*.8 doman doc/docbook/*.5 - if use qt4 ; then - into /usr - dobin wpa_gui-qt4/wpa_gui - elif use qt3 ; then + if use qt3 ; then into /usr dobin wpa_gui/wpa_gui - fi - - if use qt3 || use qt4; then make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI" fi |