From 59fda71c8f03aaaca3a590ada071c338134ec838 Mon Sep 17 00:00:00 2001
From: Peter Volkov <pva@gentoo.org>
Date: Tue, 11 Oct 2011 04:57:29 +0000
Subject: [PATCH] Disable tests that fail if started from root user.

Package-Manager: portage-2.1.10.25/cvs/Linux x86_64
---
 net-misc/ipv6calc/ChangeLog              |  5 ++++-
 net-misc/ipv6calc/Manifest               | 10 +++++-----
 net-misc/ipv6calc/ipv6calc-0.92.0.ebuild | 10 +++++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/net-misc/ipv6calc/ChangeLog b/net-misc/ipv6calc/ChangeLog
index 4ce40e333dd3..694188b8e8e1 100644
--- a/net-misc/ipv6calc/ChangeLog
+++ b/net-misc/ipv6calc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/ipv6calc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.45 2011/10/10 19:49:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.46 2011/10/11 04:57:29 pva Exp $
+
+  11 Oct 2011; Peter Volkov <pva@gentoo.org> ipv6calc-0.92.0.ebuild:
+  Disable tests that fail if started from root user.
 
 *ipv6calc-0.92.0 (10 Oct 2011)
 
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 08739a6b1138..6a610c2a6502 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -6,13 +6,13 @@ DIST ipv6calc-0.90.0.tar.gz 621227 RMD160 2e7b1742a5b5265e04f922ee04956ca358b3d5
 DIST ipv6calc-0.92.0.tar.gz 640662 RMD160 f9cb9caad6107466e90b0162ad16629043fb3c49 SHA1 e71bfdf6ba90939528f0e5b5e07314d17753f721 SHA256 e30fddfa0b439cdfcf33932f527ddd51986296917dd1cb35f51bd2410c34a6b2
 EBUILD ipv6calc-0.80.0.ebuild 761 RMD160 cff03e266b3a63ebb83bc6c836a049f6c3f077ab SHA1 ea30cb7ac2947e9cb9ee86301a97549c8854a642 SHA256 2c2695fd1a03cc82eb7cba81f2c5ab4b433c44e5503de929dc6547ca324fa04c
 EBUILD ipv6calc-0.90.0-r1.ebuild 814 RMD160 10b9a55793edc021d66e89edc21bc9a76de0a5f8 SHA1 b56d257a9edee3fe0f345ebc539515add4515169 SHA256 65a8cea20bb5660881d1958153b4913f83d9fe82576bae3aca66494ceffc02c4
-EBUILD ipv6calc-0.92.0.ebuild 908 RMD160 c1f835d4afd9e1813c2c3f2ab8a651d0a264fa48 SHA1 c5d4a975142e7d3aaf7652bc1c3141f15aac24c8 SHA256 5cdc9297512f2b83af0479c6bac61ab4d77f95d25072bfaf616c867f2d5afa87
-MISC ChangeLog 5580 RMD160 8802118c6aefa91aba604e1896b1cae3606660ca SHA1 4846fc560202b0ff31bc2357c2e4987504496ef6 SHA256 399a1a1874a5b0734c7d5f2c21a33bdd8614527a68e96860d15ec4e37eed8fae
+EBUILD ipv6calc-0.92.0.ebuild 1051 RMD160 e0d83cea0e6234f128a967f0bfd9edab9a0b82e2 SHA1 c5931a77effab4a5c520fc465da550420f76c2cc SHA256 25b89e5eded69e1f55f1e8c50409e29ec3de7765e979c778fc429bcd5c69e7bb
+MISC ChangeLog 5703 RMD160 8dd79c49ce327b85f33b8f01ad17bd620797d01d SHA1 6930df46d12ea20406241d0181f223dfc6cab3a8 SHA256 1b9adc10ebfa74d030d6d2bd2a6e742608e1927836dc93044c4c33e98840d4f9
 MISC metadata.xml 224 RMD160 c4982d517185d492cc89bff7a46ab4499d56df58 SHA1 a2e85a177d8f5fc19f7659d6e60e56d3dc1fefbe SHA256 7926089217610a6b04696c3271cb44b985ddc3949bf0560383ca0ba416cd3363
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6TS+QACgkQGrk+8vGYmwe8ogEAnaH73b+GuD2h2CJq+rDrSKjz
-6LXv3RYeJMNl5vYy/oMA/0zmuVGMCEHmxJhH1Kowd0IoDR8xkdqf+JDpR6+Yxe8G
-=fefx
+iF4EAREIAAYFAk6TzE8ACgkQGrk+8vGYmwd4uAEAvFLegWaeCSRF7ZFKo2pmQ9I9
+Jjp0D4YEwg9ZPVJBg9MBAOJZH7FMlaPUpiAKtKHC25TiyQzEZU0Ct96/sUNgN/W+
+=UVv5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ipv6calc/ipv6calc-0.92.0.ebuild b/net-misc/ipv6calc/ipv6calc-0.92.0.ebuild
index 552796f35061..e1e8f0a97503 100644
--- a/net-misc/ipv6calc/ipv6calc-0.92.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.92.0.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-misc/ipv6calc/ipv6calc-0.92.0.ebuild,v 1.1 2011/10/10 19:49:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.92.0.ebuild,v 1.2 2011/10/11 04:57:29 pva Exp $
 
 EAPI="4"
 inherit fixheadtails
@@ -31,6 +31,14 @@ src_compile() {
 	emake DEFAULT_CFLAGS=""
 }
 
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc ChangeLog CREDITS README TODO USAGE
-- 
2.26.2