Revert latest commit for bug #530420. We shouldn't care if we can't support the ipv6 case. We only need know whether we can build the support for it. So replace RUN with LINK. This may also fix bug #536184

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

4 files changed, 40 insertions, 38 deletions

diff --git a/net-analyzer/bwping/ChangeLog b/net-analyzer/bwping/ChangeLog
index e14324dcc24c..934301cd747a 100644
--- a/net-analyzer/bwping/ChangeLog
+++ b/net-analyzer/bwping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/bwping
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/ChangeLog,v 1.19 2014/12/20 12:51:26 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/ChangeLog,v 1.20 2015/01/11 11:42:41 hwoarang Exp $
+
+  11 Jan 2015; Markos Chandras <hwoarang@gentoo.org> bwping-1.7-r1.ebuild,
+  files/bwping-1.7-buildsystem-configurable-ipv6.patch:
+  Revert latest commit for bug #530420. We shouldn't care if we can't support
+  the ipv6 case. We only need know whether we can build the support for it. So
+  replace RUN with LINK. This may also fix bug #536184
 
   20 Dec 2014; Markos Chandras <hwoarang@gentoo.org> bwping-1.7-r1.ebuild:
   Make sure IPV6 is enabled in the kernel if the ipv6 useflag is set. Bug
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index d5f614663c3d..43a41ca87fe7 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX bwping-1.7-buildsystem-configurable-ipv6.patch 1315 SHA256 bed7c474e30c37cee548b972bfe6d936c86f262d6f531bac88d2b51195bbf864 SHA512 edfd4fda4037ff38952a4eee59dfd9f31770bfdfee666ae059a6443c8ec24778e4d0897f911a138586b77f5e6f3d877daa6e25b5ea504a49292b2b5eef4399da WHIRLPOOL a7577daf43de45a4bd1e7d160137a5c75524c5e042e658e2062edf8ab619c04080dad1e8de3dae5047f0c595ca6d77b92f8968dda7a6ba5424be90fa4957079a
+AUX bwping-1.7-buildsystem-configurable-ipv6.patch 1513 SHA256 44f38438de08340bc7e6b5ae7d4ef2956bef0a343c570fdc45458466d10ca8a1 SHA512 7e7194b2e46c94501d9c127bd244c0935259f536652f81ec32ea68d78b79ca8b2f0b06f628622f5aa59c4a71780498446ef1ddb1a2837cf84be2483cd79bf244 WHIRLPOOL 0351b39be7f12db338fc6ef49a8b006c7ffd08bc17dbe4df7e33544bdfd05edcb54f7545a48c219907c77af3b50f89737c1357bc21ae9230d20b2d775ef48de4
 DIST bwping-1.7.tar.gz 90441 SHA256 a73db87b47d363d722cd60473a546930a5e78df8d21437191ba4ca06d7197297 SHA512 74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7 WHIRLPOOL 41567722306d0ee72bad2ba9802bf399f0b435848a11d075bb89f746487c06ab16484056f54223b5cbea26e2855f2273b52a1247743c7cc77ad89beb26c3da01
-EBUILD bwping-1.7-r1.ebuild 806 SHA256 3f7c213a9fe9a2698a8065ae275fc9137c1bdcdb920596047ba185eb5e0cab12 SHA512 908eeafd5bb8be43b2c6f3a59554ea181b206e3da857483f7f44eb48fa772081a9cdfcc0f3387ceb27f1c655c67446719fe322812010a56138fae1d77de17c01 WHIRLPOOL 053e2acd92078e6db14076edddad6fa68d2721a4dd44b858e1ca50cead9f439f049317cf1df814a0d3254f12b5b92eb3fac184d2fa9e67f5690ef3432f38cdb0
-MISC ChangeLog 2940 SHA256 1073f5664103d8e97cf7b63c24410aea4c312986feb878bb476776e2b0c00b2f SHA512 4a3da04ace17212fe49fedcade51dde5aa59ccde726ca53f7c294aab87dc9ae721c3fbabc0a12d88292ec5d16e3a7e1e882ed6c179cb05c467de60bbbe5f8ce6 WHIRLPOOL 0bda6cc38472917577119040bfb3e52cf85c995248acf148a5002e0a81f5da14e8338c0647d015fe39c3151dcdfd6441a37473b8ea8be9d49515c870ef21fc8c
+EBUILD bwping-1.7-r1.ebuild 714 SHA256 8023f8d737e8e0980bcf1e90cf9de2f8eb0d048c0314fe5955a58f42d60dddb0 SHA512 be09987fad09756d328a819914a5fbe91054582dadba1602477aedba70ba8b32a366418d47950791010ac2f8b27140464252417bddbb7bcb6343afb2d80f2a9c WHIRLPOOL 5d9de6c186d18c78f9ce1ed1edf3f835a16c04d69bd6a16fe86f345a1907f521d4017c9a06907d01ac002fdc7be7f638679fddeea95d64fcebb2847fd2f72763
+MISC ChangeLog 3284 SHA256 e1de6347aeb048ce6ab359a87f38257b3857ca4cdc7138506f1a54aff7cb66d6 SHA512 0d24dd00399ce9e72e673ce0867ad46fb703b13911a19c8bafb67abdef486a5041cca184c5f3ff06b080742f40d987ee392a8fbfc28b26c5bb0229f57323d497 WHIRLPOOL 0b440968434ad74a60546477c55911345c371d8fec05a571e7dde7f20c4a413376765485357a98caa81013001458182f8045d1d8ecda45407222c9d361059819
 MISC metadata.xml 577 SHA256 70fab0efee47a4096e1707610e501a5266615a5aa9a7281d327b5a4b1c879588 SHA512 979ef82281e83332102677bcd0ed8f751cace4305eec462f6aeb678bd66bed471ed6b98d3173cee253b4a13d5d18b90c67b7df159d2d4a1227c0183c12c72a2a WHIRLPOOL 2c5424a84d7631e1a14a138ecfdaf78bb25d041369938ae18aab644f9c91265a32fd0ce7830bc445a8a69e1bf6c47207fcd1a7ec4cdb80481ae969c7b67f500f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUlXDPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUsmGyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88a6wP/2qoOX6zcVhH+U/TXoI2OYfi
-7t5CWCGMYzN0YbEKzLI7SALo4fjvNvRTwre3CqHZSbEgWFpiWiKWTbPshI2oyICw
-Ka8x541tjqYSj4fWp6eH6C4W3xlgr9olUbvi2o2eB31ph1vecAHQYqleqQDQF+Dv
-wVT1f2RWMqdqktfe6WZ+EXgZvX3m3KAehbeWTkmYrIPF6n88oUlRYtSHbxmm0k37
-jEIGqRpVfFt1zHL/OofdQx4f6cr9WTSqE4M5hrPaVW7LDaAm9hdlflD8g6SEo0I3
-CKRRmJExxXWRdFbMm7KAiKusVGxDx8TBO11ROzGKSkWCzmGpJKmyUoh8yrKGqpUE
-v2HaRPL7W9J65dp2Dl5m2L4w77lLi2Y/o8OyIVWtbiGqRddFnGhAXO8ktp+uTJUG
-tdJoPXoCt+uH5mCIqc/mfwwXSPIrWlB8m5U1tlGyDP7Z7P0nBeEexnndnERBuNJN
-sycOsgvTLp0Zxwsf21BiIXhL+f+ruMoxZqy9j00EsH2u9reSTi5iI84F8jBrLZCD
-m7prF4QVhoYr76owI5GkGzQcXjIoldm0oI1RQqUbLVkzTCqPzYovUTMlG6upNVxO
-qXXpbM9DYUfFmWJERzC/JOiOXjJIDmTB5x2lRWr7ef7buGgWpzrR8T7phQXLy3jN
-YtqFqckY1ehLdZwRthX5
-=m2QX
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun882scP/2axPgMk0pcmtEMrsWRiXEbz
+uDPgEiIOLq/nc87C9N8zpZkUhErkAMpr5NDnurNT2o/qVx72OIdnLMQeAEbqlkun
+GxOZfYf/JYW1OiFRJLKGrsFhLFpTpsPZ0b608vWe7QY9c+jGkuvteV1ATeYAVp7K
+5spzXTPMaGLNd8jak9dj3B7lF0w6dwVBNewv6fdpdHetxuvDgDLyz1vbDcOJBlrd
+0zPiLcW+i92ozL8woOJ1MZK33FKkNROTR1/1JI3VmcpsODaoqWvCTnOxcaTBsVGq
+ZfDD7y5eTKxfsI6ldi+/TLSaYhwl49YNIXTWVQyawzG0LRDMcmsXarHeoCQ8hhao
+b+gNLb10ZINnfwnXZ5RkJOQdN47lqyI8m3FNAwUu8pkrBbyHJQMj5QqZikEedE0+
+c4BZBsxNAcEGxC2u5B8REkCxrmJ8Jzzz0SmMBdNdtUyWKuDoHJ4uZuxXQgD7l/ir
+ohQocYUEheY0/BTvzdkOQFBIXTQ4eiLWx7qdbDkB9xO3LdbR3csObCqYDKQG2gaT
+7JNZatq+yGYbUWwUJLvLzAQ65f3zUOz2XBtVdtGROwq22Z4/4hWxUEOhqXFoqwFG
+EnC28S0R5LJE2Qso9KV47qur6KnA9/6AYecCGBgYnBAi067eZ3RrO/gHLcoYPHwN
+JuDNBVQwuq6AvNVPL8LD
+=75vW
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/bwping/bwping-1.7-r1.ebuild b/net-analyzer/bwping/bwping-1.7-r1.ebuild
index 4da77521ddb4..e04ac188d57c 100644
--- a/net-analyzer/bwping/bwping-1.7-r1.ebuild
+++ b/net-analyzer/bwping/bwping-1.7-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/bwping-1.7-r1.ebuild,v 1.4 2014/12/20 12:50:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/bwping-1.7-r1.ebuild,v 1.5 2015/01/11 11:42:41 hwoarang Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils linux-info
+inherit autotools-utils
 
 DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
 HOMEPAGE="http://bwping.sourceforge.net/"
@@ -16,17 +16,9 @@ SLOT="0"
 KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
-PATCHES=(
-	 "${FILESDIR}/${P}-buildsystem-configurable-ipv6.patch" # bug 454256
-)
-
-CONFIG_CHECK="IPV6"
-
-pkg_setup() {
-	if use ipv6; then
-		linux-info_pkg_setup
-	fi
-}
+#PATCHES=(
+#	 "${FILESDIR}/${P}-buildsystem-configurable-ipv6.patch" # bug 454256
+#)
 
 src_configure() {
 	local myeconfargs=(
diff --git a/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch b/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
index d9c01c45a812..306b2b9fd22c 100644
--- a/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
+++ b/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
@@ -1,11 +1,14 @@
---- a/configure.in
-+++ b/configure.in
-@@ -32,8 +32,29 @@
+Index: bwping-1.7/configure.in
+===================================================================
+--- bwping-1.7.orig/configure.in
++++ bwping-1.7/configure.in
+@@ -32,9 +32,30 @@ AC_CHECK_FUNC(getaddrinfo)
  if test $ac_cv_func_getaddrinfo = no; then
      AC_SEARCH_LIBS(getaddrinfo, [nsl socket], [], [ echo "getaddrinfo() is required for build"; exit -1 ])
  fi
 -AC_MSG_CHECKING(for IPv6 support)
 -AC_CACHE_VAL(ac_cv_ipv6,
+-		AC_TRY_RUN([
 +
 +AC_ARG_ENABLE(ipv6,
 +  AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
@@ -29,10 +32,11 @@
 +if test $ipv6 = yes; then
 +	AC_MSG_CHECKING(for IPv6 support)
 +	AC_CACHE_VAL(ac_cv_ipv6,
- 		AC_TRY_RUN([
++		AC_TRY_LINK([
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -54,9 +75,12 @@
+ #include <netinet/in.h>
+@@ -54,9 +75,12 @@ main()
  		ac_cv_ipv6=yes,
  		ac_cv_ipv6=no,
  		ac_cv_ipv6=no))