gentoo resync : 25.10.2021

22 files changed, 466 insertions, 23 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f982ec10072e..0193739f5b76 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/NativeThread/Manifest b/net-libs/NativeThread/Manifest
index ac4f47f2eb64..96acb7b17093 100644
--- a/net-libs/NativeThread/Manifest
+++ b/net-libs/NativeThread/Manifest
@@ -1,3 +1,4 @@
+AUX NativeThread-0_pre20190914-javah.patch 625 BLAKE2B af0d85e2b477e40c396313e779034c5bed20b42db50a936c473ad4cf15402ed7033c21db5435a44c8d6da67908121408bb18f062d2c321a0ee02cdbb7acb4460 SHA512 51bfb693850da086a118e4bb34da36856be13556bdf15f5374bb4df758e7479fe7988d36c02d8058eac40bbd59daec506fbb08cba270fb942c554b449c6f11af
 DIST NativeThread-0_pre20190914.tar.bz2 3163 BLAKE2B b16aa3ceb3ea18ea13962e53d68fa2eac1854b9141055de251eedf0c9a2cc284e68f3f2601f49d1ac1d7fcef9fc502bf1877161fdb43b1b941a3b9983829e4a9 SHA512 ff0902b874c72f0e15f35374d0a409271ba236343cf24bc708bc7a72677a9a582013bfb7a1e8fdd2aabb741bb5dc04dc901ff4c09841a85324194644d40c58e6
-EBUILD NativeThread-0_pre20190914.ebuild 585 BLAKE2B c9d7b1ed765f9d8f2a638ffec5957337800d07354f3d4713ca836027c22f645b432878622cec0ff16aa1745cce6b0ab27903da63674f7eeff2819fc1791cd368 SHA512 cfcb0b6a5ee8d952f6825304f84c9ddd29d8436540494f43396073703edc99ac2a41aae7777153623b0c5ad9f28cbb36a83201091e3ea64e9f149e1c589b16c7
+EBUILD NativeThread-0_pre20190914-r1.ebuild 702 BLAKE2B 2802c599005ea90f31820926a544b9d61347b4314499c922115a11190b554f3dc14ca27686a008bbda80bd00b01d79fbd65ba26cb159e1096d7b8e98742b149a SHA512 e956ee4b37dfe60d8f785822608f028b0310eff9a4d27164cb40f46f301f894dc26fcd8045e1bc1be96758248ac1fa871bfcefde3bc06f41efa2660b941d4273
 MISC metadata.xml 257 BLAKE2B 1855912d4ff784d04c925a67130a53838386bd4c491e5c5cf4f218c2a79b538cd9d0d2c79c124832707abeeeee027d6d7a93f1d057e3262e1890084453e2b9af SHA512 dfb4a09792ec2d2b185d1131473c28493b9a3e28aa41f5cbc91354c793c3cc11c763886115037257651f3d6689436396840b2d252a311f318901c94dccec4b9d
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
index 7d89a6bca773..1156f64a3ad3 100644
--- a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
+++ b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
@@ -1,24 +1,35 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic java-pkg-2 toolchain-funcs
 
 DESCRIPTION="NativeThread for priorities on linux for freenet"
-HOMEPAGE="http://www.freenetproject.org/"
+HOMEPAGE="https://www.freenetproject.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=net-p2p/freenet-0.7
-	>=virtual/jdk-1.4"
-RDEPEND=""
+CDEPEND="
+	dev-java/jna:4
+"
+DEPEND="net-p2p/freenet
+	>=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-javah.patch"
+)
+
+src_prepare() {
+	default
+}
+
 src_compile() {
 	append-flags -fPIC
 	tc-export CC
diff --git a/net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch b/net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch
new file mode 100644
index 000000000000..ceefc8f36d70
--- /dev/null
+++ b/net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 0a879d2..b0b45d1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,8 @@ libNativeThread.so: NativeThread.c NativeThread.h
+ 	$(CC) $(CFLAGS) -o libNativeThread.so $(LDFLAGS) NativeThread.c $(LIBS)
+ 
+ NativeThread.h:
+-	javah -o NativeThread.h -classpath /usr/share/freenet/lib/freenet.jar freenet.support.io.NativeThread
++	javac -h . -classpath /usr/share/freenet/lib/freenet.jar:/usr/share/jna-4/lib/jna.jar:/usr/share/jna-4/lib/jna-platform.jar NativeThread.java
++	mv freenet_support_io_NativeThread_LinuxNativeThread.h NativeThread.h
+ 
+ clean:
+ 	rm -f NativeThread.h libNativeThread*.so
diff --git a/net-libs/libmirisdr/Manifest b/net-libs/libmirisdr/Manifest
index 536ffeecf67e..2f162c8ce7e2 100644
--- a/net-libs/libmirisdr/Manifest
+++ b/net-libs/libmirisdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD libmirisdr-9999.ebuild 559 BLAKE2B 431fa6a5a6ab8820246da0703a1bfb3b8520890a98ead1d046c17c4bdcf2981a2d5baa0ce8bdc98712c5389da1dd4f859091ac1b4145c5a408c112d597153041 SHA512 601028c89afdae89d2419ef6d2bf305748a303e9b35e4a2629799b4e12ff481113ffbcd49a061425909647635197c4cb88ec9d646dae1b1caad3eada97125a24
+EBUILD libmirisdr-9999.ebuild 533 BLAKE2B a755119aa10e2e35e87427cf70a01c51e556338ff2ff3449d4a029fb06f0729aa00b06d059eca8caa5f74cc30a9ce06d02fd866f371578070c9e92c55813c4b9 SHA512 cf2ee6aa2579d7de0d17aeccc2807a554653217d680349e62b9fc2246d352affc8f248a7a0e60ff654f50ce77b05ae5757158b6ec40f8f9a0a0718f2cbb259c5
 MISC metadata.xml 335 BLAKE2B 4a59f01a0e3aaf3293297ab368ff1438eb9d5e5bae3edfbbb1dd9f7191ccb47e9c504fa318a1a54752bbcf507f33c96d8808343f6f77a7de7a8c1fe1d84146ac SHA512 443b02d3f3aa162d3a176ffd081f6e0ff3bdd3276b48b817a03da2f43ab360b2db99add599f501ba1efcb47a12b30cf64587c5d307dc9c3583b46265150ba2d3
diff --git a/net-libs/libmirisdr/libmirisdr-9999.ebuild b/net-libs/libmirisdr/libmirisdr-9999.ebuild
index be4afd7f3f97..8d31071e499d 100644
--- a/net-libs/libmirisdr/libmirisdr-9999.ebuild
+++ b/net-libs/libmirisdr/libmirisdr-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils git-r3 multilib
+EAPI=8
+
+EGIT_REPO_URI="git://git.osmocom.org/libmirisdr"
+inherit cmake git-r3
 
 DESCRIPTION="Software for the Mirics MSi2500 + MSi001 SDR platform"
 HOMEPAGE="http://cgit.osmocom.org/libmirisdr/"
-EGIT_REPO_URI="git://git.osmocom.org/libmirisdr"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmirisdr.a
 }
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 206268b30481..9d643833a3bd 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -12,5 +12,5 @@ EBUILD libtorrent-rasterbar-1.2.12-r1.ebuild 2677 BLAKE2B 83ead7b61a014810584e88
 EBUILD libtorrent-rasterbar-1.2.14.ebuild 2452 BLAKE2B 9dd020ba7d4e24b43611777065774c9db30e6f6f30ec1201c749cf0e4d980a37079fefd38ce955e6f72fb85e766374cd848059506c8d89ea43fd4d727976c5af SHA512 99dbf55575981dc2c3d951f515bd89703ee5dcf60b2fcb92faa4fb5712435cbcf5e2fc0304e7fb891db2130eb0e9f5f65875bc1f22e1b7e212dbe8857d7a47ba
 EBUILD libtorrent-rasterbar-1.2.6-r1.ebuild 2440 BLAKE2B 0c36fbc1882e4f115de629bf842ac1f05378866db3a570e75e7bf2c5da99d663594c2893d7e914b5a8079668ba2f5c89b9c64cb91d93e1c1523cd37dd9eadb52 SHA512 87a88041183f8e5bf981ad19a941951c6341907f1396c0f1a1add6ce00337f57ccac51e0260bb1fcc5623386a990d6662af580242e5384ee270e51a5ba22075f
 EBUILD libtorrent-rasterbar-1.2.9-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
-EBUILD libtorrent-rasterbar-2.0.4-r2.ebuild 1511 BLAKE2B be2686a64a4e1aa713e8f34943f4dafbb7ab8eab035ad81d25fc5e69e9f74279216497c15357ce1ad5356ab47a2a9471b81a4ca5cbf360c0d4d6b7c9d9121b92 SHA512 095466c72a42123093078efc78e8c54cb0262184857f959276147906fca6cb9e78beecced02dc42026ab1c59d09c984ccb228b586eb3dfbfc311e94a36cb5388
+EBUILD libtorrent-rasterbar-2.0.4-r2.ebuild 1509 BLAKE2B 7cd8782853ab7ab90988ad1c1dd871f3a1a3d56c3b7104d7c0bec8adf221d0167dcbaa6d906fd6c7ce3a543ce2b8dcbc3e358ae421c9d947a6bd29814bc700ae SHA512 6d2012c2633e5723495e1822c194d620089ec6d7f1b666cb45fe46ebd508d104c9d50636dffdeff0032018e02bb53e30113e3dda77c3e894fe9ddd359b762a7f
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild
index 3538983c205f..a90461c46c84 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/2.0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="+dht debug gnutls python ssl test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index afa49053c4c9..46ee2144695b 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -7,5 +7,5 @@ EBUILD neon-0.30.2.ebuild 2637 BLAKE2B ca7d46b167c16691eed84c4fa6f20a8b177b5f74a
 EBUILD neon-0.31.0.ebuild 2645 BLAKE2B 1fa391bc79023f61977c500cc1dba20482332eaee623632e92c6556df3d256c4638ccaa642ff4561b4572aecfb92cb73c9ce27b77e212d56c923beeef15d04cb SHA512 353a070a4ef590388e29b91442fc30c6ec1be79289765d53afc190d4d89ccb26034b076cedde1bf27c492a43b534ecda7e584f918141bb510516a1d4860e8823
 EBUILD neon-0.31.1.ebuild 2652 BLAKE2B ce07b714de82accd30783ae03fd9243c41adbaf8470891f7a37301b5eafc5a885ee5beee4f2dffe2cad34c966306ba68a1e4b4a4d0b0ae76a107a7b74b8e6194 SHA512 7ac1d4a62ddde50d7406d90760aeccbe68ff4cd36a2933faddecaa20724c904c9d4a007810b56632a63e2fd7fc8aff014755c3019191f52ff44aa97d3bd1ad10
 EBUILD neon-0.31.2.ebuild 2652 BLAKE2B e718aeeb582f1d0ea1fb0460dfdee36bb29241a22848ff5cbe4831a6ed9b8b909098583e228c3c2d9ba33199999b3d2a322ae58915d48a542bf4e0235031c31f SHA512 5107c9be940005e1bff5b20bdf878b96c0ee94817812139f5f7c3875020c64731eda7a22221b0519b769936143d868757849314ba48403e1140ab0402e69582f
-EBUILD neon-0.32.1.ebuild 2659 BLAKE2B 12ddb943cf242102ea63abdf9c87fbd46d46ff37384d720f8db4b007cddc7d9c197705d5ecf8a02ac03a812a536f25a4347a2c4224afbb70d09132beded72b79 SHA512 19516eadbacb0fc04b5bbd12a66b4ed563bcf25232c2210323d8cb5250c8d7d273d3d86c38263832876cbc4886209dcf4dfd8a8b077d06a670e200c50ab8df1a
+EBUILD neon-0.32.1.ebuild 2717 BLAKE2B 3ed9eb1069ef0485205f74755902268a26fd2b7e475c8e27534bc82701193e7c573b77cc4f8272bd59685c8225c2863a810fb009fed100ef23de23bc56b9fe71 SHA512 7376c1fb7d34f0c9d983b3f1640a72f8fa15db2bd0657eced6a0b4aa56c044a61f80ea45b49ef9f1987d8f70d2118d13a9fd0e2b6118c9b5b11a6c339ec68958
 MISC metadata.xml 1413 BLAKE2B c90629adef6f151c3584782110a60c0f3dc5729faa222b347348ee24f20f137711fa2f075cea72629729be803fed5cbd562f96005717b6fc3fda52c32c471bbb SHA512 f06e7f2864d42a47b385d836c793652ae8699e495dc7d21d33277025c27af8f35ee674ce15109159c0cd4aa61cea9bfedbd14d7730d4cbd222432d69acdb6757
diff --git a/net-libs/neon/neon-0.32.1.ebuild b/net-libs/neon/neon-0.32.1.ebuild
index f2b4f78abf2f..92ef286a9128 100644
--- a/net-libs/neon/neon-0.32.1.ebuild
+++ b/net-libs/neon/neon-0.32.1.ebuild
@@ -31,8 +31,12 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
 	)
 	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	virtual/pkgconfig
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/neon-config
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index b34912e28c51..76b7c1413b55 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,5 @@
 DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
 DIST rabbitmq-c-0.11.0.tar.gz 145638 BLAKE2B dce862d132d4bca010dbc284957f34a35d55407ea0eb4fb79369f699207c01cc7ed64c1bd58bea2d1178bd2c02176c3e93b66177fc975175b1da9ab9baaf661f SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de
 EBUILD rabbitmq-c-0.10.0.ebuild 1289 BLAKE2B b3e9bf9ca16e5f03ff24ce80695793909f891e83fae7c74a1bae7a66e71dbf9872a1d96deb430baceea8f11d1a4d4ad8fe2ddb468eb3dad5a9e09ef4d6aa7279 SHA512 8f1bb64aa8ebd3bc69824d320d5ac4270af2db79234955f7b43f2544a16ceb4173e8b2d220871329f146e936127e6915f98d8005bed4b5e36c23c85e2b1bccfe
-EBUILD rabbitmq-c-0.11.0.ebuild 1286 BLAKE2B 3fb3c831ad7f98447cb24314a53bc5d60d174d7ec2c7bc5d9d6dcd1673bc908d5f911978ee6f8cd8a3e874958abba7b0cbb8bb6d08482d3e4fc3a49b1708663e SHA512 a61914319cdf8026ad4df38a973b52f9a5bb2e4d7ef8f925f9367bfda5d02c55bbfb5035eeb49d62ec7876ca75eb32e313c5d541cc85c6de9034882ada34f089
+EBUILD rabbitmq-c-0.11.0.ebuild 1284 BLAKE2B bd9e56cf41a7297954cf285d2faa235d3b04899c45d5f357f8994999fa64b73db1ceb7e5045403d2ef1e35639f0eb3ac3d9cbfbf42d78440cb031cd8a5afdf88 SHA512 7328fa9528cd7538e73ced06d57a54653c6e2379d18a720fcd6424701968828f02e2b5e3cb5895e8b09f9f94ae62727cc12eb80d942a5f6212d36d2949edcec1
 MISC metadata.xml 335 BLAKE2B b2cff371cbfbcd9eaeed0d85b658ab9df7fe669dec9e679f0155c31e794afb76a2592bc0a575eea231beeaac51cb5707c1ac0c593631f0e3e04cdb8a2e872a19 SHA512 68639ae3aed6e2846355f5690d7aa4d4af2d94078b489beb972b23eeef2e9bf62c99529c9580e6b88e857d47e82c4896e5e9fb7ed6ecf8f03135d8cd702d4f0c
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
index b8e7ae78e5f9..9f33b3dcedef 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/tox_extension_messages/Manifest b/net-libs/tox_extension_messages/Manifest
new file mode 100644
index 000000000000..5752c6facf5b
--- /dev/null
+++ b/net-libs/tox_extension_messages/Manifest
@@ -0,0 +1,3 @@
+DIST tox_extension_messages-0.0.2.tar.gz 21822 BLAKE2B 23c4be3e001420db7ada0208174a667f213e43fc492bd09cc896eba6bd7e0d1fe929f6f4e191e5680901793df561421dd95ebb9804efc1d55bce98483321a077 SHA512 973dd569151fcabee2d31d793fd0a229f71edcddf7470f891b88f0a47e4fc4bc0f9daeb02d37918b5e44ad51e4b4241b8e4723ec9261710dd9a33b37b5e2e065
+EBUILD tox_extension_messages-0.0.2.ebuild 532 BLAKE2B fbea2a01704c7260411e299fda9d6b5a1aea28f2239be2e0f05f2d9fb14f538cb70f3662de0a51fe6f672159c6547436e0a2ec3257b991c75f0ff5abdfd94142 SHA512 189d729326f476d05f2e7ddb8df4974a6f26938b1b7994be42d9791dbc539e34eaf0d7566282abe9c66fd6ba39ff074577204a051e2d3a94648854843fdedf78
+MISC metadata.xml 488 BLAKE2B 29247b8ab8d6e88937d0fd2b7f8c4fa0f44cb61ebd70c749d7a32018eda2239e3b98d5402acb0857758164a4351d69e579f3ed8e95da3b3d2c0330ea625b5acb SHA512 7e3a44577f1cd467b027742ab830fa7cd7ed68a1e408665934792b14ac1483b39723c7cb7bf8828349fe43e0b749a2ca54b8db3108f84566159e5d625e9eddbe
diff --git a/net-libs/tox_extension_messages/metadata.xml b/net-libs/tox_extension_messages/metadata.xml
new file mode 100644
index 000000000000..92855b87739b
--- /dev/null
+++ b/net-libs/tox_extension_messages/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>chiitoo@gentoo.org</email>
+		<name>Jimi Huotari</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">toxext/tox_extension_messages</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild b/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild
new file mode 100644
index 000000000000..42ade66e6989
--- /dev/null
+++ b/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Tox Extension Messages"
+HOMEPAGE="https://github.com/toxext/tox_extension_messages"
+SRC_URI="https://github.com/toxext/tox_extension_messages/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/toxext"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i 's/-Werror//' CMakeLists.txt || die
+}
diff --git a/net-libs/toxext/Manifest b/net-libs/toxext/Manifest
new file mode 100644
index 000000000000..8d0f38993375
--- /dev/null
+++ b/net-libs/toxext/Manifest
@@ -0,0 +1,3 @@
+DIST toxext-0.0.2.tar.gz 34178 BLAKE2B 477a8f70e5b11c2e9d03b8b10adf83f36b95f0c31661cc042d4ab74ee3b6bdc7ed86ab678d0901c0ec6a2466fa698e6423044663d8b6d3b137eee52c2256bc75 SHA512 2e8c326715e5730b0315dbb309d4f6a6965049203579cb500fcac5cf5bd1124f98a8e1ada68e9a65ee572981ae417cb32aa7e99932fedc393da43e2e42f7f6d3
+EBUILD toxext-0.0.2.ebuild 502 BLAKE2B 5da57b1819abde7a4671ea6e7b32111639bea27a61ee342fb47adc057d039fc4ef845133352caf0c98753b26a1717c752f6c97121a9e31126590d1ff88e9dead SHA512 b20cec3d44493a85b76f42eb9835aad7b81c7177cb975cb60f3eaa92daa20b751b9cd9030f5ace52538a08ed32f2dbf7db5cb7d24afcf2e8a18673a37902478f
+MISC metadata.xml 472 BLAKE2B 50a84fe144b80bae844a4aa6d6bfa653cafc0883bce40c14e742a73268df9de3709a0e5230fb88d101bde083d94e0311bc8ed3a0e897ff49be5283e7c85b3a63 SHA512 551fd66beb922eef58b866d3a8d5669dca11fcbb53c870f29516a6fae07f4893ed5a73e3d983dc360377f3dc4501e36d077d9bc0061bb93d621d84136e157105
diff --git a/net-libs/toxext/metadata.xml b/net-libs/toxext/metadata.xml
new file mode 100644
index 000000000000..a85638b0e187
--- /dev/null
+++ b/net-libs/toxext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>chiitoo@gentoo.org</email>
+		<name>Jimi Huotari</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">toxext/toxext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/toxext/toxext-0.0.2.ebuild b/net-libs/toxext/toxext-0.0.2.ebuild
new file mode 100644
index 000000000000..356610149149
--- /dev/null
+++ b/net-libs/toxext/toxext-0.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Extension Library for Tox"
+HOMEPAGE="https://github.com/toxext/toxext"
+SRC_URI="https://github.com/toxext/toxext/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/tox:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i 's/-Werror//' CMakeLists.txt || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a683b49afb3c..c2cbc89f4a9c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,7 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
+AUX 2.34.1-opengl-without-X-fixes.patch 953 BLAKE2B 06d9e12a9ccb37950e87c89031d1067c8cea5c9cc4b0f802386d32c4ca8499537c95af799b9f9e9c57008e65c38716b01cf0dfd012900ae32a36d813311b48f3 SHA512 854dcaef25ad6927a288bdfbf842dcec385954abff1af710c9e789cdf4e194a271561b2bd8a695d051f675a3c2219563d834461f19ceee10e2320f6ac2bb5284
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
+DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
 EBUILD webkit-gtk-2.32.4.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
-MISC metadata.xml 650 BLAKE2B 071251dfaa08b7043a9f689bae707ba831ca1eab0b8fed986507b48dfa14766c450663ffedd25a4fa3ed8570f23cd590b8c3f7ed4a102e3c93ce44ab4a03c247 SHA512 a15c21eb92736520129ddc7be6f39e806ea6bb2361cbad7db95d06fbc64ecc5323a1e8be312575b90ca699670ae4ba95ed062f19cf494473991e0ab2a0a31a8f
+EBUILD webkit-gtk-2.34.1.ebuild 8981 BLAKE2B 1675b065a06a888a23839e18ae2cca06241478d2164dbe52b787decec85fc1980fee3ab8312db4491ceab8ad5f4744ed393a837defa99bff7a0bca114db81203 SHA512 b767322caa7677129f049df13eb7d79fbf09cea3aecdcbd93561772289666865cb6b7ccf75a7c8e15038bc7759639ab552e68c92b372b0d49d8925b7bdefb972
+MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
new file mode 100644
index 000000000000..a4cf86f36cbf
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
@@ -0,0 +1,31 @@
+https://bugs.webkit.org/show_bug.cgi?id=208907
+
+From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 9 May 2020 23:11:52 +0300
+Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
+ some build configurations
+
+---
+ Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+index 3515be452b2..82cce70f14b 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+@@ -64,7 +64,10 @@
+ 
+ #if USE(GLX)
+ #include <GL/glx.h>
+-#include <WebCore/OpenGLShims.h>
++#endif
++
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
++#include "WebCore/OpenGLShims.h"
+ #endif
+ 
+ #if USE(GSTREAMER)
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 00c38e8831be..6c378126f60f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
+	<flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
 	<flag name="egl">Enable EGL support</flag>
 	<flag name="examples">Install the MiniBrowser example application</flag>
 	<flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild
new file mode 100644
index 000000000000..3f751dd11145
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms 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-61.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.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	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= )
+	avif? ( >=media-libs/libavif-0.9.0 )
+	lcms? ( media-libs/lcms: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
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${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 )
+	>=dev-util/cmake-3.10
+"
+#	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}"/2.34.1-opengl-without-X-fixes.patch
+	cmake_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
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "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=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_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"
+}