diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2013-01-26 00:14:12 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2013-01-26 00:14:12 +0000 |
| commit | 11a5fbef8646af7647111f13495d36994f342c91 (patch) | |
| tree | 6c6c7bae8dfe1c728fb403002686e20974b06003 /net-wireless/wireless-tools | |
| parent | added ~arm tested by me (diff) | |
| download | gentoo-2-11a5fbef8646af7647111f13495d36994f342c91.tar.gz gentoo-2-11a5fbef8646af7647111f13495d36994f342c91.tar.bz2 gentoo-2-11a5fbef8646af7647111f13495d36994f342c91.zip | |
bump eapi and minor cleanup for prefix support
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'net-wireless/wireless-tools')
| -rw-r--r-- | net-wireless/wireless-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild | 18 |
2 files changed, 12 insertions, 11 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/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 |