Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/
Date: Thu, 07 Jan 2021 01:24:09
Message-Id: 1609982077.03e0957f23d230268d65b45397bc8077711fee9b.sam@gentoo
1 commit: 03e0957f23d230268d65b45397bc8077711fee9b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 01:14:37 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 01:14:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e0957f
7
8 net-misc/iperf: cleanup old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 net-misc/iperf/Manifest | 1 -
14 net-misc/iperf/files/iperf-3.0.5-flags.patch | 31 --------------------
15 net-misc/iperf/iperf-2.0.13.ebuild | 34 ---------------------
16 net-misc/iperf/iperf-3.6.ebuild | 44 ----------------------------
17 4 files changed, 110 deletions(-)
18
19 diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
20 index e58dfb818b5..a3540cc13ac 100644
21 --- a/net-misc/iperf/Manifest
22 +++ b/net-misc/iperf/Manifest
23 @@ -1,3 +1,2 @@
24 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
25 -DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
26 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
27
28 diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
29 deleted file mode 100644
30 index 9c11c282c33..00000000000
31 --- a/net-misc/iperf/files/iperf-3.0.5-flags.patch
32 +++ /dev/null
33 @@ -1,31 +0,0 @@
34 -* Do not inject -g
35 -* Do not make a profiled build
36 -
37 ---- a/src/Makefile.am
38 -+++ b/src/Makefile.am
39 -@@ -1,6 +1,6 @@
40 - lib_LTLIBRARIES = libiperf.la # Build and install an iperf library
41 - bin_PROGRAMS = iperf3 # Build and install an iperf binary
42 --noinst_PROGRAMS = t_timer t_units t_uuid iperf3_profile # Build, but don't install the test programs and a profiled version of iperf3
43 -+noinst_PROGRAMS = t_timer t_units t_uuid # Build, but don't install the test programs and a profiled version of iperf3
44 - include_HEADERS = iperf_api.h # Defines the headers that get installed with the program
45 -
46 -
47 -@@ -37,14 +37,13 @@
48 -
49 - # Specify the sources and various flags for the iperf binary
50 - iperf3_SOURCES = main.c
51 --iperf3_CFLAGS = -g
52 -+iperf3_CFLAGS =
53 - iperf3_LDADD = libiperf.la
54 --iperf3_LDFLAGS = -g
55 -+iperf3_LDFLAGS =
56 -
57 - # Specify the sources and various flags for the profiled iperf binary. This
58 - # binary recompiles all the source files to make sure they are all profiled.
59 --iperf3_profile_SOURCES = main.c \
60 -- $(libiperf_la_SOURCES)
61 -+iperf3_profile_SOURCES = main.c
62 -
63 - iperf3_profile_CFLAGS = -pg -g
64 - iperf3_profile_LDADD = libiperf.la
65
66 diff --git a/net-misc/iperf/iperf-2.0.13.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
67 deleted file mode 100644
68 index 5bbdb14cfc5..00000000000
69 --- a/net-misc/iperf/iperf-2.0.13.ebuild
70 +++ /dev/null
71 @@ -1,34 +0,0 @@
72 -# Copyright 1999-2021 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=7
76 -
77 -DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
78 -HOMEPAGE="https://sourceforge.net/projects/iperf2/"
79 -SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
80 -
81 -LICENSE="HPND"
82 -SLOT="2"
83 -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
84 -IUSE="ipv6 threads debug"
85 -
86 -DOCS=( "INSTALL" "README" )
87 -
88 -PATCHES=(
89 - "${FILESDIR}"/${PN}-2.0.12-ipv6.patch
90 -)
91 -
92 -src_configure() {
93 - econf \
94 - $(use_enable debug debuginfo) \
95 - $(use_enable ipv6) \
96 - $(use_enable threads)
97 -}
98 -
99 -src_install() {
100 - default
101 -
102 - dodoc doc/*
103 - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
104 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
105 -}
106
107 diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
108 deleted file mode 100644
109 index 090ffb29144..00000000000
110 --- a/net-misc/iperf/iperf-3.6.ebuild
111 +++ /dev/null
112 @@ -1,44 +0,0 @@
113 -# Copyright 1999-2021 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=6
117 -
118 -inherit autotools eutils ltprune
119 -
120 -DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
121 -HOMEPAGE="https://github.com/esnet/iperf/"
122 -SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
123 -S="${WORKDIR}/${P/_/}"
124 -
125 -LICENSE="BSD"
126 -SLOT="3"
127 -KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
128 -IUSE="libressl sctp static-libs"
129 -
130 -DEPEND="!libressl? ( dev-libs/openssl:0= )
131 - libressl? ( dev-libs/libressl:0= )
132 - sctp? ( net-misc/lksctp-tools )"
133 -RDEPEND="${DEPEND}"
134 -
135 -PATCHES=(
136 - "${FILESDIR}"/${PN}-3.0.5-flags.patch
137 -)
138 -
139 -src_prepare() {
140 - default
141 -
142 - eautoreconf
143 -}
144 -
145 -src_configure() {
146 - use sctp || export ac_cv_header_netinet_sctp_h=no
147 - econf $(use_enable static-libs static)
148 -}
149 -
150 -src_install() {
151 - default
152 -
153 - newconfd "${FILESDIR}"/iperf.confd iperf3
154 - newinitd "${FILESDIR}"/iperf3.initd iperf3
155 - prune_libtool_files
156 -}