From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R2LxS-0003I1-RP for garchives@archives.gentoo.org; Sat, 10 Sep 2011 11:42:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E40821C0AA; Sat, 10 Sep 2011 11:42:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D636921C0AA for ; Sat, 10 Sep 2011 11:42:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CD291B4001 for ; Sat, 10 Sep 2011 11:42:42 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id C7D7A2004C; Sat, 10 Sep 2011 11:42:40 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/wpa_supplicant: ChangeLog wpa_supplicant-0.7.3-r5.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog wpa_supplicant-0.7.3-r5.ebuild X-VCS-Directories: net-wireless/wpa_supplicant X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20110910114240.C7D7A2004C@flycatcher.gentoo.org> Date: Sat, 10 Sep 2011 11:42:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a24b285209f002b09254f64f2c3ca541 scarabeus 11/09/10 11:42:40 Modified: ChangeLog wpa_supplicant-0.7.3-r5.ebuild Log: Update to eapi4. Fix bug #382159. =20 (Portage version: 2.2.0_alpha54/cvs/Linux x86_64) Revision Changes Path 1.166 net-wireless/wpa_supplicant/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_s= upplicant/ChangeLog?rev=3D1.166&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_s= upplicant/ChangeLog?rev=3D1.166&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_s= upplicant/ChangeLog?r1=3D1.165&r2=3D1.166 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- ChangeLog 9 Sep 2011 09:42:19 -0000 1.165 +++ ChangeLog 10 Sep 2011 11:42:40 -0000 1.166 @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog= ,v 1.165 2011/09/09 09:42:19 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog= ,v 1.166 2011/09/10 11:42:40 scarabeus Exp $ + + 10 Sep 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal + wpa_supplicant-0.7.3-r5.ebuild: + Update to eapi4. Fix bug #382159. =20 09 Sep 2011; wpa_supplicant-0.7.3-r5.ebuild: Adding support for libnl 2.0 and above, fixing bug #382159 1.6 net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.= ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_s= upplicant/wpa_supplicant-0.7.3-r5.ebuild?rev=3D1.6&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_s= upplicant/wpa_supplicant-0.7.3-r5.ebuild?rev=3D1.6&content-type=3Dtext/pl= ain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_s= upplicant/wpa_supplicant-0.7.3-r5.ebuild?r1=3D1.5&r2=3D1.6 Index: wpa_supplicant-0.7.3-r5.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplic= ant-0.7.3-r5.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wpa_supplicant-0.7.3-r5.ebuild 9 Sep 2011 09:42:19 -0000 1.5 +++ wpa_supplicant-0.7.3-r5.ebuild 10 Sep 2011 11:42:40 -0000 1.6 @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_suppl= icant-0.7.3-r5.ebuild,v 1.5 2011/09/09 09:42:19 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_suppl= icant-0.7.3-r5.ebuild,v 1.6 2011/09/10 11:42:40 scarabeus Exp $ =20 -EAPI=3D"2" +EAPI=3D4 =20 inherit eutils toolchain-funcs qt4-r2 systemd multilib =20 @@ -18,16 +18,23 @@ RDEPEND=3D"dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) - madwifi? ( || - ( >net-wireless/madwifi-ng-tools-0.9.3 - net-wireless/madwifi-old ) + madwifi? ( + || ( + >net-wireless/madwifi-ng-tools-0.9.3 + net-wireless/madwifi-old + ) ) dev-libs/libnl ) !kernel_linux? ( net-libs/libpcap ) - qt4? ( x11-libs/qt-gui:4 - x11-libs/qt-svg:4 ) - readline? ( sys-libs/ncurses sys-libs/readline ) + 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 ) )" @@ -184,44 +191,46 @@ # Enable mitigation against certain attacks against TKIP echo "CONFIG_DELAYED_MIC_ERROR_REPORT=3Dy" >> .config =20 - if use qt4 ; then - cd "${S}"/wpa_gui-qt4 - eqmake4 wpa_gui.pro - fi - # If we are using libnl 2.0 and above, enable support for it # Bug 382159 if has_version ">=3Ddev-libs/libnl-2.0"; then echo "CONFIG_LIBNL20=3Dy" >> .config fi + + if use qt4 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null + eqmake4 wpa_gui.pro + popd > /dev/null + fi } =20 src_compile() { einfo "Building wpa_supplicant" - emake || die "emake failed" + emake =20 if use wimax; then - emake -C ../src/eap_peer clean || die "emake failed" - emake -C ../src/eap_peer || die "emake failed" + emake -C ../src/eap_peer clean + emake -C ../src/eap_peer fi =20 if use qt4 ; then - cd "${S}"/wpa_gui-qt4 + pushd "${S}"/wpa_gui-qt4 > /dev/null einfo "Building wpa_gui" - emake || die "wpa_gui compilation failed" + emake + popd > /dev/null fi } =20 src_install() { - dosbin wpa_supplicant || die - dobin wpa_cli wpa_passphrase || die + dosbin wpa_supplicant + dobin wpa_cli wpa_passphrase =20 # baselayout-1 compat if has_version "=3Dsys-apps/openrc-0.5.0"; then @@ -233,33 +242,32 @@ newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh =20 dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ - wpa_supplicant.conf || die "dodoc failed" + wpa_supplicant.conf =20 - doman doc/docbook/*.{5,8} || die "doman failed" + doman doc/docbook/*.{5,8} =20 if use qt4 ; then into /usr - dobin wpa_gui-qt4/wpa_gui || die - doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found" + dobin wpa_gui-qt4/wpa_gui + doicon wpa_gui-qt4/icons/wpa_gui.svg make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gu= i" "Qt;Network;" fi =20 - if use wimax; then - emake DESTDIR=3D"${D}" -C ../src/eap_peer install || die - fi + use wimax && emake DESTDIR=3D"${D}" -C ../src/eap_peer install =20 if use dbus ; then - cd "${S}"/dbus + pushd "${S}"/dbus > /dev/null insinto /etc/dbus-1/system.d - newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die + 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.se= rvice || die + doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.se= rvice keepdir /var/run/wpa_supplicant + popd > /dev/null fi =20 # systemd stuff systemd_dounit "${FILESDIR}"/wpa_supplicant.service - systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant= @.service' || die + systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant= @.service' } =20 pkg_postinst() {