gentoo resync : 28.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-28 20:40:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-28 20:40:51 +0000
commit: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch)
tree: 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /net-libs
parent: d934827bf44b7cfcf6711964418148fa60877668 (diff)
41 files changed, 635 insertions, 528 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5b102f0ac27e..73c2f7cd2184 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index 8417feacd95a..d505456fdb66 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -3,5 +3,5 @@ AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428
 DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
 DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
 EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc
-EBUILD cppzmq-4.6.0.ebuild 1026 BLAKE2B 41388d982063f2ec061420edc3ca1e819881f3ce0cc6f46aa48e1d72cfc05519dc669c381c83374f1606a3e82d230293b7162a3e0e61904bbc435040cb55420c SHA512 8b815fe13b5835b9286c799b842bf669e7e75e4a128fdc158a79b7fdec9a80801c1bfbbebb35df6da8d360362d2d1aac4e0e9954757c7783259ad670ffdd8c5b
+EBUILD cppzmq-4.6.0.ebuild 1025 BLAKE2B 291900a7e79d2317bd252263dfcefc7571bd5034f9a02b7b62f9510868a2c40fdb35839b9b4aef9f735344c7dd721ca510a5ed40b2223ad5708d587f4418e8f0 SHA512 5cbcbc96be8bd9d2113b6743d18a9add2cb1bafcbb7d95fa7e5750ab7510ae55109fdb6ef098dd03b7f2c5b9597491879c0bbc19c00bb364857aa81addb98d1b
 MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 9929c655b614..d5656c9ebacc 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 9abc3bb24aaf..834b9ce59917 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,8 +1,4 @@
 AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4d6bcd31d980283c6e8f2307bec19d442d45687fad1ca126e50a6443d3eee2ce75b0d9f5c5a8 SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a
-DIST czmq-2.2.0.tar.gz 592293 BLAKE2B 72318a3c57960a463adae8838f3a51fc8319451773dfa84a401d664604c056b02f387ae6c2a598253e6bcc4dc19e72ca41de4252a6c853e1d3a6f9ade9617138 SHA512 51825e8a62a53cb3ac5fcf95b217e7dceb1745d31e243679e3c6ad0c7cce26e5844119bd054312e3764f0299df7e26bf9373a68cb1e7afc675966aa616a90ab6
-DIST czmq-3.0.2.tar.gz 818110 BLAKE2B da6da496f50374cdd7daf7978529baa1e1d3fbe51a4e57e753362a3dd67bdd94324b97f133bbb4eaa397f76c102a411a2aedc6d22deae499191da60a101fdf2e SHA512 ed2b97eb9b20ee8e491ba4c100920af0a54d146cb01c227fdef66939cdf4747c779d950df52e68782c68cfce1d4579b4870b005a8c58a32b477de2414b8b6453
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
-EBUILD czmq-2.2.0-r2.ebuild 851 BLAKE2B 9c1d2e55956627e066c785d2a053c47b51a9978db6c1ba62b39b37cd94895d178f40f1b6457a0e911a58d5e76073e3030b7ca8773f010fbcb1d03d9026ea03aa SHA512 6205a1ad6bed9903a6c9f4702776cd71a7f2f61e8d27dd720f6f6fa731ed2119bcf7d73c053484c636b980f0037dd797a95bd2b71e1b8d7812b2ca3ffbc77d1e
-EBUILD czmq-3.0.2-r1.ebuild 1079 BLAKE2B 8127f13ec7c13caa5e8705036c5d504c7fe79c5871e6c588808f643d51ef42adc00440be0ef67d1ecc82df58afb655ecd054bb1eafcd2b81cd8a840860037518 SHA512 a2309b95dbbe8469bef2042bfde990e9df4ef6597158029be92f05880c23df6b5eb3c14b0dd252e1c16245b7b72760b2c32511b3df53227a9e6a567434384478
 EBUILD czmq-4.2.0.ebuild 1186 BLAKE2B 6e116ec87c3df5fcf83af5acd1043f3d3e331235522e786db3558c68da63176a74f6249f6c66fad8d4900d92797c29fc266e4d172b946878c6994b126f0ffdce SHA512 d685be15cf56a07ab34674adec08bc0bbadfbb118b281a25593b06810938b350aac30e2eb7b654f5431115b636a73c7fb3f8ef300971fc7df5246535bac8faad
 MISC metadata.xml 685 BLAKE2B df8cf761a5f66beb5270526eb6494146b13730418bcfed63cf9f1e8c63ff5442b1c8c0556678a737d153729258bb1b79dfd910ac7e42ebd2f3f3d52ac40279ef SHA512 5711249c075704615125fb9208883beb4907a6a0e4fef865ef948ad6925399aae34efe03aa61f68d30a561fa12ebfb2f14795ce281defd597a164629e62451fc
diff --git a/net-libs/czmq/czmq-2.2.0-r2.ebuild b/net-libs/czmq/czmq-2.2.0-r2.ebuild
deleted file mode 100644
index b3e2ccc2e54e..000000000000
--- a/net-libs/czmq/czmq-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION=" High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm hppa x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/libsodium:=
-	sys-apps/util-linux
-	>=net-libs/zeromq-2.1
-	<net-libs/zeromq-4
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-DOCS=( NEWS AUTHORS )
-
-src_prepare() {
-	sed -i -e 's|-Werror||g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	mv "${ED}"/usr/bin/makecert{,-czmq} || die
-}
-
-pkg_postinst() {
-	elog "Due to file collisions we moved the makecert tool to makecert-${PN}."
-}
diff --git a/net-libs/czmq/czmq-3.0.2-r1.ebuild b/net-libs/czmq/czmq-3.0.2-r1.ebuild
deleted file mode 100644
index 93acefb0a6bf..000000000000
--- a/net-libs/czmq/czmq-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	sys-apps/util-linux
-	net-libs/zeromq
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-"
-
-DOCS=( NEWS AUTHORS )
-
-# Network access
-RESTRICT=test
-
-src_prepare() {
-	use test && AUTOTOOLS_IN_SOURCE_BUILD=1
-	sed -i -e 's|-Werror||g' configure.ac || die
-
-	cat >> src/Makemodule-local.am <<-EOF
-	src_libczmq_la_LDFLAGS += -pthread
-	EOF
-
-	autotools-utils_src_prepare
-}
-
-src_test() {
-	autotools-utils_src_test check-verbose VERBOSE=1
-}
-
-src_install() {
-	autotools-utils_src_install
-	mv "${ED}"/usr/bin/makecert{,-czmq} || die
-	mv "${ED}"/usr/share/man/man1/makecert{,-cmzq}.1 || die
-}
-
-pkg_postinst() {
-	elog "Due to file collisions we moved the makecert tool to makecert-${PN}."
-}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 59d9d510c780..69607c048382 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,4 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
-EBUILD gnutls-3.6.15.ebuild 4056 BLAKE2B a8ef09d11faf226a0f859e596a7addc804cc8400538c81286d230a92a1c2e26c5a516632b915811df86f276e09f42b918095b7cce8cad3d5ac79c91672c483d6 SHA512 f295a6371e62e7f403d9604202e80d0442091efc5ddfd89ee6489cc1a2f1f4393a9110ccb0af8baf690b292f2470043b58f3f00a585f93ff2590350b7e3d09b1
+EBUILD gnutls-3.6.15.ebuild 4294 BLAKE2B 3f7bd20ce57309eb02ba94c615c9e2b45c75a8568027bf85eb364045d8facfa0374487a9a9280ed7143bd69e49042cc98618865c83c2ff6518e742a4c65c0075 SHA512 67a1a1bd6da65dc47be4b4cc5580946ad85c68885c4baf19831617ca2c0f63a1c3c4872048df4e89c23844ff51a14652454c2bddc8b70e75f89a45bcc2c855f1
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index 5fabb1a30dc5..b0da1cec679a 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -74,6 +74,11 @@ src_prepare() {
 		rm src/$(basename ${file} .c).{c,h} || die
 	done
 
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
 	# Use sane .so versioning on FreeBSD.
 	elibtoolize
 }
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 3247b976d4fb..7c38083fa165 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,7 +1,5 @@
-DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
 DIST ignition-msgs5_5.2.0.tar.gz 390042 BLAKE2B 733f57aaa91d6a34201e247c34ace74653ebc7e23df03f89a4a2ec76361e5ea0270f3b63d6452abb15b1380acacfe87294cbb9f0c01655707481300a34aa8408 SHA512 b1c6017da39c79ebdb2d76e960c6b60d0b82af7f5c09144a1f25c6e7b7b06ec5a7922e6d0bc08951baf0d4797d6ea061cea11b703238c954445d67762f2bc983
 DIST ignition-msgs5_5.3.0.tar.gz 390136 BLAKE2B 947336e79f54f384d8cdeefdc6be5cfe360c4ae9fc4e894cc08252e801343c4a9d507957df1ffb05a80e55ac24bddcd57f4e4e90d8e0b2f346bc55aa8f64c3c1 SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e
-EBUILD ignition-msgs-1.0.0.ebuild 653 BLAKE2B afcc192b543a7ae2fc9f859943708e40ba36e2e0f260a729927c9d38a651e078995879e3c2cef643b342c35b1d3fe4fa93c8e2b8526579261adc91c427b3a20d SHA512 4c769905c78b7bf5b91c80a2188ba5e29ba91aaca55ceaec0434347858b2fe8d657521382380881ab455c98897bd911ced6425e5749047caadb10a916914b869
 EBUILD ignition-msgs-5.2.0.ebuild 727 BLAKE2B 2e4d124127e3d7af8a935788a2c5310c42aca5cb7fce7c2a3c0c0e9427cff2a7ea8ab3128245a4ddb2f2bcda934a619691ec8ddbf7f9fd6a79189b1d72a2a886 SHA512 8877dc70ac3f0650c521e2fe098625c9c5ef9fe3bdcf7960a840f913d21e630392e22df59590164f5675d036f9f729ad05fbfccad799fc70a26ccc0969f0064e
 EBUILD ignition-msgs-5.3.0.ebuild 721 BLAKE2B 22be3ba2cb7f504bc0428942a0f8df051b9b8ab158ac317a81ab5ebda45a441fd97e7846fb912bb8fcba493ed927f34a04b024643711db4e4eb2d5bb19af9ed8 SHA512 c63d570831eddf989495e8029599598025b6957d262b23f9081971bdaa1839f1201c0b6a94aff736dd1fd5ff624fd7330f743924f6791a9e6132f70d67673805
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild
deleted file mode 100644
index f02677921d40..000000000000
--- a/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Protobuf messages and functions for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sci-libs/ignition-math:4=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-util/ignition-cmake[${MULTILIB_USEDEP}]"
-CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index f438a4658471..ed97df92c2f4 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1,6 +1,4 @@
 AUX zmq.patch 1378 BLAKE2B 4fd868bc3d791e2f17fec392f8cdc5a6ce076b96453c35da46e8717e7274f29aa323dfc1985e819c49b587963b22813d4eb11b685d24c417d67720a7c5e3ac84 SHA512 9128f976e51dd333d856c15f1899955ff4879db229a174839be8e6d8c464cd7e0932c58098bcd1aa2e45fefdf5527bbe8a301306ddc75c022bc1fc0fd4ea9edc
-DIST ignition-transport4-4.0.0.tar.bz2 396662 BLAKE2B cb4c56954ddcd863d60941c43e38624747ca07e6cb5c7404309012dc9d22fb8a053e1113b117a0ee8447e32b6b52318b5b4844a050e4b8c1feccc2de391c46bf SHA512 90facd527e953d3319b4b3b7c5efa610d6c965fcaaf053b8b32039825fccca89c17f153ffec5c0562d4d3d534741f3d6c1a603eb2c75fd5cb217bf22a6d6e503
 DIST ignition-transport8_8.0.0.tar.gz 543654 BLAKE2B 6f4154795d1f4708ad22d19fa573aeafe05710b280ea033d3fe92e50cf7e2426022ea5e98dd3a966dfe9a8b4765fa879050303fe11171a6586294facf7c278aa SHA512 ab1bae994a8676864ceb78b87f2258b8ed22036aed87e815fc22f830edd8b087d1ef0406dc0d053ea823d95b5fb765c4867d27ce5653f1d685001aab0cf0ec03
-EBUILD ignition-transport-4.0.0.ebuild 780 BLAKE2B 66873b9eb374d0775ce5ecbd794504c740a7c10279b35e76df328adc4c697db225f23d8ade9ffbbb08b8df976fbec8c752f477d0eedad6fdbd9084f7ad3c2be8 SHA512 df93993a6794f2d17f2f1c223bb944ce1b6b8eb8c45f865c247ad0bdee9c84b9095cbdb2062e6029a89d0ac0a2e5a9365fed44fec873aa7f0cac0590c0947f73
 EBUILD ignition-transport-8.0.0.ebuild 813 BLAKE2B 6f25224233eac67cd25e873a94e943bc5ff6fae13852cd1b6f0997f773c5abf04833b763921ff1f3d0ee9687483f21f5ff2e8fddc8a4779a5b50fc4c189f6187 SHA512 71d668c92c9b1347a0b2b1444b3a1499065589ea590643f53688c529d2a5c7cf7e8c40f6f78cd2e235da476e4a2b2948ab3f1c7a0278e6d32d4ee24604b2ae90
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild b/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild
deleted file mode 100644
index 90d853fe0fdc..000000000000
--- a/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils vcs-snapshot flag-o-matic
-
-DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
-HOMEPAGE="https://ignitionrobotics.org/libraries/transport"
-SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${PN}4-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="4/4"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/ignition-msgs:1=
-	dev-libs/protobuf:=
-	>=net-libs/zeromq-4.2.0:=
-	sys-apps/util-linux
-	net-libs/cppzmq
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	>=dev-util/ignition-cmake-0.4
-	virtual/pkgconfig"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-S="${WORKDIR}/${PN}4-${PV}"
-PATCHES=( "${FILESDIR}/zmq.patch" )
diff --git a/net-libs/libcrafter/Manifest b/net-libs/libcrafter/Manifest
index 890ec8f1ab9a..ad394b7824f1 100644
--- a/net-libs/libcrafter/Manifest
+++ b/net-libs/libcrafter/Manifest
@@ -1,9 +1,5 @@
 AUX libcrafter-0.3_p20171019-libpcap.patch 1679 BLAKE2B a11d50715c98a087b5a858b3a2205fbef50762e1c553887e3e49e10bca39c88e82dff8110288e97eec3614e38cbfc839f1a2ef93de92495f859654b90daed96b SHA512 9d4e2eb90d74511ca9d192e855e72fa691a725af4db273cae9241d6c19b2340882a7e659c8eba62657ade5aa634f32a7aaa2e00a1ca43a2a1cde67c88743f9c2
-DIST libcrafter-0.3.tar.gz 104051 BLAKE2B 6349c260d32ab6f270c05c156dbcf7cf20e85808ce7b8df8747fa9d6e1d413f96c12ff55b3c227952b348f2654cde81b5ca73753da61a9593c3c1699ed96bd7d SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116
-DIST libcrafter-0.3_p20171019.tar.xz 90152 BLAKE2B 4837a98a45ecdf924a63e916fd2cfdd481624c0cb5b673e0b43eaace328cbcb761ac2d09c50242602730ec2c69ceb8836b7092cbd286c887819db2095ceba749 SHA512 eb53ed641abbce3555f6b7bc3756bc9dc45068bf58320ba0f78dbcefc04cbfe669b12625c81a185fa377bf89e8453b52e0f9bef5c9e1ebfae34bc56eca090438
 DIST libcrafter-1.0.tar.gz 116514 BLAKE2B 6f7adee30b1f7be1bf03fedd39deb53ddc7284934f908ebb056726c31adcaa133405a13c06fa6d35b066992e5ccf24eb971d46a44dcad6932009c1d35fc0c0f7 SHA512 146f34831bf26047be06a0dea406ed0495990fd4256c598b5a4ddea4ab8cc6635dbbe98010cb73ada94ec6bd8be65cdcb3489de7dd9b961711707047f94fb48d
-EBUILD libcrafter-0.3.ebuild 663 BLAKE2B e05dd9b8312201e93436cb91ad135af32143bfa026fe29fe78ec4a2bf6f6c46f11e3beddf2fff850c585a2e52583b852840165390fe6e9d5291a224971cb10b8 SHA512 aeecf9713732f0a28ab57fe8592ba254b45e4fa92239bb6496d834fd6bf90aff672667da01f851698873751949f72eab3729429a7e1ecaafda3c73f8b7df771d
-EBUILD libcrafter-0.3_p20171019.ebuild 680 BLAKE2B 6912dbdf074b622b8deec9a55ebfbbc92a2f54d0153bdda02247f3e28196c7b5ac59333d8a52feaf54ad5b350201613bba481fb54842b87231e884730d445ddb SHA512 663184cfc5ee58d3fd55279bd0ee32ab389c9e29006fb0a605fa98de7f0f1388d12d81091de4833d8e594fef1501819ecb6c6b2be73611383bf7ce576abf9c52
 EBUILD libcrafter-1.0.ebuild 786 BLAKE2B 8db66b1266e2ddd24954f0f0f45e7a3b08fcbb1b931411d272da8d248c2f32bd901cd24ee0e8d232357f64af79270f81154a2b580439f656bb0d23d2b05ebebb SHA512 82d315fceac37eb42a91d752939512d632ab5397337b8ed1f48c5c245fc423113dec8cac90e271abb2fd45425eb59dcaa0305ad6e1f7d7ed5d3537d9317f6fcf
 EBUILD libcrafter-9999.ebuild 714 BLAKE2B 76cbdfbeb1b4c767933d94cf485267911ca2cff473d1af72f235eb8bf2306c1a102986a1744932c12acebeebaf75c67a2805550fdf6afaaf2d9b52c095608422 SHA512 6e732a478998c07602e04053cc438fe46bb11c18b5684e442c061940c999366e4061233bc35e5a2e545fa0b40c6fd8b15619f3eb2d08eceae6c1e8a1be852b12
 MISC metadata.xml 1647 BLAKE2B d6ea5e5df1a27925827497df3022b86f82b0fa5c05e8dc87503b836ade2efb04e0e19b07ccf58b512528ba562caff2be6f14e1d56c5ea0f6040419c708287899 SHA512 6e1ee9e3402a26c3981552ff8fd7193f75dae388fb6d1e59739e1cc4e6f027c995cc68b1984fc13d39d56c152fee6b4b6ee82c9c79f6033627b5e9e0261bdc87
diff --git a/net-libs/libcrafter/libcrafter-0.3.ebuild b/net-libs/libcrafter/libcrafter-0.3.ebuild
deleted file mode 100644
index 45d2b5b2d45d..000000000000
--- a/net-libs/libcrafter/libcrafter-0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="A high level C++ network packet sniffing and crafting library"
-HOMEPAGE="https://github.com/pellegre/libcrafter"
-SRC_URI="https://github.com/pellegre/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-version-${PV}/${PN}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild b/net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild
deleted file mode 100644
index e9f0d9bec4a9..000000000000
--- a/net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A high level C++ network packet sniffing and crafting library"
-HOMEPAGE="https://github.com/pellegre/libcrafter"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-"
-S=${WORKDIR}/${PN}
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index b83d59d4ef1c..1045cbc65a4f 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -5,7 +5,5 @@ AUX libircclient-1.8-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371
 AUX libircclient-1.8-shared.patch 2348 BLAKE2B eea99254aed77d0f9f05968c7d08bd6d90d223d4865a0ed85ce919f1597834cb6430cb732b88e4f40a851f51b7ac1b506a64e1d3836ea0c357ab79786cfc857f SHA512 e61b6c2d56be6cefb4320a93dae96d2fb0dbaf9818246ba1b9be88ab21d3302108d4cfb650cf0db564c50b2913d67ac24183221f2f522eab21097cbbbb37b642
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
 DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
-DIST libircclient-1.8.tar.gz 291803 BLAKE2B 7fcbf8e8466ac95ca5a27475551af45f828b29385b28071d02271deae03d6bbd3589e86efe56b1fe5020be7894e699534ef1e3a2f2fedca1909e4d8e0c04d067 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a
 EBUILD libircclient-1.10.ebuild 1360 BLAKE2B 3091541933889ee79eb321ac1d3dc2d203c6c7082a5cb692c5f73830faf47b8e43dfb5bc511231290c9770189106d0d33df9516266d5b16400a8400f1ed99e64 SHA512 fcc3712deb08af153a3b76e885d59d01e201eb0ec746afa2bf5eed4b4640965005e1c56731ec3fa55b08c5e17a2bd036303bde161aa2acbf363eca1941790086
-EBUILD libircclient-1.8.ebuild 1135 BLAKE2B f28f32d1a8a08987f214ca78c4c53a7108644495a9136b2145c36396a1bfcebf8e205cc69381b261183006ed1beec1f89c39ecb23e5e5d99d22f5f5c209bcf29 SHA512 c638d79b35913a4c095ce6a8b2b7122bed056fa0dd01242837067fe1273181d898970961647afeed42311a9cccfb1c6cdf00f0af4f33b6bdcbe899fa76517d03
 MISC metadata.xml 335 BLAKE2B 9616df0f3f19ee3ece536dfb658a60a9ffb53bed2562086cc5d0f15f27116a86d3ace0c0a796c476045a74d49e803008d9c345ad027f8bdfbb5923e008445268 SHA512 af62ea7ba30a57f3271bded0d53a9122693e992d1050667701ba54bb33d6851b6ddabecf5f54bbdf8aebb212bd3e6a5999a8e8c1b2bbdd6666243ccb24a6182b
diff --git a/net-libs/libircclient/libircclient-1.8.ebuild b/net-libs/libircclient/libircclient-1.8.ebuild
deleted file mode 100644
index ae8c3dd134df..000000000000
--- a/net-libs/libircclient/libircclient-1.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
-HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
-SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="doc ipv6 ssl static-libs threads"
-
-DEPEND="ssl? ( dev-libs/openssl:0 )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-static.patch \
-		"${FILESDIR}"/${P}-include.patch
-	mv configure.in configure.ac || die
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		$(use_enable ssl threads)
-}
-
-src_compile() {
-	emake -C src $(usex static-libs "shared static" "shared")
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install-shared $(usex static-libs "install-static" "")
-	insinto /usr/include/libircclient
-	doins include/*.h
-
-	dodoc Changelog THANKS
-	doman man/libircclient.1
-}
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index bf95f0ca8342..30fd5d13318b 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile.Darwin.in 2074 BLAKE2B a1aeb0fb86fb24f1027c9ad9424b7004dff4c9f43c3e18fb4c5eab6938efa09d8ba9a25951073afe0446f342356cee31ca1345cc45a91f2f1764dd8496723707 SHA512 cf2a9cee280ada8a05d239da0284eb16323bb04985790da0c737d880488a28fc03fe59aa276092681d25a444bc532e57c20ed8f549804f125e9a20cdb3b59f22
+AUX Makefile.Darwin.in 2436 BLAKE2B 63d9ce283549b26921cfd317639da45723ab5129e79dc0df0f4c2fa2489264db1991b6e9b2e76fb04906b85325d171af7dc2bb4f7f880cdb76fcdca76b50cd2f SHA512 e39931c63a20d49f6010dd668132295cfd3e02f39566715448665715ee909de3179c1db496b78261866794cdb21ecb14ccdd505f45aea5d8d0b7b196c344f9a1
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 EBUILD liblockfile-1.16.ebuild 1321 BLAKE2B c3a8776bab522507441537124b0683f3524be3667d57267eb282ffcc7b3a4b8b52c001fb89fffe67a9aec2ad752f1711e3e3e622414642834eb727bd45ca4c95 SHA512 c847a89920ace754d5380d361464ca63538b29c687d124f1c19aecee8ac633878a560e6461f1b108b7fb1c0b08fed093f78e8b517c9a51b502cd9a43f2eeb6e8
diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in b/net-libs/liblockfile/files/Makefile.Darwin.in
index bdd320fe6d49..f466f9ca50e7 100644
--- a/net-libs/liblockfile/files/Makefile.Darwin.in
+++ b/net-libs/liblockfile/files/Makefile.Darwin.in
@@ -10,6 +10,7 @@ NVER	= 0.1
 
 CFLAGS		= @CFLAGS@ -I.
 LDFLAGS		= @LDFLAGS@
+AR		= @AR@
 CC		= @CC@
 
 prefix		= @prefix@
@@ -30,7 +31,7 @@ shared:		liblockfile.dylib dotlockfile
 nfslib:		nfslock.$(VER).dylib
 
 liblockfile.a:	lockfile.o
-		ar rv liblockfile.a lockfile.o
+		$(AR) rv liblockfile.a lockfile.o
 
 liblockfile.dylib: liblockfile.a
 		$(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name @libdir@/liblockfile.1.0.dylib \
@@ -48,28 +49,36 @@ lockfile.o:	lockfile.c
 			-c lockfile.c
 
 xlockfile.o:	lockfile.c
-		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+		$(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" -c lockfile.c -o xlockfile.o
 
 install_static:	static install_common
-		install -m 644 liblockfile.a $(ROOT)$(libdir)
+		install -d $(DESTDIR)$(libdir)
+		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
 
 install_shared:	shared install_common
+		install -d $(DESTDIR)$(libdir)
 		install -m 755 liblockfile.dylib \
-			$(ROOT)$(libdir)/liblockfile.$(VER).dylib
-		ln -s liblockfile.$(VER).dylib $(ROOT)$(libdir)/liblockfile.dylib
+			$(DESTDIR)$(libdir)/liblockfile.$(VER).dylib
+		ln -s liblockfile.$(VER).dylib $(DESTDIR)$(libdir)/liblockfile.dylib
 
 install_common:
-		install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+		install -d $(DESTDIR)$(includedir)
+		install -d $(DESTDIR)$(bindir)
+		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
 		if [ "$(MAILGROUP)" != "" ]; then\
-		  install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+		  install  -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
 		else \
-		  install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+		  install  -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
 		fi
-		install -m 644 *.1 $(ROOT)$(mandir)/man1
-		install -m 644 *.3 $(ROOT)$(mandir)/man3
+		install -d $(DESTDIR)$(mandir)
+		install -d $(DESTDIR)$(mandir)/man1
+		install -d $(DESTDIR)$(mandir)/man3
+		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
+		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
 
 install_nfslib:	nfslib
-		install -m 755 nfslock.$(VER).dylib $(ROOT)$(nfslockdir)
+		install -d $(DESTDIR)$(nfslockdir)
+		install -m 755 nfslock.$(VER).dylib $(DESTDIR)$(nfslockdir)
 
 clean:
 		rm -f *.a *.o *.dylib dotlockfile
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index b83d739a3fb0..af3a16f17ad5 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -3,5 +3,5 @@ AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
 EBUILD libnids-1.24-r6.ebuild 1106 BLAKE2B 6a94bdda1380505cda1129cbafc79431714a425b962b6ac06fca7661c8f036beb01551deef3aebb48c543b2e74d6d0003f28b54c5e532e446bfdce0ed0514635 SHA512 4adc9b043dcd077cab15ad56997900ddf076b51d1f5519c9022838d5417f0885baa43490986cca202e21a94370b71befde01a488451cd06a134ffe3ce987bd7a
-EBUILD libnids-1.24-r7.ebuild 1160 BLAKE2B 3a5e38755f955a94650d554faa6c62fc004438d1111122f53275ede692446bd46639902fc031e3e00fed514ad708e97036230813d3b0c68f0816cfc7cff81e37 SHA512 88f6a0732ce70037dd946dd62e4bea07ca760d24ce0a87a27bf18d253a4837c727088ee45643e6af2aa71113a69ba1c829ece1e93e6cc9909d75f79043cfc7ff
+EBUILD libnids-1.24-r7.ebuild 1159 BLAKE2B f5426afc5e125d8a8387ba0efe89269fd109fb1597960ba1755a8a4d4cdc10e7812bb717fa9def3a2cd025365005ea5754cca4813d8fe222b92b0a34d9dd3473 SHA512 dc395fc7a015c0428a2ef847f939294141560759d03359cbf7a96efe74e2a12f8d11be9111b51098486842d412bf6534fba433db78d45928c101754caaa45f9b
 MISC metadata.xml 688 BLAKE2B 1e9f6acc429a683a0aa1b8e14d0f2d9b03cb004c387b0b8582f8056c767af6511ff480f895d715169ceabb4c0722136e624d853819a2ea48f1fe8a6cb77829db SHA512 c70e24c21ba36ff9acff4d4b4290c8087a56e082ca520a7aabf7f0ffca5f03ee49f1bb5ac093304a2cb744241ad749e39022fce7c1a20c28ef08b65da911791a
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r7.ebuild
index 09d5cfe6dc05..2e9dbb9cef34 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+glib +libnet static-libs"
 
 RDEPEND="
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index 459e8d2c6cb9..7e769501692c 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,6 +1,6 @@
 AUX libpcapnav-0.8-includes.patch 395 BLAKE2B 6904addab4a42d233780616364a4603bf691133313614d3f3b36a4b736aa1acbe77d07f0f7751e7069fbadc1e1c87bcf6086b1cde574731dabf0a9a4cfe243d9 SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c
 AUX libpcapnav-0.8-noinst_test.patch 609 BLAKE2B 191f9d223334160d8c3d904fe2540f44edbc65f83c263e8f90659ab9b92cc42a7f6addf60914d20bc77d13dda9e9cf500fa2bb03876ec8b9989af8682d22c19c SHA512 f3797711b665d0d094e1c814fcca5c761a51628bf0c807a6caa1a76e6cb06f06b74c741c010e05b84f1f39e61672a886519c81ceb2875101c5e28187633a67fe
 DIST libpcapnav-0.8.tar.gz 387476 BLAKE2B f3027f17307a76fe6baad6fc79ce054726def17c834b814a07c628f8420fe481e661d72e72d7b3dde494ca17b2e36abba3a27d02f68924f88c2a89d57fae8b44 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18
-EBUILD libpcapnav-0.8-r1.ebuild 929 BLAKE2B 24ee8a944d01d803852b8df77179f8837c566bcdbe2ecd954d06abf15c6c514517f0ada8764ceaa68dd8e996b9d0fe925d0c480b2c5287a4e55716a31ab41cd8 SHA512 19bde6af83439cd76e21978ec9cb76d041cb133e2ddb1283d69cca618dacc77b121490bc3f071270331acd97f5f6f6a9355a4a4b387faf24b90c1cb7cbd9b5ae
+EBUILD libpcapnav-0.8-r1.ebuild 928 BLAKE2B 86c066397db0ee43b8066edba7358dfa30437cde98131ba0868ec842fdd775899f0e3f226c55862b8416b309e7217fa7832f890efd409ad7c14dae874eb4f3df SHA512 5c7004f0afe4dea863509dc060d2bae387f95b1a7c92f394513d9fb4a054e7e9e9514817e6c56bb0b981b71f96eb9fff3b3b99633b7df54dd6b0e21e4d26834d
 EBUILD libpcapnav-0.8.ebuild 815 BLAKE2B 1b7df5b4e754936e84f01d8850a5b70dc8762a26290bb217ffbb319aab02a8c3d359095879308d723dc840dd16d8c79771528dcb97a0c893888fa2bef095ea12 SHA512 f39d670d58f9d0072a35a600f950323d13523b7291fa57d97f534342987483743d7d05152cbc7baf64fef52cc916b17e5bcb5dbcd891bb7f7e3c0ff3b98068c3
 MISC metadata.xml 357 BLAKE2B ddcf544a7ae28909b7fb7810c0a6bb368099397e2bf7d6e68a2475c5d701d7589aacf0a15f76f00f68b623a7b37c46d60a5faa3c92f1ac73eb2d99fa29b48ccc SHA512 9cf449d26b416d995b8371fe2e6aed6964080b8b84bf0ceace749ceebd4ddbcc8b3d7d9c1d8c2a07a4c7cb880492ffc8b34ad31b4602a646e004f3aaf52f3ae8
diff --git a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
index 4ac67c9e2d31..a7d6c94bbf77 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index cb410af82617..de81814db3a0 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,3 +1,5 @@
+AUX libslirp-4.3.1-bug-756910-check-pkt_len.patch 1404 BLAKE2B 6e9d046f5f25bbdb574534cdd26ab69c708a56893336a09a7e146d654c4e74af338ad178c0067662e696453930f627117f386f8d99d20a555b28452e309884b4 SHA512 2ebf8293aed6c09c1a03123e5b3acca602ad1fd293653f093e1c69d691e2d4db15c1f9d10262fc0e5019771f81e1812788b6e5234a602f13b3b73172d6f6419f
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
+EBUILD libslirp-4.3.1-r1.ebuild 943 BLAKE2B 07f2a7fd3c2f8f7e006d20753ff857d76e9660b42ffe415493bd49f798288de514f21e8b318a21bb2a35b9efa2f4e3a455b7d49f3137ed26688081716510ed01 SHA512 cdc7cec91c6b67abed1f8c6437eb18853241e950cd097898fd169b1092b9d5f3e977dab033a0b8071dc4132012c1083cf68546d932064ccd442d0a0a07c1602b
 EBUILD libslirp-4.3.1.ebuild 865 BLAKE2B cf25ff2e27f4220eba664b17cf08f300ee0e83c27a5c314944d0dde730d3dac8ddc8e4a2fa0f20cb90a635d262411f186ddd38b951c148ac54257f7ef2199ac8 SHA512 1e8701efac9726e608f6a42db0420a05be3e9654ac0c44610d6df6be74a1146d65cd32be97af2afba959482995d7fcb2cbd15012e009167fa17eb7282ba66a7a
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch b/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch
new file mode 100644
index 000000000000..aef7f19ba13a
--- /dev/null
+++ b/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch
@@ -0,0 +1,48 @@
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 26 Nov 2020 13:57:06 +0000
+Subject: [PATCH] slirp: check pkt_len before reading protocol header
+
+While processing ARP/NCSI packets in 'arp_input' or 'ncsi_input'
+routines, ensure that pkt_len is large enough to accommodate the
+respective protocol headers, lest it should do an OOB access.
+Add check to avoid it.
+
+Reported-by: Qiuhao Li @outlook.com;
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+---
+ src/ncsi.c  | 4 ++++
+ src/slirp.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/ncsi.c b/src/ncsi.c
+index 3c1dfef..75dcc08 100644
+--- a/src/ncsi.c
++++ b/src/ncsi.c
+@@ -148,6 +148,10 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
+     uint32_t checksum;
+     uint32_t *pchecksum;
+ 
++    if (pkt_len < ETH_HLEN + sizeof(struct ncsi_pkt_hdr)) {
++        return; /* packet too short */
++    }
++
+     memset(ncsi_reply, 0, sizeof(ncsi_reply));
+ 
+     memset(reh->h_dest, 0xff, ETH_ALEN);
+diff --git a/src/slirp.c b/src/slirp.c
+index 9bead0c..abb6f9a 100644
+--- a/src/slirp.c
++++ b/src/slirp.c
+@@ -860,6 +860,10 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
+         return;
+     }
+ 
++    if (pkt_len < ETH_HLEN + sizeof(struct slirp_arphdr)) {
++        return; /* packet too short */
++    }
++
+     ar_op = ntohs(ah->ar_op);
+     switch (ar_op) {
+     case ARPOP_REQUEST:
+-- 
+2.28.0
diff --git a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..90da793ff230
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/glib:="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/libslirp-4.3.1-bug-756910-check-pkt_len.patch"
+)
+
+src_prepare() {
+	default
+	echo "${PV}" > .tarball-version || die
+	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 51778ae5aeac..95f989875491 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,5 +2,5 @@ AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c88632
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
-EBUILD libsmi-0.5.0-r1.ebuild 906 BLAKE2B e988d297362fb886b53d1f235d4d15533c41621835764ce988aef72fcd0bcf298ca57ae3400028acaf4d2c4823b11110a38efed09b0266623c082064c627ced0 SHA512 64780231b4a57d297fed70d8d19ccbed7d69453cb0faa894128474076e0598639196ab44d8d010fd6ed179f0578b294348b948528023657d4981d413081ba1cf
+EBUILD libsmi-0.5.0-r1.ebuild 905 BLAKE2B 2cd8359a14b69a6573d95a8682e40285e0bd748f111a1b39292681023f33fa0c59599da4e6d9ab91fdba75a38c15809ee4e42a076d13471f96b148b8b4371818 SHA512 9172f6d7ba549fa75cfc241ca7f075f908bb83a9b6b5952efe94bdd0e7ac92f547e76a204d3fe345483fceb9efe204cdb7aefda14b110d76d010109b54e32ebc
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index 6dfe3c8358ec..b7fd8832d139 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
index 261b559dfada..cddd6f1bfa59 100644
--- a/net-libs/libtelnet/Manifest
+++ b/net-libs/libtelnet/Manifest
@@ -1,7 +1,5 @@
 AUX libtelnet-9999-doc.patch 1317 BLAKE2B 07293a3658b80cccb147a75279ae7f6b9843101a0414233db33d8e4a2b6fd47283dd35a69942aff2f52775c359b5acf67f739434d5161ba13ed84eca62c95c45 SHA512 de7aef7504a3243fe01bcc11a78bc274f8662dc6fa472a1b6ab8fb84a1a518491d2343e4dd9817e6dbb0ba67fbd68406fd85ce4d1ae6e4e6469b3f71c3594d99
-DIST libtelnet-0.21.tar.gz 240486 BLAKE2B 24765fde2344f11050c17d14721c5dd2513b3f4c7f3a3494acf068d9c6b799464f07eb0c26330c9ceea962347c626cd88746f22289c04b4ec5d555d635322b35 SHA512 69dc0ac4741c81d932136cd736b48a11a05cd2738da6255d6050844f50a2f16c575c747e5c758bbdbc6b1e3309ce02e4979f0002b40fed32a3711aa8f22e04f1
 DIST libtelnet-0.23.tar.gz 241922 BLAKE2B 0436c3eb2085c0fc4262f30c86f634af33679a2381a54dbfe92e6f6196b825b100c9c35f78505191b7fea5360a16d9b960e35ff145cd177aaab50968b2fbe946 SHA512 da16a97d04bc6bb5959f431e0aaa03d08ac38e45ba870d7fe6161551ecfdbd5c37a2209cfb40a0f574e6ea0b5c2866c7461cc91d940d5bb5de09fe1584eeb780
-EBUILD libtelnet-0.21.ebuild 640 BLAKE2B 59300116081387118b5dace72ece43f654588e95003bee96c040a6169c50a1c5f41d8c1cfa8aecb2a8ad3b001d9bd43aec65bd61db70eea0d46afbcb2599191c SHA512 7877506c4ba6671f497c77dd15acf7a0f16d42bd843b27b509193007285d9ccdbb3776f889d243ea040999d2fb37349588661ce56f19e29a98d15fc24bf58775
 EBUILD libtelnet-0.23.ebuild 525 BLAKE2B 29c0e2acc438660d3316afc8978575ba453fcb274f7fba788690ae16154e8eef50ee33e44204e6df847363c670faab9567b7acde201e9f2f1fcf0704d4f743d6 SHA512 86b5b05952832d2852a7be52ee039195a8d0952b11be32ebdb152817777173e4676f25ca16c787a28955d662fba79e800d929c90c11792b0378bff2f0a0a437b
 EBUILD libtelnet-9999.ebuild 670 BLAKE2B 8548e2c2c2d138c94586f3b1874a047cad412522456678674595b659ab0cdb54a5cec709e4516da1c3f53628b30c05adcbd528f4f1fef147934288e600f590a5 SHA512 a680d12564f83bcbbb7e7ffa1bf6c14a2ce80465c1cd7a4db658b05ddf6987184ae68599fd64dbf9fc6cb7b4ddd67793058f4fe7b1c2c91e734823306d9d1c1a
 MISC metadata.xml 352 BLAKE2B 35d61ac47c3cbe79d89b33487dc05c167799f4352f2a339ba47054c0f27a135745bd6f24d6b77fe13491395775c1f05878958f7aec11c7d70286f74370e714eb SHA512 8e0b4ff5329576c1b209652dee6e5ad1717ae7d2c9938c570d12641e9d1eea9769050539f73b5d6074290e6a95f87de96c054b5a3bff830ef237e5e6b1208f3b
diff --git a/net-libs/libtelnet/libtelnet-0.21.ebuild b/net-libs/libtelnet/libtelnet-0.21.ebuild
deleted file mode 100644
index 758f7e176b20..000000000000
--- a/net-libs/libtelnet/libtelnet-0.21.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
-HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
-SRC_URI="https://github.com/seanmiddleditch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-WANT_AUTOMAKE=1.11
-DEPEND="${DEPEND} sys-devel/automake:${WANT_AUTOMAKE}"
-
-src_prepare() {
-	_elibtoolize
-	eaclocal
-	eautoconf
-	eautoheader
-	eautomake
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.a' -delete || die
-}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 64b2c89d9e9a..7cf083006144 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,6 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
-EBUILD nghttp2-1.42.0.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
+EBUILD nghttp2-1.42.0.ebuild 1998 BLAKE2B d5db11f1afac81618eae5d83c81bff6d9d4e2fb9006cdb6d5abd17caefbf18b6c025437ebb17dac40568fbe3b63ea5189622dbae25d0fc1331c6338c4c3b4575 SHA512 4ba3fb08741e219b646afda506ebe958248cdbddb3c7b3878182e3961078882ae8d6e231172ff3c0809c7932331aaff2d147b4195a976fae26ea9f8c1065c2fc
 EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.42.0.ebuild b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
index b43a0d325068..ee4707056e7a 100644
--- a/net-libs/nghttp2/nghttp2-1.42.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index acd81099947d..7e026f4f880e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,11 @@
 AUX 2.28.2-non-jumbo-fix.patch 1675 BLAKE2B 13541ce6392f921663dd8af6d8093e9de8b02e7d9e82cc7e06b7126e36d9c060f2342b57985bc7a5d1fa52c4d2203cdf7164a87af60ad9872bc6d12b7e14b435 SHA512 51da3680d873e7ee435a4a4bf0d23171a4ecf80fc3ea5ce60c71a55db2cf090754a4ed0c0a5297995f3729928d31541bab9528695c557c0c309338a7a75439b6
 AUX 2.28.2-opengl-without-X-fixes.patch 1656 BLAKE2B 85b825f0138a40f6647ceba693dccf644a1f86b9c57cda2ee8d6999830ad0bad13456aadf32c6789dafe7531b53f63644d5214b275159c3fce103b262a950461 SHA512 93cbbf092d9953c176bdcfc384e83ec276af35aa9c7645088a56d5c18934712d93aeee7e4c6111e1eb816b54d290ae6b23030683f81bde0f91c3ba3ff440f85b
 AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1b1b3aa257181f026ceb6b6dfd602679d1add974d6930ba2033643cd9cf8bbb3fea0bf87ec85f769d55de5635d6828 SHA512 78c1426f34dacb65090356157963ae0be4a59c4c7905cfb9a59cc5cde766d2931b68872cb55369a74a871f88f4244f3db8ef8d30ee74d8e75acaaa8893ce7989
+AUX 2.30.3-fix-noGL-build.patch 1005 BLAKE2B 644b114779d34f644168e3cd1e4fcb5827bd39afe3c0f6a615c7ac9ff36b74d9a4ed34b7d91ff9400fd5acaa4d9321c22662d8625a7510a2c6ae411d6bd4c593 SHA512 15cc427a6db3fb32f1951d1dbb39b5d869601be916179d17dec244e80cda16814598271667e2cee75d367e596c470bb8c837abc7651e65ab19305c9b9fbf0002
+AUX 2.30.3-icu68.patch 8277 BLAKE2B 7bb5a2d15a1006b7248a6a6fbde0a2e71df1aa4c02046e9c91fcb44ba218fc2e6d6655d53f478eeef3a3d77f4bfe35728155c524332841c2692ac165af48524a SHA512 02000d2759a599596946912e45978334eba0827c691ab4dfd313a7cd5fd71e148a59fd4cf61d9bf9a102a1a5922da5b4e473f03f46930f9e7dd6dcc36dc7dc95
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
+DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
 EBUILD webkit-gtk-2.28.4.ebuild 8914 BLAKE2B 63f6e796093c76450cef123857e6e65205bd66e5161d380d7ac577322eccf280066484be31c47196762065c5285911e678b1d5a39ae5eec7e839a13cc19208b2 SHA512 ad5521cbb22a5efe8cb055d5e966bc155d290cc1c8a0edf66e569025d0c1c4ad04c5b88f33b54662bfd587e3e6c412ca955f0c4d09fe1d6e0f66fe545892f76f
-MISC metadata.xml 482 BLAKE2B 4ddea1fc3fdb0a18e8b6d04197bf34d93b596661d2b3ba563ea0bcf72f1a7db6529caf75f9ff301fb8d21037ebe44541294888f9a5b1d3b00b6fa5950a0c7243 SHA512 c0c614c5141d24a8b280973aa56364a8b451c88b35b4fadff111c232a6b7cad11e9273658db655d68cccc9fc59bb1158e98f806ab02d13896a67aab31a5b43e3
+EBUILD webkit-gtk-2.30.3.ebuild 9211 BLAKE2B 4f124fd6a434aa644fef3b6ee27b261e43630fc051f4e5f809f1b434cda9584ced3ea7cc808460beffbfe3d730beb62689c812912ac10c6dc3ddd16d4da08c18 SHA512 e8d324a49fe5ff6d71f43429fdf3490e754d4fdafed872d027617b3456862e82ac0a7ac904a86f7d0576522dd97ff2074966c9936e532779ff09930808f7e515
+MISC metadata.xml 575 BLAKE2B cfd9e50e79d0627b50f7eb968d0590a88afe55ee5ebccbd81bd5337fd2ea06355a34db909c18f53a388bd3c1d09d82c805284f7db43b71549f29124a5e0cfe39 SHA512 d7b45d4ac89607bfda20a30070194ebffce990784ad376739687680a08e203f570d5636224c37807bfbdca03ab9a3c745c7c41f4e632678acfa2cf60b4eecd30
diff --git a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
new file mode 100644
index 000000000000..5e9f42677314
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
@@ -0,0 +1,27 @@
+From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 27 Nov 2020 22:47:30 +0200
+Subject: [PATCH] [X11] Fix build with disabled OpenGL
+
+The added PlatformDisplayX11::visual() method requires symbols from
+X11/Xutil.h, which wasn't added as an explicit include with only
+EGL headers indirectly pulled it in with standard build options.
+---
+ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+index 8fe3d3e92c88..2b2805446aad 100644
+--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+@@ -30,6 +30,7 @@
+ 
+ #if PLATFORM(X11)
+ #include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <X11/extensions/Xcomposite.h>
+ #if PLATFORM(GTK)
+ #include <X11/extensions/Xdamage.h>
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/2.30.3-icu68.patch b/net-libs/webkit-gtk/files/2.30.3-icu68.patch
new file mode 100644
index 000000000000..33116feea75d
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.30.3-icu68.patch
@@ -0,0 +1,179 @@
+From a5f1691b5b885dd228018740803075e7b6059e4b Mon Sep 17 00:00:00 2001
+From: "stephan.szabo@sony.com"
+ <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 3 Nov 2020 20:06:15 +0000
+Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and
+ TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+Reviewed by Don Olmstead.
+
+Source/WebCore:
+
+* platform/text/TextCodecICU.cpp: Replace use of TRUE with true
+
+Source/WebKit:
+
+* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
+
+Source/WTF:
+
+Replace uses of FALSE and TRUE with false and true.
+
+* wtf/text/icu/UTextProvider.h:
+* wtf/text/icu/UTextProviderLatin1.cpp:
+* wtf/text/icu/UTextProviderUTF16.cpp:
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WTF/wtf/text/icu/UTextProvider.h            |  8 ++++----
+ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp    | 14 +++++++-------
+ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp     |  4 ++--
+ Source/WebCore/platform/text/TextCodecICU.cpp      |  2 +-
+ .../DrawingAreaProxyCoordinatedGraphics.cpp        |  2 +-
+ 6 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h
+index c8f28d6ed3da..3c6fbeab6a5c 100644
+--- a/Source/WTF/wtf/text/icu/UTextProvider.h
++++ b/Source/WTF/wtf/text/icu/UTextProvider.h
+@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
+index 0a646b7f390d..49980f95ba79 100644
+--- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
++++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+index 69c8d091bd62..9c3fa709200a 100644
+--- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
++++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
+index 19b41eb7125f..2f7d1930b8d7 100644
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const
+     UErrorCode error = U_ZERO_ERROR;
+     m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
+     if (m_converter)
+-        ucnv_setFallback(m_converter.get(), TRUE);
++        ucnv_setFallback(m_converter.get(), true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
+diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+index 61e3f6050d7f..5a51b9ec1d68 100644
+--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
++++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor()
+ int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
+ {
+     monitor->didDraw();
+-    return FALSE;
++    return false;
+ }
+ 
+ void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 24e8c4e03393..3e6a3fc0ecd3 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="egl">Enable EGL support</flag>
+	<flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="jumbo-build">Combine source files to speed up build process</flag>
 </use>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
new file mode 100644
index 000000000000..42baa21fdab9
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python3_{6..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PV}-icu68.patch
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake-utils_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	WK_USE_CCACHE=NO cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index bc1bdfd1e2ff..b25614452fc5 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,9 +1,3 @@
-DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
-DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
-DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
-EBUILD zeromq-2.2.0.ebuild 1202 BLAKE2B d7305176ccb01d706480c012de123b16eacc7bae10916377bff524575ecd4a174cab2112fd1a1b20e3465f69d400c5d3a02f3ba8b30cddfdd75f01093f82e935 SHA512 ab6b64d7b0abc80e03241fc26bcf87e753730b9d6bdc52ad09578d83124b7acc3b49aad2bdee662cd99a4c6e26c19c2b49445cf5d60a6b45cb74452502f4c2a1
-EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
-EBUILD zeromq-4.3.2.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
 EBUILD zeromq-4.3.3.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild
deleted file mode 100644
index db91e7132d1a..000000000000
--- a/net-libs/zeromq/zeromq-2.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTES:
-# 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs;
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance"
-HOMEPAGE="http://www.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="pgm test static-libs"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!net-libs/cppzmq"
-DEPEND="
-	pgm? (
-		virtual/pkgconfig
-		~net-libs/openpgm-5.1.118
-	)
-	sys-apps/util-linux "
-
-src_prepare() {
-	einfo "Removing bundled OpenPGM library"
-	rm -r "${S}"/foreign/openpgm/libpgm* || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
-	econf \
-		$(use_enable static-libs static) \
-		$myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README AUTHORS ChangeLog
-	doman doc/*.[1-9]
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete
-
-	# remove useless .a (only for non static compilation)
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/net-libs/zeromq/zeromq-3.2.5.ebuild b/net-libs/zeromq/zeromq-3.2.5.ebuild
deleted file mode 100644
index 2d97ae7df61c..000000000000
--- a/net-libs/zeromq/zeromq-3.2.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="ZeroMQ is a brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="pgm test static-libs elibc_glibc"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	|| ( sys-devel/gcc sys-devel/gcc-apple )
-	pgm? (
-		virtual/pkgconfig
-		>=net-libs/openpgm-5.2
-	)
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND=""
-
-src_prepare() {
-	einfo "Removing bundled OpenPGM library"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-	rm -r "${S}"/foreign/openpgm/libpgm* || die
-	# apply effective bit of below commit to fix compilation on Darwin
-	# https://github.com/zeromq/zeromq3-x/commit/400cbc208a768c4df5039f401dd2688eede6e1ca
-	sed -i -e '/strndup/d' tests/test_disconnect_inproc.cpp || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
-	econf \
-	  $(use_enable static-libs static) \
-	  ${myconf}
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	doman doc/*.[1-9]
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# remove useless .a (only for non static compilation)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
deleted file mode 100644
index a35a1e964c01..000000000000
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	sodium? ( dev-libs/libsodium:= )
-	pgm? ( ~net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
-	!elibc_Darwin? ( sys-apps/util-linux )
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	pgm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	sed \
-		-e '/libzmq_werror=/s:yes:no:g' \
-		-i configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable drafts)
-		$(use_enable static-libs static)
-		$(use_enable unwind libunwind)
-		$(use_with sodium libsodium)
-		$(use_with pgm)
-		$(use_with doc docs)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Restricting to one job because multiple tests are using the same port.
-	# Upstream knows the problem and says it doesn't support parallel test
-	# execution, see ${S}/INSTALL.
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}"/usr/lib* -name '*.la' -delete || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-28 20:40:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-28 20:40:51 +0000
commit	9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch)
tree	47c9d6e4243f39a1f48afd54c969b65b00a5c649 /net-libs
parent	d934827bf44b7cfcf6711964418148fa60877668 (diff)