gentoo auto-resync : 29:08:2022 - 22:47:16

17 files changed, 126 insertions, 482 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9cf15da14570..cb289305be7f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index 6abc443e31c7..60b095c7e53f 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -1,6 +1,4 @@
-AUX libmediawiki-5.37.0-fix-warnings.patch 5020 BLAKE2B b00f572a413f09112cb9712efec8204b15ac5a77a6ca672ce5a4c0e53b2b4f7c329c6c792bc2d29a65afc131c8f17cf5b7ae14943296cad0b6e1e6275702a23f SHA512 2af979b26bdc224afaa9bd8259bc28085ff89ae0ec623620900b02e44467c13cc65d91c89789970f30048061b8fdfeff8b8be324b7e886f6700d12c3d1d6dcaa
-AUX libmediawiki-5.37.0-qt-5.15.patch 1315 BLAKE2B 9d4d437c84a8a118c9d70f086af410d48dd0904a3525d565ae19bdc81aab73e3d7762094394a3688db7dc40744f6e47defd50a853133df4bc5d2a3a2e39d828d SHA512 0b211203270415547c1ef25a8f52e6c00bfe7ad68f8456fb9a47453147dbce2508743891c2053413a830ecb4e14e90feb40c7736a7b968797e1e814f7fc4b1a1
 AUX libmediawiki-5.37.0-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f
-DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993
-EBUILD libmediawiki-5.37.0-r1.ebuild 927 BLAKE2B b62522c26b7813a1e9fb8808b8567b9de37f94140da8892ae9b365472299aef966b7237a74c8d958085752331761ae153b84c98aeabce5a6f76ff31a175c8cf6 SHA512 37508746c3d8679817f1c55d6302d61201c7f7a54dd3e961515be8a50334cfbfe596240f2bc181f773459848ea166a355f8f56d0c3f52b88a2af2d38653cab28
+DIST libmediawiki-5.38.0.tar.xz 55264 BLAKE2B 74753a20ab84f1badcf7368be5617648e296f66832feafb26ea2122818921a924a7278ccfbe4779535365c679ef574139dc3214812a87b72cd90f6766671928a SHA512 4e8a3a656d324006a85cd6b2eeeaafd67a80806368125a9f0ce46984b58cfeed5ad8ac34c6cc305d00b3bd92bf5e1f8e60b41313ac6a86970c47572654784114
+EBUILD libmediawiki-5.38.0.ebuild 845 BLAKE2B 4300be8a0349b1346627178b59c9fac75c4fbfaa77c9b402b0d3551665d383fa76260af281f7f925f31f58888cff36dd82dfdb955077109d953835c74181a36a SHA512 4bb939c147ef1f39ee9d2b8876f3e6aa731ec8acac00eb3a619d5cad8ac1c2fe25fa81ad5fc25d281c8a6707c8aef5bd65cf1332ce3f2463d278f7d48c882369
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
deleted file mode 100644
index c57041dca7c9..000000000000
--- a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 8c11aeabf34985421cd229240a6fad3db8023156 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 9 Sep 2017 15:33:24 +0200
-Subject: use Q_DECL_OVERRIDE
-
----
- src/edit.h                          | 2 +-
- src/job.h                           | 2 +-
- src/login.h                         | 2 +-
- src/logout.h                        | 2 +-
- src/parse.h                         | 2 +-
- src/queryimageinfo.h                | 2 +-
- src/queryimages.h                   | 2 +-
- src/queryinfo.h                     | 2 +-
- src/queryrevision.h                 | 2 +-
- src/querysiteinfogeneral.h          | 2 +-
- src/querysiteinfousergroups.h       | 2 +-
- src/upload.h                        | 2 +-
- tests/libmediawikitest/fakeserver.h | 2 +-
- 13 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/edit.h b/src/edit.h
-index 85bd590..a3944c8 100644
---- a/src/edit.h
-+++ b/src/edit.h
-@@ -178,7 +178,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Specify how the watchlist is affected by this edit.
-diff --git a/src/job.h b/src/job.h
-index 180822b..feda262 100644
---- a/src/job.h
-+++ b/src/job.h
-@@ -73,7 +73,7 @@ public:
-     /**
-      * @brief Aborts this job quietly.
-      */
--    virtual bool doKill();
-+    bool doKill() Q_DECL_OVERRIDE;
- 
- protected:
- 
-diff --git a/src/login.h b/src/login.h
-index 196710a..4ea71f1 100644
---- a/src/login.h
-+++ b/src/login.h
-@@ -130,7 +130,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- private Q_SLOTS:
- 
-diff --git a/src/logout.h b/src/logout.h
-index 03fb1f7..1b05323 100644
---- a/src/logout.h
-+++ b/src/logout.h
-@@ -65,7 +65,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- private Q_SLOTS:
- 
-diff --git a/src/parse.h b/src/parse.h
-index 5732f69..e72f59f 100644
---- a/src/parse.h
-+++ b/src/parse.h
-@@ -85,7 +85,7 @@ public:
- 
-     void setUseLang(const QString& param);
- 
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     Q_SIGNALS:
- 
-diff --git a/src/queryimageinfo.h b/src/queryimageinfo.h
-index f8c21a6..039c4a5 100644
---- a/src/queryimageinfo.h
-+++ b/src/queryimageinfo.h
-@@ -148,7 +148,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/queryimages.h b/src/queryimages.h
-index 3211880..c8de5a0 100644
---- a/src/queryimages.h
-+++ b/src/queryimages.h
-@@ -103,7 +103,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/queryinfo.h b/src/queryinfo.h
-index e2ff3e6..e23f50e 100644
---- a/src/queryinfo.h
-+++ b/src/queryinfo.h
-@@ -75,7 +75,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Set the page name.
-diff --git a/src/queryrevision.h b/src/queryrevision.h
-index b1decfb..190d026 100644
---- a/src/queryrevision.h
-+++ b/src/queryrevision.h
-@@ -150,7 +150,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Set the page id.
-diff --git a/src/querysiteinfogeneral.h b/src/querysiteinfogeneral.h
-index 516f7ed..1b31f15 100644
---- a/src/querysiteinfogeneral.h
-+++ b/src/querysiteinfogeneral.h
-@@ -81,7 +81,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/querysiteinfousergroups.h b/src/querysiteinfousergroups.h
-index 74bc653..d6fb089 100644
---- a/src/querysiteinfousergroups.h
-+++ b/src/querysiteinfousergroups.h
-@@ -73,7 +73,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/upload.h b/src/upload.h
-index 817eb5b..7f745f4 100644
---- a/src/upload.h
-+++ b/src/upload.h
-@@ -143,7 +143,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Set the target filename.
-diff --git a/tests/libmediawikitest/fakeserver.h b/tests/libmediawikitest/fakeserver.h
-index e847ac6..c6bb78c 100644
---- a/tests/libmediawikitest/fakeserver.h
-+++ b/tests/libmediawikitest/fakeserver.h
-@@ -61,7 +61,7 @@ public:
-     ~FakeServer();
- 
-     void startAndWait();
--    virtual void run();
-+    void run() Q_DECL_OVERRIDE;
- 
-     void setScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty"));
-     void addScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty"));
--- 
-cgit v1.1
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch
deleted file mode 100644
index 5e7f9d49ce50..000000000000
--- a/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7c79dae079d20b46d05462ed9f5b3cfae78f420a Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 2 May 2021 12:39:39 +0200
-Subject: [PATCH] Fix compilation error with Qt 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: use of deleted function ‘QCharRef& QCharRef::operator=(char)’
----
- src/queryrevision.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/queryrevision.cpp b/src/queryrevision.cpp
-index 59aac03..6ebfbc8 100644
---- a/src/queryrevision.cpp
-+++ b/src/queryrevision.cpp
-@@ -307,8 +307,8 @@ void QueryRevision::doWorkProcessReply()
-                 while (count < 2)
-                 {
-                     if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++;
--                    if (replytmp[i] == QLatin1Char('<'))                          replytmp[i] = char(255);
--                    if (replytmp[i] == QLatin1Char('>'))                          replytmp[i] = char(254);
-+                    if (replytmp[i] == QLatin1Char('<'))                          replytmp[i] = QChar(255);
-+                    if (replytmp[i] == QLatin1Char('>'))                          replytmp[i] = QChar(254);
-                     ++i;
-                 }
-             }
--- 
-GitLab
-
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild
index 88b2d5e06537..eb2f3d9d6115 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.96.0
+QTMIN=5.15.5
 inherit ecm kde.org
 
 DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org"
@@ -22,11 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-tests-optional.patch"
-	"${FILESDIR}/${P}-fix-warnings.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.37.0-tests-optional.patch" )
 
 src_test() {
 	# bug 646808, 662592
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 902ee9373ec7..62165f48e740 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,7 +1,5 @@
 AUX libnetfilter_conntrack-1.0.9-musl.patch 1671 BLAKE2B c6618c82fbaf68f5c61dc7631d12630c82e597112c5131b0b3fa49344a4d70e6a3efaf13b42f4971d0b0ae9bca0a1b6183170111b7291cd374cc4a38ea64b167 SHA512 121cdbb92d17c4ffaaa93ddd8e881489f82f00aa931f14032aaafcb2c1a65ad18f122868baaa9d0c0b266638c9888c5f037f47ecba09321de683c569e2fe7466
-DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
 DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c
 DIST libnetfilter_conntrack-1.0.9.tar.bz2.sig 566 BLAKE2B 0f80f00858093ed5e9aac190fbb1ac5ac1dde60e6767b65adda49ed79fb7fb6cc7caea51793d8930a927d9b7a75d263851dd5741d6d408a8b56d3ea5b73da20e SHA512 83ed38f68bd38cf70d9c245a7f17373751ff9099ceff3066812b282b7426edf2eee79da8f5aea896b119327059008ff4a531b3dfdcd79d49944bea4079e67e1f
-EBUILD libnetfilter_conntrack-1.0.8.ebuild 965 BLAKE2B 5a4a1475076ca7b3eee8b895c60c12b964e07241b7dbd4c985aacde96af3c8d83598360ef8bc6426ff7036ac9fef478f023a915a676c2ed77419ad33227fa269 SHA512 2910307ec62c7583fbedb1e3dfd6862a72ee5d600c27408411d733a8f68856a3aa2d32969b976a2a1ff676f1ad66a4c4a7a8a1564a114a63950e1738e3340ca9
-EBUILD libnetfilter_conntrack-1.0.9.ebuild 1286 BLAKE2B 7d2247281feed92ae8c67571668da907c85d45f0513f10b29ce2496721523911538901b3280d1392170cd68bedd6002b145073ffb579266d2d969236bdb0c170 SHA512 79f95ab142fb37347af829a8d9c82c892be344dad22e279e13240a9cf9f8b8f8f5763ae0f3ba29209b8e079cd6bd2835c2e4255dcfb3d0c8a893eadb4eb7f9d5
+EBUILD libnetfilter_conntrack-1.0.9.ebuild 1285 BLAKE2B a8929b75fce1f6db9e1e9cc34827443f891299b9dfeb7d2ad9043722448e2f24cdc5367bcf3ad14249fdc736ad807821afa0dda56434883ffb8c3ac556ff6246 SHA512 cfacc39759f01918c60f23941b7e13301e3a1941b7a5d9cc616db7febb5003f47acfe4c42c58e2da8bf8ef7aba75a4d9fcf3b3e59ae1aef4ffae45d577444080
 MISC metadata.xml 375 BLAKE2B fc9624816dbdf791c5d399fd9db83b402c1186387a7898c700f277e926e6424d9a2cf3dae39221041ec782c017fcf96cab8bd698878dad524f9feb111576a652 SHA512 016ff7eaeb05c1566ed7f53a2fda5c5808e847d6d5cd07521769ebfff4cdc76fe4d40abe13cd9ed68c56c83a2442720ba526e9454d596e3fee87e25843933f6b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
deleted file mode 100644
index a42aa6f12fe1..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info
-
-DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( README )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	# netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-	fi
-
-	check_extra_config
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
index 9340ab111101..d740a028ddf9 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 
 RDEPEND=">=net-libs/libmnl-1.0.3
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 0446c83e60dc..94bdf44bdbce 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,8 +1,4 @@
-DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
-DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187
 DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
 DIST libnetfilter_queue-1.0.5.tar.bz2.sig 590 BLAKE2B d8b5b3ae82fe2722db8a0c200a75146b70f79b7eafb34ddba8349f7f38f02eb5546eee9ae31920f5b7301787a2866a908199b69f8465fe1b6e45ebdc5fb7ae13 SHA512 65558652c7d54087eb1b5a37f7574bcca3495e5ee6587c7b555a7fe6e118007cf9431a66ed5280ce272890c659eb171570e0d0cbb733cf969ae8b44a1d541687
-EBUILD libnetfilter_queue-1.0.3.ebuild 723 BLAKE2B 5904b5c2c5289c1eb44a1970b08e020698c46fa7eecfb600deb3dd8fc1657cca027eddecc73b0d8abdc6de2cc0c337952a7b9c4cb3fc2dbf16add36abbd91425 SHA512 c4cd950c48d2d1d842bec72000e66ce776d39becff0e89373a68f08663c19f7aa084ebc215c99d5676842c867eea9959aa9dc174181de28b1a4631069b7ca9b5
-EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
 EBUILD libnetfilter_queue-1.0.5.ebuild 1115 BLAKE2B e9df676b9435054ac76f1a98bb66f699cb3aa4d1f5cd907b7c020be0a3d794c899a0f6a63414fcad5f96f360ee6a75cc34b381b9b34738aea4a6ffd7e2877fb2 SHA512 fc9dbe7c8eaff1dc2947fc3014134398a4a3ed50ca4d0c5cc0515712ebc3c977b21c65aa4cb619cb624856612381a978b4fb973d49d88dedde2684fedb8d6228
 MISC metadata.xml 371 BLAKE2B 521c009d0ef0aba996abfc4be1681779fab5fd8c2120146ec745536be4554d25460ee02943a90a7c0154194e6df5694a134920a2271c5764e1e0809dabce26b3 SHA512 fd2f90008654c2292d539c21775fe161b458380f0b65827c91e50ddbbfce66e66d57b362584b711193e41d682df073ac154b9a1ec6d42bffb8f5d245737af14e
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
deleted file mode 100644
index 5e97c76a1ada..000000000000
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="API to packets that have been queued by the kernel packet filter"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnfnetlink-0.0.41
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version"
-}
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild
deleted file mode 100644
index 288764d2e4b6..000000000000
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info
-
-DESCRIPTION="API to packets that have been queued by the kernel packet filter"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnfnetlink-0.0.41
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	app-doc/doxygen
-	virtual/pkgconfig
-"
-CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version"
-}
-
-src_prepare() {
-	default
-
-	# hack for script that was not distributed
-	[[ -x fixmanpages.sh ]] || ln -s $(type -P true) fixmanpages.sh
-}
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 026f19798773..73b052e61f33 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -2,16 +2,15 @@ AUX libsrtp-1.6.0-openssl-1.1.patch 11366 BLAKE2B ab8d7dfc2c5de1a3b49eea5ed76c9b
 AUX libsrtp-1.6.0-openssl-aem_gcm-key.patch 2704 BLAKE2B 686530bce1ba56f96fa6df4606e7133aa38df0f68e3636c7c599da54371383bc64dcb63baf7404b9744ec3bcf3f3548a4877edee1ab4be699f40ad37f10468af SHA512 f0b6156494c2c8f0c3dd78142203bc15ec52f3176e01dbed74cad5302b49dc3e146cd75a4fdaff30a83ea3b8498c1e147f0c820533f362af0a2b8599087ff837
 AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657bcaf8a8c4ed77e2a4f738f72119f64825865c8820adb8ea2675695d8ce1b021dc61cdd6f478ec76fc97d9c9942178e63c1d578dc80 SHA512 561ce042f2216cdee8926f3931407116294aeed170297bf325fde02cda86a43d71aab538f2b54b2b7727a02629903c9aaf36cfe84dc6a2e4cda9388047519842
 AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0
-AUX libsrtp-2.2.0-gcc-10.patch 724 BLAKE2B 559079dd02413b25fa03b90bdbf709d2b16ccc5b0f0db97fb2558ab21773648d3e0fbded74b8bee2fe6d94c68da746f156b9d7b3b3b682d809715929f4e597a5 SHA512 3a1c51620af703e9dd061101e29288458452f9d0f2758dd29e9494689357d3adf408cdc7e2f60fe606680970364c0d55cc2bb4e7618b86b76384f6ab208352ed
-AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
 AUX libsrtp-2.3.0-gcc-10.patch 752 BLAKE2B 6d401cbbc0c57487183390293b54c572dc3d263b94c6edd66be5986d46746390160f8d3c95346b311bf00439eb826d7734568be462ac8c7eafcc5f3a8556b24b SHA512 4bce9f8b95fce4b89f8e9a2c10cead73e363dc966ec0574516b56cb3124edf49a8d00806f5d5de6cc8610140c21183350b4dec7b1225bcaa6e5592250293cd40
 AUX libsrtp-2.3.0-nss.patch 431 BLAKE2B f56fcf59fd43618b76fca02873b57a9bd073cc67cafe9797b58702379f01e825ba4f3391f62cab9e4a1173b66c55bdea82bfb5e108bd8f68af1b0a29fe6fdafb SHA512 0e54f320a8fc4c27ad5ac40bad07c45a3f75b01ba375aa07a1c35804ba73c1f3cd4b830b6626bff128e59d6f69433bc80028eac55cc4038db25874fde882c53d
 AUX libsrtp-2.3.0-rtp-header.patch 904 BLAKE2B f2756956a913e6be8c49d0d178f2351cb3ac634523979f47add96814d9514c7b2c4343f9302d4f24f0e75cd543aee9c587552b3cb415ceca32403d51c8550036 SHA512 e2e9dea744f6cc41a4351a443e2712b9471ffb1df0f69c41e99e562d896db3c4b29bd684352334b31a03de61a18154ac9d7fb94ab40192a5058cfa2574b81711
+AUX libsrtp-2.4.2-doc.patch 1819 BLAKE2B bc4c53bc623f839e8069b24d8bee6a5e6e52f37783ee66afc9f2f72f325c7fcbb0f9fbdff4d460953050c196a3e2d3531b009c463ba9fca50c18027146f15661 SHA512 4bbb557ad7aa93842a8003084297277a67853fc6c408fb00ce52828a05abc3c2fe726ffebedbad939a15fab6838c08f364de772e4ab9b6037b03f4d2805a5802
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
-DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
+DIST libsrtp-2.4.2.tar.gz 631393 BLAKE2B a062fb7a92294c66f1876c66bf05d9b11412a170c5f7221089680770ab85a62eabb68f781e487981b28602b1f4f7dbba07ebd44ed0248deaf6b9b56061227534 SHA512 6e4805e6d34b2050a6f68f629b0b42356b1d27f2cbaa6cc6166e56957609c3d9aa6b723dcc674e5c74180d122d27badd2f9496639ccb1e0c210b9e1f7949d0e2
 EBUILD libsrtp-1.6.0-r1.ebuild 2337 BLAKE2B 52f337ea0bf805f22faa49c822d13fd93101ea021d5a69dafe48fa94cecb99d897c57674d5948558b9a4f7c052f0eb64f1a46899f91ee9223d86ff35ecc80ad4 SHA512 24b38fea4642f344faaa1f9722909b51f8c9c373fa2c231956309eefea81b938c19e55e7aaa1f4971a26f14130c2bce5d6631551d2bd7c976f17641e707b544b
-EBUILD libsrtp-2.2.0.ebuild 1808 BLAKE2B 1fb3991cfc010b0610d2e4c5bb4d68374ee8110197e07a50575dbca4ec921daac6181aa91dcdd5022114add234e1b0ad323dd777284a8d609711aa75f29da237 SHA512 7311aea94bdd39e0a5c19e384f88babed4f20dbf46635bebe6c9807c258460f7da88989e7c2b341308c9677e4b955807241cc789d59b07eaff2e01cd754d1daf
 EBUILD libsrtp-2.3.0-r1.ebuild 1964 BLAKE2B 190d974f229d348ce03631032c70858e898c28804a7a752e52d755d265c9ae8f443d64a86f54cc01e7be56dc1934462b9f7c64169cc07cb7728f09c5bf217daa SHA512 fa3d3a4d34a7c542df04aaa0a87de790044ca8e735ef6096c035fcca29faae12136b7dffcfca995e0b11ff6f51919987b921a5c88765618a6228e08bcad7991a
+EBUILD libsrtp-2.4.2.ebuild 1664 BLAKE2B 9638ee1efd37da4b88bb357d3210c2bfaa8e532a4d93a41e31bb80a8392b10452c4ee8269f98f234fdb69bba51a2e229abddc853465a732cfe9ebbe806c4d921 SHA512 c5dd360404f015a1c3a87e00ba359b2241207d146716db4d906076dd76c19ad531a5499dd47dca51e60648f46a010675fa1ee2695e1ef5070d358e3ae7497508
 MISC metadata.xml 732 BLAKE2B 77564b70a4af50dea6dad18ad1763a5d61fbd8753fef74039b50d9131eb080758e3de2e06736a1665a66bbc716941549ac82efe44f0d58e321778144faf29166 SHA512 f021171abc6eae3bc732e3beac09a5ef126d4c8f31912192db9281cf523d2e2632f740757420b3fb477b88957ace138e03ee752ab44df63b0b16787f1a29e883
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch
deleted file mode 100644
index 771ae0f51448..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c
-index c0dfece..ec2fe6d 100644
---- a/crypto/math/datatypes.c
-+++ b/crypto/math/datatypes.c
-@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
- 
- /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
- 
--char bit_string[MAX_PRINT_STRING_LEN];
-+static char bit_string[MAX_PRINT_STRING_LEN];
- 
- uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
- {
-diff --git a/test/util.c b/test/util.c
-index eb203f4..04e149c 100644
---- a/test/util.c
-+++ b/test/util.c
-@@ -47,7 +47,7 @@
- #include <string.h>
- #include <stdint.h>
- 
--char bit_string[MAX_PRINT_STRING_LEN];
-+static char bit_string[MAX_PRINT_STRING_LEN];
- 
- static inline int hex_char_to_nibble(uint8_t c)
- {
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch
deleted file mode 100644
index 1075825945cb..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr libsrtp-2.2.0.ORIG/configure.ac libsrtp-2.2.0/configure.ac
---- libsrtp-2.2.0.ORIG/configure.ac	2018-06-18 13:28:52.385014993 +0100
-+++ libsrtp-2.2.0/configure.ac	2018-06-18 13:31:09.217020686 +0100
-@@ -273,6 +273,8 @@
- 
- dnl Checking for PCAP
- 
-+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)]))
-+AS_IF([test "x$enable_pcap" != "xno"], [
- PCAP_LIB=""
- AC_CHECK_LIB([pcap], [pcap_create],
-   [PCAP_LIB="-lpcap"
-@@ -284,6 +286,7 @@
-    AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `winpcap' library (-lwpcap)])
-    AC_SUBST([HAVE_PCAP], [1])])
- AC_SUBST([PCAP_LIB])
-+])
-    
- AC_MSG_CHECKING([whether to redirect logging to stdout])
- AC_ARG_ENABLE([log-stdout],
diff --git a/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch
new file mode 100644
index 000000000000..571c3f3c5d44
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch
@@ -0,0 +1,42 @@
+--- a/doc/Doxyfile.in
++++ b/doc/Doxyfile.in
+@@ -771,13 +771,13 @@ WARN_LOGFILE           =
+ # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+ # Note: If this tag is empty the current directory is searched.
+ 
+-INPUT                  = ../README.md \
+-                         ../include/srtp.h \
+-                         ../crypto/include/auth.h \
+-                         ../crypto/include/cipher.h \
+-                         ../crypto/include/crypto_types.h \
+-                         ../crypto/include/err.h \
+-                         crypto_kernel.txt
++INPUT                  = @TOP_SRCDIR@/README.md \
++                         @TOP_SRCDIR@/include/srtp.h \
++                         @TOP_SRCDIR@/crypto/include/auth.h \
++                         @TOP_SRCDIR@/crypto/include/cipher.h \
++                         @TOP_SRCDIR@/crypto/include/crypto_types.h \
++                         @TOP_SRCDIR@/crypto/include/err.h \
++                         @TOP_SRCDIR@/doc/crypto_kernel.txt
+ 
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+@@ -1104,7 +1104,7 @@ HTML_FOOTER            =
+ # obsolete.
+ # This tag requires that the tag GENERATE_HTML is set to YES.
+ 
+-HTML_STYLESHEET        = docs.css
++HTML_STYLESHEET        = @TOP_SRCDIR@/doc/docs.css
+ 
+ # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+ # cascading style sheets that are included after the standard style sheets
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -8,6 +8,7 @@ endif
+ 
+ doc_config = configuration_data()
+ doc_config.set('LIBSRTPVERSIONNUMBER', meson.project_version())
++doc_config.set('TOP_SRCDIR', meson.source_root())
+ 
+ doxyfile = configure_file(input: 'Doxyfile.in',
+   output: 'Doxyfile',
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
deleted file mode 100644
index f25da2660cd5..000000000000
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/cisco/libsrtp"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
-IUSE="aesicm console debug doc openssl static-libs syslog test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	openssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES )
-
-PATCHES=(
-	"${FILESDIR}/${P}-pcap-automagic-r0.patch"
-	"${FILESDIR}/${P}-gcc-10.patch"
-)
-
-src_prepare() {
-	default
-
-	# test/rtpw.c is using /usr/share/dict/words assuming it exists
-	# using test/rtpw.c guaratees the file exists in any case
-	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
-
-	eautoreconf
-
-	# sadly, tests are too broken to even consider using work-arounds
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# stdout: default error output for messages in debug
-	# pcap: seems to be test-only
-	# openssl-kdf: OpenSSL 1.1.0+
-	econf \
-		--enable-log-stdout \
-		--disable-pcap \
-		--disable-openssl-kdf \
-		$(use_enable debug debug-logging) \
-		$(use_enable openssl)
-}
-
-multilib_src_compile() {
-	use static-libs && emake ${PN}2.a
-	emake shared_library
-	use test && emake test
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest
-
-	# Makefile.in has '$(testapp): libsrtp2.a'
-	if use !static-libs; then
-		rm libsrtp2.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# libsrtp.pdf can be generated with doxygen, but it seems to be broken.
-	use doc && DOCS+=( doc/*.txt )
-	einstalldocs
-}
diff --git a/net-libs/libsrtp/libsrtp-2.4.2.ebuild b/net-libs/libsrtp/libsrtp-2.4.2.ebuild
new file mode 100644
index 000000000000..593b1ed935be
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-2.4.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/cisco/libsrtp"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv -sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="debug doc nss openssl static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( nss openssl )"
+
+RDEPEND="
+	openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/libsrtp-2.4.2-doc.patch )
+
+multilib_src_configure() {
+	local crypto_lib="none"
+	use openssl && crypto_lib="openssl"
+	use nss && crypto_lib="nss"
+
+	# stdout: default error output for messages in debug
+	# openssl-kdf: OpenSSL 1.1.0+
+	local emesonargs=(
+		-Dcrypto-library=${crypto_lib}
+		-Dcrypto-library-kdf=disabled
+		-Dfuzzer=disabled
+		-Dlog-stdout=true
+		-Dpcap-tests=disabled
+		-Ddefault_library=$(usex static-libs both shared)
+
+		$(meson_feature test tests)
+		$(meson_native_use_feature doc)
+		$(meson_use debug debug-logging)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+	if multilib_is_native_abi && use doc; then
+		meson_src_compile doc
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		dodoc -r html
+	fi
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS=( CHANGES )
+	einstalldocs
+}