gentoo auto-resync : 02:10:2022 - 07:12:21

9 files changed, 253 insertions, 41 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c739e14bc0fe..266e927695ac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 48e29b18934b..e9380fa51d0f 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -2,9 +2,11 @@ DIST gallery-dl-1.21.2.tar.gz 434114 BLAKE2B 2f1335d0745c3fd3de95f9f3005fc67f079
 DIST gallery-dl-1.22.4.tar.gz 467129 BLAKE2B f2f656b3255d091361bd2c80bb2647de47af14c11823fcc0e7e5790ea0b04047195e435a7a4c2b24a645c6e2a27cf53c3ce456a405b97ee014272af1a77ea4a1 SHA512 d20535115b464cb51a0fcb6bcd9e64e12fca5a199841cf4e501eae558c842d7d51dda4823b29d7ee2f1e267e59245f8e1cb1a702a96e5c45935918dbf3e6a448
 DIST gallery-dl-1.23.0.gh.tar.gz 473431 BLAKE2B 1f485477ea150585050f24fbe3605195b9b8ffca3d39d3dde5f2160c2ceb3dd75bb691cc14c178d236c690ff6d2effe147242abcb67feda7b77b829f440e2ac4 SHA512 8e17532c094c9516593f9009eca7139e60d7474a56c76bb07a68c03eae4e2e8e31c6bd1f167388d05a1104d5964e2d0b62272c506b2b6988b1832a36a492cbf9
 DIST gallery-dl-1.23.1.gh.tar.gz 477797 BLAKE2B abb04762755cc941d3fef31ba2cf21eab4b0afa196a67276d26199a044950cf68607bf7bd4e26bd3631de1e715a7ca25248a658aac1ac56cbb3e2a6ef5b2d71b SHA512 898fd952cc6e590a11e4154449153bd48547c9f21cba6864c95953f9be18ad27391d8033e5350d41714b28ded5711ddefefd4ca0f3c13016972a16b028a0fc1d
+DIST gallery-dl-1.23.2.gh.tar.gz 482620 BLAKE2B 2a537354f93a1d82659669d9a1cdec425e2438127304a5385a871aa7c4f89afa3f0d91326fd731c6ddc48a4cce67d35335270e602a34761726575e525ac19020 SHA512 75defb234faf0467e5a957594a58a02cfc75180d63a4b2c24d84061d326fbb46f08ad3230b72adf525f1ba82621963564c556047d4aa06c16cc5124ecd8c075f
 EBUILD gallery-dl-1.21.2.ebuild 973 BLAKE2B fef69fc7188b2f8714854ab4d98f726553eabb98a022ab8f28da6da7523594addf4549f249ef7dbae09d136669aeb3bb45da4462c052bbe3acf4f59908af3776 SHA512 70a1b88a1982618d4131124c301c1945724aa33b94b35154dd5f6b25ef45756f95572c0841916edc090752f7d868f18fba25b3b12274f136f72427148c667db4
 EBUILD gallery-dl-1.22.4.ebuild 972 BLAKE2B 338fa4a1e74523fdcce0333bbc1d1f342755c797a23c199e1bc10abc8d3b725fcf96c7a77f74716a876bdda021940589bd996e6247291d57241bf917559c5bd1 SHA512 287b64f38b3989d17adb44e5977a4044f78c974dee031372ff9af17d18d0cfd37c34558b90bfd4d516caf69813025a7e4eee5beaac71fd278b9727966ca08b7e
 EBUILD gallery-dl-1.23.0.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-1.23.1.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
+EBUILD gallery-dl-1.23.2.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-9999.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/gallery-dl-1.23.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.23.2.ebuild
new file mode 100644
index 000000000000..adeefda919ee
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.23.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# tests require network access
+RESTRICT="test"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index eee468a022d0..6e7125e6a132 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,13 +1,16 @@
 AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
 AUX iperf-3.10.1-drop-forced-debugging-symbols.patch 4250 BLAKE2B bbad11654523de15816e8b1429a5df99fca6c5b110217896d4554ba54f3d75bc6f9d8487993ba8368d1cc7e385569510727acba86b95251174c0ffe03f6ad115 SHA512 97e8dd9e317c7713d280863f501dc7a056a2c2088cccc9237cec8c4583185161becae692e21253700bce33eadd9aabd69be0deacaf8ac0950456a23501a93f54
+AUX iperf-3.12-Unbundle-cJSON.patch 2894 BLAKE2B 74981580ed628224fbbbf19f35c5a7972b066029d45ba8a86b437f7aafda80a6f1bba5696b5a35f210993bd9af0406de1ff168f41ec36f8bfbe2674dd626b34f SHA512 c9f7d8f0286135043e1d686e2936f4765d8b344b57ea3c7b887c94665201904e10119f6f7fed028fef898ae75a25aa9157b26def007515921ec249503fa9d66a
+AUX iperf-3.12-fix-bashism.patch 1211 BLAKE2B 7b3f8a4262bf6fa9f5604d9aed535e95e1bc01fba8184df489abc9a0527135573310a2da437e5b7fdc8e8a959294c55c7947c9a67c5b2d5bdf56ffff4731a573 SHA512 ff27761303ee30a80502ac163a819cb152f5b80dd29061a6547376edbe122639528c3d118966542b3e223a21f63712ee2a8c23249864316ba7e806352fbd87d5
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17
+DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
 EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913
-EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
+EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
 EBUILD iperf-3.11.ebuild 940 BLAKE2B 123c3572e33d063a05da78244a8f8baca587c5577b2465535ea06f291c4ea91222fe10722d21ef19a7e040ba32eab66dec480ba99e0e3b6f8e7fa0ae3234fdfb SHA512 fd76f0f30e04ab19e943e2c455263487c14f741c3312c89bdaf4218808dbcf667ec6b0582380a710dcfaae99e816f5eb0fc56736f8af6918eabad0e535994534
-EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
+EBUILD iperf-3.12.ebuild 1158 BLAKE2B 7c1b4ff05d0abbce88f82198a622a211a8caa828b233ab23ac37c7a1f85aa5af0021189a50e3a47a410c4ece37d53070b5ed33eef47d01ae1725f340ea201cb7 SHA512 faf1d8963358d2804ec66480de309c8de0cadc130009209132552805c7bf74b721de464cbf0a6e83839728b3ead8251c4cab78896dd4b41129301795d01784e2
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
new file mode 100644
index 000000000000..c5b1b49ec1a7
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
@@ -0,0 +1,109 @@
+From 85b225cdd00b9a483a603b8b124a829ffbf92b88 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 03:07:40 +0100
+Subject: [PATCH] Unbundle cJSON
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,6 +62,8 @@ AC_ARG_ENABLE([profiling],
+     AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary]))
+ AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
+ 
++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15])
++
+ # Check for the math library (needed by cjson on some platforms)
+ AC_SEARCH_LIBS(floor, [m], [], [
+ echo "floor()"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,8 +10,6 @@ include_HEADERS         = iperf_api.h                                   # Define
+ 
+ # Specify the source files and flags for the iperf library
+ libiperf_la_SOURCES     = \
+-                        cjson.c \
+-                        cjson.h \
+                         flowlabel.h \
+                         iperf.h \
+                         iperf_api.c \
+@@ -44,10 +42,13 @@ libiperf_la_SOURCES     = \
+                         units.c \
+                         units.h \
+                         version.h
++libiperf_la_CPPFLAGS    = $(CPPFLAGS) @libcjson_CFLAGS@
++libiperf_la_LIBADD      = @libcjson_LIBS@
+ 
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES          = main.c
+-iperf3_LDADD            = libiperf.la
++iperf3_CPPFLAGS         = $(CPPFLAGS) @libcjson_CFLAGS@
++iperf3_LDADD            = libiperf.la @libcjson_LIBS@
+ 
+ if ENABLE_PROFILING
+ # If the iperf-profiled-binary is enabled
+--- a/src/iperf.h
++++ b/src/iperf.h
+@@ -65,7 +65,7 @@
+ 
+ #include "timer.h"
+ #include "queue.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf_time.h"
+ 
+ #if defined(HAVE_SSL)
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -81,7 +81,7 @@
+ #endif /* HAVE_SCTP_H */
+ #include "timer.h"
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "units.h"
+ #include "iperf_util.h"
+ #include "iperf_locale.h"
+--- a/src/iperf_tcp.c
++++ b/src/iperf_tcp.c
+@@ -42,7 +42,7 @@
+ #include "iperf_api.h"
+ #include "iperf_tcp.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ 
+ #if defined(HAVE_FLOWLABEL)
+ #include "flowlabel.h"
+--- a/src/iperf_udp.c
++++ b/src/iperf_udp.c
+@@ -46,7 +46,7 @@
+ #include "iperf_udp.h"
+ #include "timer.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "portable_endian.h"
+ 
+ #if defined(HAVE_INTTYPES_H)
+--- a/src/iperf_util.c
++++ b/src/iperf_util.c
+@@ -46,7 +46,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf.h"
+ #include "iperf_api.h"
+ 
+--- a/src/iperf_util.h
++++ b/src/iperf_util.h
+@@ -28,7 +28,7 @@
+ #define __IPERF_UTIL_H
+ 
+ #include "iperf_config.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include <sys/select.h>
+ #include <stddef.h>
+ 
diff --git a/net-misc/iperf/files/iperf-3.12-fix-bashism.patch b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch
new file mode 100644
index 000000000000..1f3a321f42c9
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch
@@ -0,0 +1,43 @@
+https://github.com/esnet/iperf/pull/1398
+
+From 3a03f775ca103f2e824abef903130280c57ca8ac Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 02:58:59 +0100
+Subject: [PATCH] config/iperf_config_static_bin.m4: fix bashism
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+./configure: 2670: test: x: unexpected operator
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/config/iperf_config_static_bin.m4
++++ b/config/iperf_config_static_bin.m4
+@@ -7,6 +7,6 @@ AC_ARG_ENABLE([static-bin],
+     [:])
+ AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno])
+ 
+-AS_IF([test "x$enable_static_bin" == xyes],
++AS_IF([test "x$enable_static_bin" = xyes],
+  [LDFLAGS="$LDFLAGS --static"]
+  [])
+--- a/configure
++++ b/configure
+@@ -2667,7 +2667,7 @@ else
+ fi
+ 
+ 
+-if test "x$enable_static_bin" == xyes
++if test "x$enable_static_bin" = xyes
+ then :
+   LDFLAGS="$LDFLAGS --static"
+ 
+
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.9999.ebuild
index 6c9197a333b9..cd4130c2772c 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/iperf/iperf-3.12.ebuild b/net-misc/iperf/iperf-3.12.ebuild
new file mode 100644
index 000000000000..6ee24b228358
--- /dev/null
+++ b/net-misc/iperf/iperf-3.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+	>=dev-libs/cJSON-1.7.15
+	dev-libs/openssl:=
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+	"${FILESDIR}"/${PN}-3.12-fix-bashism.patch
+	"${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled cjson
+	rm src/cjson.{c,h} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with sctp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	systemd_dounit contrib/iperf3.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
deleted file mode 100644
index fcfe1f4f75f0..000000000000
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-EGIT_REPO_URI="https://github.com/esnet/iperf"
-S="${WORKDIR}/${P/_/}"
-
-LICENSE="BSD"
-SLOT="3"
-IUSE="sctp static-libs"
-
-DEPEND="
-	dev-libs/openssl:0=
-	sctp? ( net-misc/lksctp-tools )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with sctp)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-
-	find "${ED}" -name '*.la' -delete || die
-}