version bump for 2005 and small format string fixes

7 files changed, 26 insertions, 61 deletions

diff --git a/net-wireless/madwifi-tools/ChangeLog b/net-wireless/madwifi-tools/ChangeLog
index 39fd44d59233..7854781a6933 100644
--- a/net-wireless/madwifi-tools/ChangeLog
+++ b/net-wireless/madwifi-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/madwifi-tools
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.2 2004/10/19 18:57:53 solar Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.3 2005/01/06 21:26:50 solar Exp $
+
+*madwifi-tools-0.1_pre20050106 (06 Jan 2005)
+
+  06 Jan 2005; <solar@gentoo.org> -madwifi-tools-0.1_pre20040906.ebuild,
+  -madwifi-tools-0.1_pre20041019.ebuild,
+  +madwifi-tools-0.1_pre20050106.ebuild:
+  version bump for 2005 and small format string fixes
 
 *madwifi-tools-0.1_pre20041019 (19 Oct 2004)
 
diff --git a/net-wireless/madwifi-tools/Manifest b/net-wireless/madwifi-tools/Manifest
index af9213654f1e..5f4ba4ddc65a 100644
--- a/net-wireless/madwifi-tools/Manifest
+++ b/net-wireless/madwifi-tools/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d950a35a529031e133c489c684aab66a madwifi-tools-0.1_pre20041019.ebuild 926
-MD5 6224de0a319cc0c4eda7eb351fcc4207 ChangeLog 612
+MD5 0022f3aa45dde5a01c5e94ce77b06f5d madwifi-tools-0.1_pre20050106.ebuild 1154
+MD5 5f7cdebebd3bed10bdaf59877900aca3 ChangeLog 868
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 d84bc9328fc2620be10c376a4a975bfd madwifi-tools-0.1_pre20040906.ebuild 914
-MD5 c0dc98f4f789207022aa239ba4421b5f files/digest-madwifi-tools-0.1_pre20040906 84
-MD5 87299a7ead5bf030018e9fa58f2cdf86 files/digest-madwifi-tools-0.1_pre20041019 84
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBdWNj94CCfB4KcwwRAm4/AKCvHPiLqovS1Ls1nymd2Kpitl8yLwCdGglu
-hxZx4m7/z0p856hs92V1rjg=
-=Za4c
------END PGP SIGNATURE-----
+MD5 07d3f62f481b9725f606d77cd023edd5 files/digest-madwifi-tools-0.1_pre20050106 84
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20040906 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20040906
deleted file mode 100644
index 42f6d66d82a7..000000000000
--- a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20040906
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20041019 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20041019
deleted file mode 100644
index f63882921003..000000000000
--- a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20041019
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050106 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050106
new file mode 100644
index 000000000000..0dff41f1aae5
--- /dev/null
+++ b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050106
@@ -0,0 +1 @@
+MD5 ecefaf41bbe0c4045c15e9e63a9ce3cf madwifi-driver-0.1_pre20050106.tar.bz2 1639445
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20041019.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20041019.ebuild
deleted file mode 100644
index 5456fcd8650c..000000000000
--- a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20041019.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20041019.ebuild,v 1.1 2004/10/19 18:57:53 solar Exp $
-
-# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co madwifi
-
-DESCRIPTION="Wireless tools for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-
-SRC_URI="mirror://gentoo/${P/tools/driver}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="virtual/libc"
-
-S=${WORKDIR}
-
-
-src_compile() {
-	einfo "building tools..."
-	cd ${S}/tools || die "failed to chdir to ${S}/tools"
-	make clean || :
-	emake LDFLAGS="${CFLAGS} ${LDFLAGS}" || die "failed to build the driver tools"
-}
-
-src_install() {
-	dodoc README COPYRIGHT
-	cd ${S}/tools
-	insinto /usr
-	for bin in 80211stats ath{chans,ctrl,key,stats}; do
-		[ -e ${bin} ] && dobin ${bin}
-	done
-}
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20040906.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild
index 0a210c5bdc07..b4ba5d8a5b42 100644
--- a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20040906.ebuild
+++ b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20040906.ebuild,v 1.1 2004/09/06 19:28:42 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild,v 1.1 2005/01/06 21:26:50 solar Exp $
 
 # cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co madwifi
 
@@ -12,18 +12,25 @@ SRC_URI="mirror://gentoo/${P/tools/driver}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
-DEPEND=""
-
+DEPEND="virtual/libc sys-apps/sed"
+RDEPEND=""
 S=${WORKDIR}
 
+pkg_setup() {
+	use x86 && TARGET=i386-elf
+	use amd64 && TARGET=x86_64-elf
+	export TARGET
+	sed -i -e 's/err(1, ifr.ifr_name);/err(1, "%s", ifr.ifr_name);'/g tools/athstats.c
+}
 
 src_compile() {
 	einfo "building tools..."
 	cd ${S}/tools || die "failed to chdir to ${S}/tools"
 	make clean || :
-	emake LDFLAGS="${CFLAGS} ${LDFLAGS}" || die "failed to build the driver tools"
+	emake TARGET="${TARGET}" LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+		|| die "failed to build the driver tools"
 }
 
 src_install() {