Update to eapi4. Fix bug #382159.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

3 files changed, 61 insertions, 39 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 3962d566423d..00f780e7f9c2 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -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áš Chvátal <scarabeus@gentoo.org>
+  wpa_supplicant-0.7.3-r5.ebuild:
+  Update to eapi4. Fix bug #382159.
 
   09 Sep 2011; <gurligebis@gentoo.org> wpa_supplicant-0.7.3-r5.ebuild:
   Adding support for libnl 2.0 and above, fixing bug #382159
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index c870d627d17b..3ffcebce8981 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -14,13 +14,23 @@ AUX wpa_supplicant.service 264 RMD160 d8110d5d02067448c469723bddfd07f6041c5696 S
 AUX wpa_supplicant_at.service 314 RMD160 21fcd8438d384988c46da9b2c31759500f424e21 SHA1 efbfac91721f1ff71c86b0ffc554cc63366363d1 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c
 DIST wpa_supplicant-0.7.3.tar.gz 1638224 RMD160 e22f0440d64c943e4b0886eefa3418e75ea01b60 SHA1 ca51db8931fabf386352c87422f3e62fb44c3fe3 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443
 EBUILD wpa_supplicant-0.7.3-r2.ebuild 7799 RMD160 a1b42170b2758c06de3aa380616a172f9c4cfc03 SHA1 24806cfe93e29ca9cc51f787f268b4074ff4e19b SHA256 00726312f6c7f4bf71a10f981eef8c2088f53343d241bd11dacba778dd09c898
-EBUILD wpa_supplicant-0.7.3-r5.ebuild 8824 RMD160 834100dc7c1a8e1e28c7aaf37b66ea87981cbc9f SHA1 65a7f57c40282cb2d6d9b1791b21fe0bcc0a6293 SHA256 0406ea43486311a2b1f7cea9317e866efb621d00e3868798b3ef8579fdb7e200
-MISC ChangeLog 35020 RMD160 b999ed0225ebcb6d31b55cc1e9bc5277f2ab93da SHA1 ecf7017a16186dfbcd9537022165e09b9061992a SHA256 fb45453d6cc600b49de3a1d56bcc969769ba9a8bcb4812790742c5a306213bdc
+EBUILD wpa_supplicant-0.7.3-r5.ebuild 8694 RMD160 893685a94df9b1cfc3c4e36bfa86db4a6d7706f2 SHA1 0fd8b036fe12e2debff2350f6d556e9a1d5b8d77 SHA256 3fcdef83edca6337276531186b5183fb9ffd29b5f15df889781cb9f457808348
+MISC ChangeLog 35145 RMD160 c2f704bc6b50dfda64d379b2be12edc49347366e SHA1 b861fcc525df1fd188db089be23fe3ff9321f257 SHA256 a34939eb4469c0582bd34b95ec61dfaf85f9fc4f3a35c51b97a8abfcee04f642
 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5p34YACgkQsR7PQhRXYEmmHQCdFvPiyzTfUhDJ1TfnTMPMAsBE
-kQkAn1qb5oaAr9SRfC3AYGzv5CUE+gJh
-=6GnE
+iQIcBAEBAgAGBQJOa009AAoJEOSiRoyO7jvodQ0QAJ9GrBpQX6VQvUCLW3IP3r24
+PIMVSZb6TsQFoQD0e6uJjm4p24LoIeTvra6weceGQkG8myOrqqiWm1i4whAONjN/
+zji6F6EazAsloiDxTkCe4q0/89XGVYQBmuAnldjIokXJ6ItLSnR1x0ctfYwLcuGU
+0EbL2P2h0tmw8yLTNaygi51/UfrUcjpEc5ONQStdK3Z5poqX5ZKkYsoJ+L0glqfM
+lGCZOzrBREMv9IQ8eEcCygyU0JUXqzEuvLCeojgPNgDBxzR2Ji+l9dBkMbRbpt4s
+ruo/onQtKSvHdWdgQoGcfC9XmtGdjwsM01ukhWO1IJ9bSIQJkmgSxXepeJUL5LX+
+0AA5GkEUapJCXKhpC4i49mgAmmcsD/9f0LPVzzqfPWjfLLU+lMJWetIcn6Sh2dDz
+d+cJ72GWpug7/i3ujleGoUYd0gPNmLaTgQi7qPSu+OYKjrg92V8YWX0pQcMsRht6
+Rq3433Mc1xgpnJg96ImssmEndwzoFKSu5C7RPvsxO0lp5l0Hd6ceYV0nISYBhbwx
+d9HW/lBqkCd8OFvwBaoyagxp2MVxnIwwxW4ShNYtoysU9pdiuutUZmfZq/adD0N7
+7K36KpoF4pQRiIQdG9BJ4lljqgT2cWGpvlHH4Q0/qP3XHVuAit6t11fBQsZH2WGf
+7K44V4snObHWUohfqpAg
+=HuDf
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
index 799ef291963b..bc2511d3ef1e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
@@ -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_supplicant-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_supplicant-0.7.3-r5.ebuild,v 1.6 2011/09/10 11:42:40 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs qt4-r2 systemd multilib
 
@@ -18,16 +18,23 @@ IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wimax wps k
 RDEPEND="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 @@ src_configure() {
 	# Enable mitigation against certain attacks against TKIP
 	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
 
-	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 ">=dev-libs/libnl-2.0"; then
 		echo "CONFIG_LIBNL20=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 || die "emake failed"
+	emake
 
 	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
 
 	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
 }
 
 src_install() {
-	dosbin wpa_supplicant || die
-	dobin wpa_cli wpa_passphrase || die
+	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 || die
+		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
 		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
+		dosym /usr/bin/wpa_cli /bin/wpa_cli
 	fi
 
 	if has_version ">=sys-apps/openrc-0.5.0"; then
@@ -233,33 +242,32 @@ src_install() {
 	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
 
 	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf || die "dodoc failed"
+		wpa_supplicant.conf
 
-	doman doc/docbook/*.{5,8} || die "doman failed"
+	doman doc/docbook/*.{5,8}
 
 	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_gui" "Qt;Network;"
 	fi
 
-	if use wimax; then
-		emake DESTDIR="${D}" -C ../src/eap_peer install || die
-	fi
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
 
 	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.service || die
+		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' || die
+	systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service'
 }
 
 pkg_postinst() {