From 116a02142c3ac85a60c3779986c4b468ccb9b757 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Wed, 1 Apr 2009 01:17:34 +0200
Subject: [PATCH] A bit of polishing also for wireless-tools-30_pre8.

---
 net-wireless/wireless-tools/Manifest                      |  2 +-
 net-wireless/wireless-tools/wireless-tools-30_pre8.ebuild | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index 6de8159..04adcbe 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,5 +1,5 @@
 AUX wireless-tools-30_pre8-asneeded.patch 506 RMD160 9dd1b9f56381deac0d458ac8b2804107e11438d9 SHA1 9e98892d9abbc389d6f7d666bbe050061a2b0208 SHA256 08459abd456a682d805aec8a2992b1bfbacb8d1bb8813904fa2b513ed5db45b5
 AUX wireless-tools-30_pre8-no-stripping.patch 437 RMD160 b0aa3f85c605834aac30e845c030ba460668576a SHA1 5d65ee65b28fb633abe6369b5e9c81ddbc2a92dd SHA256 3091b3513ef623bd6afb3f2c5e0d0b4565b78854b99f3e50ae711e7e1b5dd616
 DIST wireless_tools.30.pre8.tar.gz 334329 RMD160 a149823c5a2c3bdcd42ab5d040e72a1c6c90662c SHA1 d509f7cf96d83274902a32b3a162775d9023524c SHA256 ec5c82b82a47d0a7d46558f2efac82093fee9cf04184c08b20d0020818a3e0f0
-EBUILD wireless-tools-30_pre8.ebuild 2133 RMD160 2cdb0438ebc3ecb727c3828f2093b7d17327cea2 SHA1 ca30ca520352927341aad510048163989018ca10 SHA256 0e2ce6017060e584193d5ecf46ea4265b619e889b8bf2446191196f850a9aa61
+EBUILD wireless-tools-30_pre8.ebuild 2055 RMD160 d27e68c5618b081036c1ba5f2c0f0da6adf8ca89 SHA1 170ea8af27a02e2eebc5b4504028ff255ab11d52 SHA256 8409aebf369d8dec74c18df943b29aa7fa40c9c430c6ddb3547900b9a318db5f
 MISC metadata.xml 511 RMD160 22e85f7e056bea5375cd444cec7f380df6eb9492 SHA1 e31cdcd0a3025cf4d043c3ebc3858ba9fecf1a0b SHA256 972462d300cc0121913daff0a7b50066305307b6e6765bcd3ada3d5d90f1ba5d
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre8.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre8.ebuild
index 69ea998..73919b2 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre8.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre8.ebuild
@@ -30,10 +30,11 @@ src_prepare() {
 		-e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
 		-e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \
 		-e "s:^\(RANLIB\) = ranlib:\1 = $(tc-getRANLIB):" \
-		-e "s:^\(CFLAGS=-Os\):#\1:" \
-		-e "s:\(@\$(LDCONFIG).*\):#\1:" \
-		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man:\1/share/man:" \
-		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib:\1/$(get_libdir)/:" \
+		-e "s:^\(CFLAGS\)=-Os:\1 +=:" \
+		-e "/@\$(LDCONFIG)/d" \
+		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib:\1/$(get_libdir):" \
+		-e "s:^\(INSTALL_INC= \$(PREFIX)\)/include:\1/usr/include:" \
+		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man:\1/usr/share/man:" \
 		-e "s:^\(BUILD_STATIC = y\):#\1:" \
 		"${S}"/Makefile || die
 }
@@ -47,14 +48,12 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${D}" INSTALL_INC="${D}"/usr/include INSTALL_MAN="${D}"/usr/share/man install \
-		|| die "emake install failed"
+	emake PREFIX="${D}" install || die "emake install failed"
 
 	if use multicall; then
 		# 'make install-iwmulticall' will overwrite some of the tools
 		# with symlinks - this is intentional (brix)
-		emake PREFIX="${D}" INSTALL_INC="${D}"/usr/include INSTALL_MAN="${D}"/usr/share/man install-iwmulticall \
-			|| die "emake install-iwmulticall failed"
+		emake PREFIX="${D}" install-iwmulticall || die "emake install-iwmulticall failed"
 	fi
 
 	has cs ${LINGUAS} || rm -rf "${D}"/usr/share/man/cs
-- 
2.11.4.GIT