CC/CXX fix as per bug #69280. Version bump too

5 files changed, 72 insertions, 8 deletions

diff --git a/net-wireless/airtraf/ChangeLog b/net-wireless/airtraf/ChangeLog
index adfa17b958c9..cbf3c621f601 100644
--- a/net-wireless/airtraf/ChangeLog
+++ b/net-wireless/airtraf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/airtraf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.6 2004/09/22 14:59:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.7 2004/10/28 23:49:27 dragonheart Exp $
+
+*airtraf-1.1 (29 Oct 2004)
+
+  29 Oct 2004; Daniel Black <dragonheart@gentoo.org> airtraf-1.0.ebuild,
+  +airtraf-1.1.ebuild:
+  CC/CXX fix as per bug #69280. Version bump too. Thank Spanky.
 
   22 Sep 2004; <blubb@gentoo.org> airtraf-1.0.ebuild:
   added Aris Adamantiadis' amd64-fix (#64879).
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index 415e2bf33e43..13e8d87fb188 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -1,4 +1,16 @@
-MD5 c83c321abb5182c1cb801b1e4427f44d ChangeLog 679
-MD5 68ed15a8c72fd21f7357c17dfc628c1d airtraf-1.0.ebuild 1011
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b7860faee4c1bbc99844f48c18586a8f ChangeLog 874
+MD5 4f6b8e3e1674ac1ff65889ccd4cc7f98 airtraf-1.0.ebuild 1046
+MD5 a3379fb1c95360c11abe5ed7d76b26a4 airtraf-1.1.ebuild 1047
 MD5 92f9aeb2621275bceb1c4707f6530049 files/digest-airtraf-1.0 63
 MD5 7753e78fafa0ea42690623c8e2618b2f files/airtraf-amd64.patch 1485
+MD5 630d7e86dcfce40f96fdf3f3db7a45df files/digest-airtraf-1.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBgYWSmdTrptrqvGERApa3AJ9n4mNag78CAC+du0cOCkG5VOyUfACeODSM
+CGnxrSUopTH5UCY5uJjmbHA=
+=GuvU
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/airtraf/airtraf-1.0.ebuild b/net-wireless/airtraf/airtraf-1.0.ebuild
index 3b3ae74bd68b..6d7d668f3684 100644
--- a/net-wireless/airtraf/airtraf-1.0.ebuild
+++ b/net-wireless/airtraf/airtraf-1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.0.ebuild,v 1.8 2004/09/22 14:59:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.0.ebuild,v 1.9 2004/10/28 23:49:27 dragonheart Exp $
 
-inherit eutils
+inherit eutils  toolchain-funcs
 
 DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
 HOMEPAGE="http://www.elixar.com/"
@@ -30,10 +30,10 @@ src_compile() {
 	# Do some sedding to make compile flags work
 
 	mv Makefile.rules ${T}
-	sed -e "s:gcc:${CC}:" \
+	sed -e "s:gcc:$(tc-getCC):" \
 		-e "s:CFLAGS   = -Wall -O2:CFLAGS   = ${CFLAGS} -Wall:" \
-		-e "s:c++:${GXX}:" \
-		-e "s:CXXFLAGS = -Wall -O2:CXXFLAGS = ${GXXFLAGS} -Wall:" \
+		-e "s:c++:$(tc-getCXX):" \
+		-e "s:CXXFLAGS = -Wall -O2:CXXFLAGS = ${CXXFLAGS} -Wall:" \
 		${T}/Makefile.rules > Makefile.rules
 	make || die
 }
diff --git a/net-wireless/airtraf/airtraf-1.1.ebuild b/net-wireless/airtraf/airtraf-1.1.ebuild
new file mode 100644
index 000000000000..20758472b809
--- /dev/null
+++ b/net-wireless/airtraf/airtraf-1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1.ebuild,v 1.1 2004/10/28 23:49:27 dragonheart Exp $
+
+inherit eutils  toolchain-funcs
+
+DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
+HOMEPAGE="http://www.elixar.com/"
+SRC_URI="http://www.elixar.com/${P}.tar.gz"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+DEPEND=">=net-libs/libpcap-0.7.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use amd64 ; then
+		epatch ${FILESDIR}/${PN}-amd64.patch
+	fi
+}
+
+src_compile() {
+	cd ${S}/src
+
+	# Do some sedding to make compile flags work
+
+	mv Makefile.rules ${T}
+	sed -e "s:gcc:$(tc-getCC):" \
+		-e "s:CFLAGS   = -Wall -O2:CFLAGS   = ${CFLAGS} -Wall:" \
+		-e "s:c++:$(tc-getCXX):" \
+		-e "s:CXXFLAGS = -Wall -O2:CXXFLAGS = ${CXXFLAGS} -Wall:" \
+		${T}/Makefile.rules > Makefile.rules
+	make || die
+}
+
+src_install () {
+	newdoc ${S}/docs/airtraf_doc.html airtraf_documentation.html
+
+	dobin ${S}/src/airtraf || die
+}
diff --git a/net-wireless/airtraf/files/digest-airtraf-1.1 b/net-wireless/airtraf/files/digest-airtraf-1.1
new file mode 100644
index 000000000000..600c60daf603
--- /dev/null
+++ b/net-wireless/airtraf/files/digest-airtraf-1.1
@@ -0,0 +1 @@
+MD5 2f999dc4cef573e14959261ad6c81294 airtraf-1.1.tar.gz 136241