commit: eb89e684b641bcb5fef1e83799364de11bbbaa4e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 04:24:25 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 05:03:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb89e684
net-analyzer/bwping: Version bump.
Package-Manager: portage-2.2.20.1
net-analyzer/bwping/Manifest | 1 +
net-analyzer/bwping/bwping-1.7-r1.ebuild | 12 +----
.../{bwping-1.7-r1.ebuild => bwping-1.8.ebuild} | 14 +-----
.../bwping-1.7-buildsystem-configurable-ipv6.patch | 55 ----------------------
4 files changed, 4 insertions(+), 78 deletions(-)
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index b2bc34a..c41a7f3 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1 +1,2 @@
DIST bwping-1.7.tar.gz 90441 SHA256
a73db87b47d363d722cd60473a546930a5e78df8d21437191ba4ca06d7197297 SHA512
74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7
WHIRLPOOL
41567722306d0ee72bad2ba9802bf399f0b435848a11d075bb89f746487c06ab16484056f54223b5cbea26e2855f2273b52a1247743c7cc77ad89beb26c3da01
+DIST bwping-1.8.tar.gz 90751 SHA256
725cd3bcd1b5bf7a27da802ce370dd86689fecf7b302538e74b20986dc8ce536 SHA512
d6d5e4b347ad7fcccbc980fb2f10b2528c874af618263b54aae923dee7d334057c703d58a65c9225a158b0cc29f0a14396891dba784642531197fb3960743067
WHIRLPOOL
44321def1a47989c5c74f79775507916cd7eb7174bddf8272bf9357ac33c5246af9280b61f522f2cb0ac92aa3e033facc12a1730d43ae2c1bf572a42561f928a
diff --git a/net-analyzer/bwping/bwping-1.7-r1.ebuild
b/net-analyzer/bwping/bwping-1.7-r1.ebuild
index b3faf3c..01aed64 100644
--- a/net-analyzer/bwping/bwping-1.7-r1.ebuild
+++ b/net-analyzer/bwping/bwping-1.7-r1.ebuild
@@ -4,9 +4,6 @@
EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
HOMEPAGE="http://bwping.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
@@ -16,13 +13,6 @@ SLOT="0"
KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
IUSE="ipv6"
-#PATCHES=(
-# "${FILESDIR}/${P}-buildsystem-configurable-ipv6.patch" # bug 454256
-#)
-
src_configure() {
- local myeconfargs=(
- $(use_enable ipv6)
- )
- autotools-utils_src_configure
+ econf $(use_enable ipv6)
}
diff --git a/net-analyzer/bwping/bwping-1.7-r1.ebuild
b/net-analyzer/bwping/bwping-1.8.ebuild
similarity index 58%
copy from net-analyzer/bwping/bwping-1.7-r1.ebuild
copy to net-analyzer/bwping/bwping-1.8.ebuild
index b3faf3c..34c9476 100644
--- a/net-analyzer/bwping/bwping-1.7-r1.ebuild
+++ b/net-analyzer/bwping/bwping-1.8.ebuild
@@ -4,25 +4,15 @@
EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
HOMEPAGE="http://bwping.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
IUSE="ipv6"
-#PATCHES=(
-# "${FILESDIR}/${P}-buildsystem-configurable-ipv6.patch" # bug 454256
-#)
-
src_configure() {
- local myeconfargs=(
- $(use_enable ipv6)
- )
- autotools-utils_src_configure
+ econf $(use_enable ipv6)
}
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
deleted file mode 100644
index 306b2b9..0000000
--- a/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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]),
-+ [case "${enable_ipv6}" in
-+ no)
-+ ipv6=no
-+ ;;
-+ yes)
-+ ipv6=yes
-+ ;;
-+ *)
-+ AC_MSG_ERROR([Invalid --enable-ipv6 argument '$enable_ipv6'])
-+ ;;
-+ esac
-+ ], [
-+ dnl If nothing is specified, assume auto-detection
-+ ipv6=yes
-+ ]
-+)
-+
-+if test $ipv6 = yes; then
-+ AC_MSG_CHECKING(for IPv6 support)
-+ AC_CACHE_VAL(ac_cv_ipv6,
-+ AC_TRY_LINK([
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -54,9 +75,12 @@ main()
- ac_cv_ipv6=yes,
- ac_cv_ipv6=no,
- ac_cv_ipv6=no))
--AC_MSG_RESULT($ac_cv_ipv6)
--if test $ac_cv_ipv6 = yes ; then
-- AC_DEFINE(IPV6,, "check if system supports IPV6")
-+ if test $ac_cv_ipv6 = yes ; then
-+ AC_DEFINE(IPV6,, "check if system supports IPV6")
-+ else
-+ AC_MSG_ERROR([IPv6 support was request, but not found])
-+ fi
-+ AC_MSG_RESULT($ac_cv_ipv6)
- fi
--AM_CONDITIONAL([BUILDIPV6], [ test $ac_cv_ipv6 = yes ])
-+AM_CONDITIONAL([BUILDIPV6], [ test $ipv6 = yes ])
- AC_OUTPUT(Makefile)
