Fix QA problems by Agostino Sarubbo (ago). Stable on amd64. Bug #391471

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 38 insertions, 23 deletions

diff --git a/net-analyzer/traffic-vis/ChangeLog b/net-analyzer/traffic-vis/ChangeLog
index bb2ef3cf5b86..643d377ed5a4 100644
--- a/net-analyzer/traffic-vis/ChangeLog
+++ b/net-analyzer/traffic-vis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/traffic-vis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.20 2011/07/08 11:09:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.21 2011/12/04 11:24:35 hwoarang Exp $
+
+  04 Dec 2011; Markos Chandras <hwoarang@gentoo.org> traffic-vis-0.35-r2.ebuild,
+  files/traffic-vis.init.d:
+  Fix QA problems by Agostino Sarubbo (ago). Stable on amd64. Bug #391471
 
   08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
   traffic-vis-0.35-r1.ebuild, traffic-vis-0.35-r2.ebuild:
diff --git a/net-analyzer/traffic-vis/Manifest b/net-analyzer/traffic-vis/Manifest
index 95fb851141c2..4cbd06008964 100644
--- a/net-analyzer/traffic-vis/Manifest
+++ b/net-analyzer/traffic-vis/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX traffic-vis-0.35-gentoo.patch 5377 RMD160 08c60df9431b1f4ed4119865d063fefa6984af36 SHA1 2efffeb2fd8058088dbf9eb92f842db3cc5c1408 SHA256 7104cc67000394f871cd8072c79bcf38627e6180b161ab25701d6944f8ade3dd
 AUX traffic-vis-0.35-libpcap-header-fix.patch 280 RMD160 04e7d8534600aa935f3d0aaff1f13c4933baad43 SHA1 f6fed7649faf6f4b3d5c763bc1e0af9b2f4be0d7 SHA256 b63d12f2105b2d031635871397e72c6de09c12d7edd92bbf4758556082ebc4c0
 AUX traffic-vis.conf.d 365 RMD160 affed99857725e3e5994c20e8860ffec9f2259ae SHA1 e6487b41df460497ebea6df94cb7382c24308d0f SHA256 fdaaef2191bd56f47a5ed3bfe078871b178ea310923a49d84e4eabadeeefce41
-AUX traffic-vis.init.d 744 RMD160 f654592da8969603ae67437bc208a5d52e92470a SHA1 76c307a171bc2c1df72d4e89eb979777ea0c653d SHA256 57d1281c8174a0262d927056a3760ac877c6817c2ce8befe25a0f5a8653cf3db
+AUX traffic-vis.init.d 718 RMD160 0fd082018f9a251d6aebc3e146ece4148140ec23 SHA1 41de830dbfabe354b07fc813c7e5f0b8ffbfba06 SHA256 a07b6241475e1e241a9b54997387c8a5e6432c73ac4fb698e085a7419a4f2b7b
 DIST traffic-vis-0.35.tar.gz 41202 RMD160 763e0f4532628d68325e933a9963d8435ae95a6b SHA1 762c9d956bdd075fef567570ad10d54a393d7d2c SHA256 8a6d56a390df525c73ac35f7c4a2ac854072824ee36fb2053b35fdf14e933754
 EBUILD traffic-vis-0.35-r1.ebuild 1453 RMD160 e250b4b3bdcf12d408d10eafc30068c055ea0f1a SHA1 5715d26521435d199666b3e97db2db387e7c8952 SHA256 72124bf81b9887035d7a27ef46e064880c115a211481239deffd51caa06538c2
-EBUILD traffic-vis-0.35-r2.ebuild 1459 RMD160 e875ac8c95ae1c8051e87f10a92879ccab9c25bd SHA1 d7494ef6e385f868059d682b06a6f98c2d5b627b SHA256 c55bad4fcb08257f96612b3937c14ba326b7442403855e9c5720af6bb1b28715
-MISC ChangeLog 2919 RMD160 ca27c46542f1a506c324da811d76038e1917974a SHA1 150dd1491c2b710f262c0403973814ef16cf24c3 SHA256 15f22c96f5dc89ee24725373a907f2d385456f0c4eb12438d0b28b990f914b93
+EBUILD traffic-vis-0.35-r2.ebuild 1590 RMD160 10f3ad6b7c1a5d2285000c86b7c71ab5cbebfb08 SHA1 cfd040350b744081903ca97db12526ef33f24e43 SHA256 ef70ed6d0b9c2f7a55d077c3d42018f9e155aca888ec15024f748b35259aee78
+MISC ChangeLog 3102 RMD160 7ba8e272c704666df066881f28f298aa08be7349 SHA1 901274755026e5c44483197362307b3715245891 SHA256 4629cb3b5c7add00ad6357a245aadc38fa896d9b0bce9b3a8e01ac4306f7c7ee
 MISC metadata.xml 250 RMD160 8243f369f9fceba6f1e62bf8a17853094de6738e SHA1 3c65215346e5477e7bd5d37503890daa9f0e77c6 SHA256 8f64428f5a200994e8520ffe481dfb1fba11bee5da6a46ba8f283062fba4b2b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4W5QgACgkQXkR9YqOcLPEwsQD/anqikSuNFjLyhukeWaEnD1dV
-9rayXWg2LjRxXk5lqt0BAKKypFF5h6ahZGpu7E+nhX+D5dZ29v89F2PQWh2fn1s9
-=Oqmi
+iQIcBAEBCgAGBQJO21h0AAoJEPqDWhW0r/LCbM8QAJDvSSpxhE1jGNtVZmCDq9UN
+CFYnbBt1sLq+bv7m/5JOum2oMLPSUGNof7fgiaYlCHjGacT2suIgZW3ohm55a/5v
+EzJBbPVIErLOq7Nzbf5m1XBppQkBr9/LfpdWg8fRC3JUKzBM8ygU/yjMmQCufO4Y
+2ADjReP9VwkJApYzbomqFbWkht07fm54c8FL1qUKKrsqNHZ04/fSjsFC9K9JTZUN
+4oGkjZM9wl/QzUSTd8vPW1oMRzJavinu1bgsAZowTcE+vXj6M/FKNDfFGKKndDfA
+qKvCK5qOAH1LibZKTmoqiki3NBYtZ2WQwwNtCP3J4sAuUYSPcGOndh8aFo5066ko
+QFBzXpavDEo56iMSHPN3xKcafuWMXbnDhlgMGB11XFhGGQPkfa5TyFfPv3NPb+t+
+WnlSVCbPF4xjghFjrkUw6Q62E4JL8oS9UOS6YAbyMUus8xe0YswHO0yoZgEfZd9B
+pk57PhVvpdUz9W2EwgrxB8wTyfKiGlVuFJ7tHsbg+bcnd0pxiSGLDmj5qsJf5fu1
+mM9neToVOmWRGL0ZaYM0gkyBE2pzmLD61HCbbdnWFY5zUb6f/YOtsUIigC2SD+5e
+bcPAxekKzwVJFAc+MRLd6yBXCYk3+2PEsmNJ7qxBcDgLedyaMldNYTp7tkB+EJSG
+i1Tr0hYrBZbxXMXrMApX
+=XV46
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/traffic-vis/files/traffic-vis.init.d b/net-analyzer/traffic-vis/files/traffic-vis.init.d
index e71922dc4807..27684dfd39be 100644
--- a/net-analyzer/traffic-vis/files/traffic-vis.init.d
+++ b/net-analyzer/traffic-vis/files/traffic-vis.init.d
@@ -1,9 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis.init.d,v 1.3 2004/07/14 23:13:45 agriffis Exp $
-
-opts="depend start stop"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis.init.d,v 1.4 2011/12/04 11:24:35 hwoarang Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild b/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild
index 2170856faec6..74559ce0e403 100644
--- a/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild
+++ b/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild,v 1.3 2011/07/08 11:09:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild,v 1.4 2011/12/04 11:24:35 hwoarang Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.mindrot.org/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 IUSE="gif"
 DEPEND="net-libs/libpcap
@@ -21,6 +21,8 @@ DEPEND="net-libs/libpcap
 		dev-lang/perl )
 	=dev-libs/glib-1.2*"
 
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-libpcap-header-fix.patch
@@ -29,13 +31,14 @@ src_prepare() {
 	sed -i frontends/traffic-togif \
 		-e "s:/usr/sbin/traffic-tops:/usr/bin/traffic-tops:g" \
 		|| die "sed frontends/traffic-togif"
-
+	# drop DEBUG flags
+	sed -i -e "/^DEBUGFLAGS/d" Makefile || die
 	tc-export CC
 }
 
 src_install() {
-	dosbin collector/traffic-collector
-	doman collector/traffic-collector.8
+	dosbin collector/traffic-collector || die
+	doman collector/traffic-collector.8 || die
 
 	for mybin in $(use gif && echo frontends/traffic-togif) \
 			frontends/traffic-tohtml \
@@ -45,12 +48,12 @@ src_install() {
 			utils/traffic-exclude \
 			utils/traffic-resolve ; do
 
-		dobin ${mybin}
-		doman ${mybin}.8
+		dobin ${mybin} || die
+		doman ${mybin}.8 || die
 	done
 
-	newinitd "${FILESDIR}"/traffic-vis.init.d traffic-vis
-	newconfd "${FILESDIR}"/traffic-vis.conf.d traffic-vis
+	newinitd "${FILESDIR}"/traffic-vis.init.d traffic-vis || die
+	newconfd "${FILESDIR}"/traffic-vis.conf.d traffic-vis || die
 
-	dodoc TODO README BUGS CHANGELOG
+	dodoc TODO README BUGS CHANGELOG || die
 }