Mark 1.11.3-r1 x86 stable, add QA fixes for bug 140645. Thanks to Jakub Moc <jakub at gentoo dot org>.

(Portage version: 2.1-r1)

4 files changed, 26 insertions, 5 deletions

diff --git a/net-analyzer/xnetload/ChangeLog b/net-analyzer/xnetload/ChangeLog
index c5bce0c1e111..825571184260 100644
--- a/net-analyzer/xnetload/ChangeLog
+++ b/net-analyzer/xnetload/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/xnetload
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/ChangeLog,v 1.10 2006/01/19 02:22:15 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/ChangeLog,v 1.11 2006/07/27 03:10:25 vanquirius Exp $
+
+  27 Jul 2006; Marcelo Goes <vanquirius@gentoo.org>
+  xnetload-1.11.3-r1.ebuild:
+  Mark 1.11.3-r1 x86 stable, add QA fixes for bug 140645. Thanks to Jakub Moc
+  <jakub at gentoo dot org>.
 
 *xnetload-1.11.3-r1 (19 Jan 2006)
 
diff --git a/net-analyzer/xnetload/files/digest-xnetload-1.11.3 b/net-analyzer/xnetload/files/digest-xnetload-1.11.3
index e6f5cf15633a..0997ea5de9c8 100644
--- a/net-analyzer/xnetload/files/digest-xnetload-1.11.3
+++ b/net-analyzer/xnetload/files/digest-xnetload-1.11.3
@@ -1 +1,3 @@
 MD5 02903105de631ba1ac7c5eff9508869f xnetload-1.11.3.tar.gz 24551
+RMD160 7394bff0a36df43c15c8fc47f5c09fe7b7119a7a xnetload-1.11.3.tar.gz 24551
+SHA256 518f6bd138b9d414865aa068ca7110de8b6d6cccde24e5deda8a8c534087a299 xnetload-1.11.3.tar.gz 24551
diff --git a/net-analyzer/xnetload/files/digest-xnetload-1.11.3-r1 b/net-analyzer/xnetload/files/digest-xnetload-1.11.3-r1
index e6f5cf15633a..0997ea5de9c8 100644
--- a/net-analyzer/xnetload/files/digest-xnetload-1.11.3-r1
+++ b/net-analyzer/xnetload/files/digest-xnetload-1.11.3-r1
@@ -1 +1,3 @@
 MD5 02903105de631ba1ac7c5eff9508869f xnetload-1.11.3.tar.gz 24551
+RMD160 7394bff0a36df43c15c8fc47f5c09fe7b7119a7a xnetload-1.11.3.tar.gz 24551
+SHA256 518f6bd138b9d414865aa068ca7110de8b6d6cccde24e5deda8a8c534087a299 xnetload-1.11.3.tar.gz 24551
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index ff97f17f3de9..1efa53b23f62 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild,v 1.1 2006/01/19 02:22:15 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild,v 1.2 2006/07/27 03:10:25 vanquirius Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="This little tool displays a count and a graph of the traffic over a specified network connection."
 HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
@@ -8,19 +10,29 @@ SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="|| (
 	( >=x11-libs/libX11-1.0.0
 	>=x11-libs/libXmu-1.0.0
 	>=x11-libs/libXt-1.0.0
 	>=x11-libs/libXaw-1.0.1	)
-	virtual/x11 )"
+	<virtual/x11-7 )"
 
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:CC = gcc:CC = $(tc-getCC):" \
+		-e "s:CFLAGS = -pipe -O2 -Wall:CFLAGS = ${CFLAGS} -Wall:" \
+		-e "s:LFLAGS = -s -pipe:LFLAGS = ${LDFLAGS}:" \
+		-e "s:gcc -MM:$(tc-getCC) -MM:" \
+		-e "s:/usr/X11R6:/usr:g" Makefile || die "sed failed in Makefile"
+}
+
 src_install() {
 	dobin xnetload
 	doman xnetload.1
-	dodoc README
+	dodoc README ChangeLog
 }