bump eapi and minor cleanup for prefix support

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 27 insertions, 26 deletions

diff --git a/net-wireless/wireless-tools/ChangeLog b/net-wireless/wireless-tools/ChangeLog
index 06f046f8528f..5984429f047a 100644
--- a/net-wireless/wireless-tools/ChangeLog
+++ b/net-wireless/wireless-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/wireless-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.154 2013/01/26 00:09:50 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.155 2013/01/26 00:14:12 zerochaos Exp $
+
+  26 Jan 2013; Rick Farina <zerochaos@gentoo.org> wireless-tools-30_pre9.ebuild:
+  bump eapi and minor cleanup for prefix support
 
   26 Jan 2013; Rick Farina <zerochaos@gentoo.org>
   -files/wireless-tools-29-inline-fix.patch, -wireless-tools-29-r1.ebuild,
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index da1e680a92ff..04af75252a8f 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -3,23 +3,23 @@ Hash: SHA512
 
 AUX wireless-tools-29-asneeded.patch 478 SHA256 41ab166672833cc030a292160b4e0d13b86fe12b6dbe79f7e8537ae76d402c56 SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d WHIRLPOOL ced9ee613b49d7fdc37b6370152ecfa83e07502dcf0cc9957bee76fceb1ad0ebf9f51a9e979ab1528dc0beea2768a5164de1ca02a0bea8b4ef18364fb861925c
 DIST wireless_tools.30.pre9.tar.gz 348477 SHA256 abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1 WHIRLPOOL e4c1d0d2484b6336ece81019e6cc035103da22c82bab0473401af5c9c75d5a55af7e0eef5fbcbc0700077e09a92f21555862a706bce56b37a235b687775bcf5a
-EBUILD wireless-tools-30_pre9.ebuild 2043 SHA256 a190f80a72e6f2cc345c7f7145981e2dcbdda77aa0b5560871ba143564d07c05 SHA512 4fa1979b0f5c270411526f8bd2111d697fd8990ad5fb31e1e2b6b8c6b597c62718232dc66b448fadfbed7d587014c6b65438e1253d6a02bae3ecdd74ad57cda3 WHIRLPOOL 11596ce3813a21d1c23e76004ff5725ad6e31353722bcab520863fd483ec1195f860278edd45e8cf79bb6249e8f127b58c01359ebf96f9932c01d546dd2c8a6d
-MISC ChangeLog 24179 SHA256 c0d0f25240747e5d532aefc8dd15aad69675c0190c34692e16b0e091d2560f4f SHA512 60fe76fb48870adc2e0200251f04325293f9f0e35a73aee968f36f6cd36aa5ed4fef32942183899ca14852040f7d018ecc1227acbd9975b68d005bef18264774 WHIRLPOOL 90560922f38419eebea709bd0d9d0e4cd1177f4b727fe200d9e2dc96b12a60b018a89a624902a15188eab14bf37de4c833c1e81d9a0a10b05bb13418fdfea6e1
+EBUILD wireless-tools-30_pre9.ebuild 1910 SHA256 8bafdf00010ad95b00bf6cba2b0c9cc5aff97008a1933579374c097b7421e84b SHA512 ea83453f2bb2e7389a03c217bc8d9bb3dc19e2a9eec95d6b11c909dbef5b46f8229674967570e530f8ffb40c9f03ed5740aafae636b1a18e7613c9af4dbd3d50 WHIRLPOOL ac6409a0648127999c48e2c77e82a4d5268bc9bb2caae078d4c58cd331e81c4db2ebd297ff85158e048a75799448ceee3d4f3596ff22084009926d5e5830da52
+MISC ChangeLog 24310 SHA256 f319b19a9fa3b37c09340a41e537ee4a69902023da90d4e6054b4e750fee872e SHA512 81ff933213aeb668560fe8f384019004e5db255ba74317bdcd4c0cdefae13689b3004fa96c00ab9308c5c340e9aae2cb5e7690f8b0cea840e1b5d8a0abc84e04 WHIRLPOOL 630999e9f1afbe17c413e83656eea6e2b739afa9e3d8788fff021102a4768775d8bb8af267ccfc2962cf3e0052da8ebf52a55af29c2169c37ce8020d83cd1f48
 MISC metadata.xml 584 SHA256 a99cede090f6f4b89598d46acfa4a25af6d31b0c00f3dd825357cb414f225b70 SHA512 fc1fab4f651a0124cac2d67c66a3ee4d36b19a5556559254ee55a9cde73c431028000c8d75b39184cb5694c3908baaf087c46aff8b64dfb24d1b6db3b878151b WHIRLPOOL 0495c521815e5218af216541c037530b91d6d48c8e728cfc50d24705cf835c6f87f3597cd83b6e69c76fae6f0e83e29ec8a595e7d6e3c1ae415c54bd19527ac8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRAx8vAAoJEKXdFCfdEflKIKsP/i3CItdQ/wu+kIwMgHxPZaxz
-xM9Zt+wSKedIEtbgUaBoAKYCB+aBvw9/I1Ptvutg4sTiRiNLzH+Tni8AvgGHisqo
-hEgOXZWZcWO8FQDT0R2+fqeVKD7bfrJXO9YoEPL3YcSKwJZsTgfDNvP6DO7lwxjH
-3RYfhuSEpVssYG673ago9QuJ5lCS/JV9hdeugNx3wf7wb9hNRrKM1ckPL5+kQOiu
-2nS6qnuLFnVEn5VZqCag0VWBiXBpo7vSmx12RbahaCGLsTxMZ62amSlTyu7/ZpQx
-XLQQ6KUV8kllfaQLw42TqpXbUPY6x4WpGngkTcz5YkHwmFqcEq4TY0jhYJ5xYq2q
-P3h/ci8+gxR8jRa8VOdYlnJVSdhioo3OsvGAP9oTTEP0kYzIe7I+kf4y1ec01NeP
-lBMk8SVRd9UN2kHi0hwfOrvZ3wvbvFfUCCKjHF990CE4D3p+osHy23Cvgc2wmYBu
-3HH1crNvusKvPmjvxaCQfhDy0oRHn0/+WCNHOAFbu48g5ZSPKyRy2XqZjlnP0oDW
-IEDn9h3lP1s1yJnK4rrtRxqntAG0ac8rJstMbvSfhSA3izAdOmALdsTgS/pbADzc
-3Y+yuuttEFYivRw1LeZ9nIy2/hwTp6SDY8/ce89o5a3d+COWDNTwmQ+AoEso4/HT
-fv7FvdkoFPtMg630Lmsv
-=Pd0f
+iQIcBAEBCgAGBQJRAyAxAAoJEKXdFCfdEflKW7MP/08YgV4xQVn728rXPgYDEopV
+eBBtTiYlNzVRM77taKjSlcNfLeBmy40Ac1W+GNUi/fbVgvIR5rT5qtkA/LaN/T4U
+mLDV8znRVVHZ5rfI9d6kUYDSQsjQbOn/Q1kS3XzjJc9Lz0FsyMaP8sE6amRaX3Y/
+trSMb15xG2FnYhpSxVAN51wfMimB8Uyj4Tl3yvpSAoDSCBb19O1zOS9GtcojG6yN
+2WfnswD7iX5g9TLTT4pte/FpJsV932seyVRQ/iAhm43NNd2TKQNiU29vpGjw9qZp
+dcDEv5WfdWJYtUtmHdWpiJl8fX7Dd64A9vuV2mu6vbVmMBlCaI/WS2jyxVdwSPEa
+wuazf3F0mFO6noJhXdQWxutCyu/VRZcWwRJmFJAE4tGYPKuyRLKqlIYiSfNUAM1b
+7hw2sMdhJHF/GEy/iVUrviKXO04tfu31SPLlM0LKM/i1Bg80mSalb6lmq0o4QpN5
+f8eWXPzBC14GVTft1/fxzIwnEz9n7juq1p/cAO9qYA9PnNyJjyydhYZOQzinuXgo
+QJh1wVB7bAnIZ0B4FVqTyvsbS4t9NlmkJqaaE8T7SEDPxWArHqCSx9K4tOz4hV6R
+v3SNzCMEeX/w2BwqsKaBZdW2C+n/t3Ck1GvHhpZds7JBmwgF2up0t94KtvPTxkHY
+pWA6kUUNyL3et36vCjkd
+=X/S4
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
index 72dbbf990216..cc858c49d94e 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild,v 1.9 2013/01/05 13:25:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild,v 1.10 2013/01/26 00:14:12 zerochaos Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit toolchain-funcs multilib eutils
 
@@ -40,24 +40,22 @@ src_prepare() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
-	if use multicall; then
-		emake iwmulticall || die "emake iwmulticall failed"
-	fi
+	use multicall && emake iwmulticall
 }
 
 src_install() {
-	emake PREFIX="${D}" install || die "emake install failed"
+	emake PREFIX="${ED}" install
 
 	if use multicall; then
 		# 'make install-iwmulticall' will overwrite some of the tools
 		# with symlinks - this is intentional (brix)
-		emake PREFIX="${D}" install-iwmulticall || die "emake install-iwmulticall failed"
+		emake PREFIX="${ED}" install-iwmulticall
 	fi
 
-	has cs ${LINGUAS} || rm -rf "${D}"/usr/share/man/cs
-	has fr ${LINGUAS} || rm -rf "${D}"/usr/share/man/fr.{ISO8859-1,UTF-8}
+	has cs ${LINGUAS} || rm -rf "${ED}"/usr/share/man/cs
+	has fr ${LINGUAS} || rm -rf "${ED}"/usr/share/man/fr.{ISO8859-1,UTF-8}
 
 	dodoc CHANGELOG.h HOTPLUG-UDEV.txt IFRENAME-VS-XXX.txt PCMCIA.txt README
 	has fr ${LINGUAS} && dodoc README.fr