Install to /sbin instead of /usr/sbin, bug #96654.

(Portage version: 2.0.51.22-r1)

6 files changed, 150 insertions, 7 deletions

diff --git a/net-wireless/wireless-tools/ChangeLog b/net-wireless/wireless-tools/ChangeLog
index fb295d05e712..ff1b9a6a5140 100644
--- a/net-wireless/wireless-tools/ChangeLog
+++ b/net-wireless/wireless-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wireless-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.72 2005/07/11 07:58:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.73 2005/07/13 18:15:56 brix Exp $
+
+*wireless-tools-28_pre8-r1 (13 Jul 2005)
+*wireless-tools-27-r1 (13 Jul 2005)
+
+  13 Jul 2005; <brix@gentoo.org> +wireless-tools-27-r1.ebuild,
+  +wireless-tools-28_pre8-r1.ebuild:
+  Install to /sbin instead of /usr/sbin, bug #96654.
 
   11 Jul 2005; <brix@gentoo.org> -wireless-tools-24.ebuild,
   -wireless-tools-25-r1.ebuild, -wireless-tools-26-r1.ebuild:
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index a5a739b3e2ae..a4dcbb66201b 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,6 +1,4 @@
-MD5 967b50b4839302d62236dd053634b615 wireless-tools-28_pre8.ebuild 2325
-MD5 dee0ef88ff300fa1b482fa8cccb59562 ChangeLog 12714
-MD5 8eaa14250741a062340b6847d18a84ee wireless-tools-27.ebuild 1377
-MD5 94bf9d66b7e4eda59bc656623b8fbec8 metadata.xml 559
-MD5 7c44525122efc01a49db2723c5f0d5c6 files/digest-wireless-tools-27 69
-MD5 cb933019a030518be5e16a58d45f6145 files/digest-wireless-tools-28_pre8 74
+MD5 084be54ba91a1588cf33e28160a4cd21 wireless-tools-28_pre8-r1.ebuild 2325
+MD5 02d055ebdfa4c90c50f71df9335a9602 wireless-tools-27-r1.ebuild 1395
+MD5 7c44525122efc01a49db2723c5f0d5c6 files/digest-wireless-tools-27-r1 69
+MD5 cb933019a030518be5e16a58d45f6145 files/digest-wireless-tools-28_pre8-r1 74
diff --git a/net-wireless/wireless-tools/files/digest-wireless-tools-27-r1 b/net-wireless/wireless-tools/files/digest-wireless-tools-27-r1
new file mode 100644
index 000000000000..4470eda93b27
--- /dev/null
+++ b/net-wireless/wireless-tools/files/digest-wireless-tools-27-r1
@@ -0,0 +1 @@
+MD5 29891b66f23565e7e381d28404abb29a wireless_tools.27.tar.gz 187790
diff --git a/net-wireless/wireless-tools/files/digest-wireless-tools-28_pre8-r1 b/net-wireless/wireless-tools/files/digest-wireless-tools-28_pre8-r1
new file mode 100644
index 000000000000..e06d02edd323
--- /dev/null
+++ b/net-wireless/wireless-tools/files/digest-wireless-tools-28_pre8-r1
@@ -0,0 +1 @@
+MD5 ea32365b13618242d307d7846f958b4c wireless_tools.28.pre8.tar.gz 221531
diff --git a/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild
new file mode 100644
index 000000000000..9ebca8905cbd
--- /dev/null
+++ b/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild,v 1.1 2005/07/13 18:15:56 brix Exp $
+
+# The following works with both pre-releases and releases
+MY_P=${PN/-/_}.${PV/_/.}
+S=${WORKDIR}/${MY_P/\.pre*/}
+
+DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless lan cards."
+SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
+HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="sys-apps/sed"
+RDEPEND="virtual/libc
+		>=sys-apps/baselayout-1.11.13"
+IUSE="nls"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i \
+		-e "s:^CFLAGS=:CFLAGS=${CFLAGS} :" \
+		-e "s:\(@\$(LDCONFIG).*\):#\1:" \
+		${S}/Makefile
+}
+
+src_compile() {
+	emake WARN="" || die "emake failed"
+}
+
+src_install () {
+	emake PREFIX=${D}/ INSTALL_INC=${D}/usr/include INSTALL_MAN=${D}/usr/share/man install \
+		|| die "emake install failed"
+
+	if use nls; then
+		insinto /usr/share/man/fr/man5
+		doins fr/iftab.5
+
+		insinto /usr/share/man/fr/man7
+		doins fr/wireless.7
+
+		insinto /usr/share/man/fr/man8
+		doins fr/{ifrename,iwconfig,iwevent,iwgetid,iwlist,iwpriv,iwspy}.8
+
+		dodoc README.fr
+	fi
+
+	dodoc CHANGELOG.h COPYING INSTALL HOTPLUG.txt PCMCIA.txt README
+}
diff --git a/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild
new file mode 100644
index 000000000000..1fcda482b053
--- /dev/null
+++ b/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild,v 1.1 2005/07/13 18:15:56 brix Exp $
+
+inherit toolchain-funcs multilib
+
+# The following works with both pre-releases and releases
+MY_P=${PN/-/_}.${PV/_/.}
+S=${WORKDIR}/${MY_P/\.pre*/}
+
+DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless LAN cards"
+SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
+HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="sys-apps/sed"
+RDEPEND="virtual/libc
+		>=sys-apps/baselayout-1.11.13"
+IUSE="multicall nls"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i \
+		-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)/:" \
+		${S}/Makefile
+}
+
+src_compile() {
+	if use multicall; then
+		emake || die "emake failed"
+		emake iwmulticall || die "emake iwmulticall failed"
+	else
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	if use multicall; then
+		emake PREFIX=${D}/ INSTALL_INC=${D}/usr/include INSTALL_MAN=${D}/usr/share/man install \
+			|| die "emake install failed"
+		# '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"
+	else
+		emake PREFIX=${D}/ INSTALL_INC=${D}/usr/include INSTALL_MAN=${D}/usr/share/man install \
+			|| die "emake install failed"
+	fi
+
+	if use nls; then
+		insinto /usr/share/man/fr/man5
+		doins fr/iftab.5
+
+		insinto /usr/share/man/fr/man7
+		doins fr/wireless.7
+
+		insinto /usr/share/man/fr/man8
+		doins fr/{ifrename,iwconfig,iwevent,iwgetid,iwlist,iwpriv,iwspy}.8
+
+		dodoc README.fr
+
+		insinto /usr/share/man/cs/man5
+		doins cs/iftab.5
+
+		insinto /usr/share/man/cs/man7
+		doins cs/wireless.7
+
+		insinto /usr/share/man/cs/man8
+		doins cs/{ifrename,iwconfig,iwevent,iwgetid,iwlist,iwpriv,iwspy}.8
+	fi
+
+	dodoc CHANGELOG.h COPYING INSTALL HOTPLUG.txt PCMCIA.txt README
+}