diff --git a/dev-python/uvicorn/uvicorn-0.13.3.ebuild b/dev-python/uvicorn/uvicorn-0.13.3.ebuild
index d6a523d617..ffb4f1c304 100644
--- a/dev-python/uvicorn/uvicorn-0.13.3.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.13.3.ebuild
@@ -36,11 +36,11 @@ BDEPEND="test? (
 	dev-python/trustme[${PYTHON_USEDEP}]
 	>=dev-python/uvloop-0.14.0[${PYTHON_USEDEP}]
 	>=dev-python/websockets-8.0[${PYTHON_USEDEP}]
+	<dev-python/websockets-9.0[${PYTHON_USEDEP}]
 	>=dev-python/httptools-0.1[${PYTHON_USEDEP}]
 	<dev-python/httptools-0.2[${PYTHON_USEDEP}]
 	dev-python/httpx[${PYTHON_USEDEP}]
 	>=dev-python/watchgod-0.6[${PYTHON_USEDEP}]
-	<dev-python/watchgod-0.7[${PYTHON_USEDEP}]
 	dev-python/wsproto[${PYTHON_USEDEP}]
 )"
 
diff --git a/gui-apps/wlr-randr/Manifest b/gui-apps/wlr-randr/Manifest
index 6783641742..c1a8f26d88 100644
--- a/gui-apps/wlr-randr/Manifest
+++ b/gui-apps/wlr-randr/Manifest
@@ -1 +1,2 @@
 DIST wlr-randr-0.1.0.tar.gz 10836 BLAKE2B 573e9aa9305b0f633f2ee62cbf46bc107948582c5fa1e417a46f01b82489ac84362baea791f817d1857b320715a5644e597adf80c93897ec7bda27456b5e064d SHA512 84a710b28243acb13d37c81d1f796d7e251aa52d6a7f299a4cdb0d0ebe6481d57db6757a1a813fc6bbe3fbd9d7fccefb09385c523f857abef72f3ee398f0d958
+DIST wlr-randr-0.2.0.tar.gz 10904 BLAKE2B 46eec469d18b5ac5b9e5c73e2e020b9e52c619bd81c63c8898b9712184691156d339ea40aa656a39f8a2c8bc858d80fb3aff144dbe2a1add75c9ee2757493026 SHA512 213e35d97ee4c5fe4e524119eba66f121707a4ccb9076f48ceb47091e2ca987ed43f9897168b4d62efd10457d256225cd23423e039c1fcd705d7ba7e779a6722
diff --git a/gui-apps/wlr-randr/wlr-randr-0.2.0.ebuild b/gui-apps/wlr-randr/wlr-randr-0.2.0.ebuild
new file mode 100644
index 0000000000..88a1e40244
--- /dev/null
+++ b/gui-apps/wlr-randr/wlr-randr-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="xrandr clone for wlroots compositors"
+HOMEPAGE="https://github.com/emersion/wlr-randr"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/emersion/wlr-randr"
+else
+	SRC_URI="https://github.com/emersion/wlr-randr/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="
+	dev-libs/wayland
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
index 24db624ce6..9e894294b4 100644
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@@ -1,13 +1,19 @@
 DIST AMDVLK-v-2020.Q4.5.tar.gz 32258 BLAKE2B e2acdbb87c0a53b45cbbceeda0b7a6432db5713891dc35d9c3c3932e20799fe0ab219de9f2d042ebd403c1904c5a1b0bdf23f8d1a033b7c6d7a17e7c65132373 SHA512 98158c82c08657d130d462f1e5e70f6c77749eb0f139c3b392984c1b44eed0828aab71c580747799a734fa0d581720c5b70779c4c5f5bd3dc269b128df95cec8
 DIST AMDVLK-v-2020.Q4.6.tar.gz 32275 BLAKE2B f7bb0e5df49df9fe5d0a2f5bb169a2fdec7c36548f53c5bd23702465373a754aa43659a2fc7c4b57882ffe64be4438911dcda3766cba26d5a9c08a4e5816e66f SHA512 be8b28ef15e9e7941c97296342393a645095617b96f189939be3885f1e430d7ee683868ec0b1aa6c9642f2572aa066f638b3f770bc425dcb5b284dbf655b32f3
+DIST AMDVLK-v-2021.Q1.2.tar.gz 32689 BLAKE2B 13269d8cf77c4dd808c160cce50b03160c6f639a65fe69bafb654f2e5045b595a17c8dc0e6e8a5e4801bcfa1818d0b4a4f3099ba4475ff627b2ec01c625e32fd SHA512 5f3a3cc408b18a5b6f94f816e0af14b499367097888bc28acd17f9ef4630f7f7fe9753d43855b4f9615f0bd73c0101151b2983174db73fe2b3477408ebce5dd2
 DIST CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d
 DIST MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f
 DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32
+DIST llpc-86ed348f405120042a2540ec3157e28baf45dc81.tar.gz 2138674 BLAKE2B fc29be141042803de90ca1402bd3cc94ac465889ec139fb0bc39946b4798ec1c145e451938c1e3a28961d2d0d453774722ea23838b6a9cc55a7bf427ae3db49d SHA512 f814d1f084e22b5316fb47499ac2b48e389cb01e50083e2b0b7c531d9d2d22dc27aa3f525f9f3cb20b6cfdc85e1791f67415c2b90fd847828ea8229a0de67102
 DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6
+DIST llvm-project-1551e626ea6b19f81928d2e4eddab657eb82af9b.tar.gz 132456009 BLAKE2B eb17a949da39dafa46c9ff8de0e7e994a39167919981a0bc5c5281cb6c65100a4bc76dd5bdcfbef4a05b7cc0606a8f29c8c25775a722e8842950a730a81641e9 SHA512 1b5ebd367e5a978b3f39b203d5497862d57921ab2027239da798fdab92e7dccf1ecdc8ee80b8f3ec49474097576bcc2ab9b0cfb6660cd56ba1f87adb564addfe
 DIST llvm-project-7ff363c8283c1d41ecbdcdc45c8b724b52312d67.tar.gz 128585110 BLAKE2B 2902b68f08f6a978a08061a145e93d0cbea57e4c47431b0249a06ae986e739d9fbb749b2e59996abcc25834cff59ab2dc837debc7acc7ee12c3ec488cb300cab SHA512 b8e4a6858f1c4ffb26206e545095e64641fef4cee47188d5481d14780f6b8276f70b5c485da1fc26025ee42b6b984c2901caf85ade1599f1a6aa73e0ab190087
 DIST llvm-project-a0777f49050191c9e215a4880c855395ba805508.tar.gz 129045563 BLAKE2B 1234834158b43c7609037cf8eadbc2564dd432eae476f6993383c48164dc4718f450616c35fbddd451a01382ad633c2980c81d27c57b1275dd72a7afc22fe437 SHA512 952843621edfa2f60c08f4c934091acfaed50463f59c24e18821a0023f383840a7346d250e56d1df3ac40fb573957357d4f61f155a2e747508b3748ceaa4df25
+DIST pal-57cd977c79e4321c28dcb1a18a4aa23880aa48f4.tar.gz 8097698 BLAKE2B c3a644c61b9448155158333e870eac484bf1e529984306d9717e1e2a17d1f3acd7118a4ab794066303b4262759a7c8b58b4eb790c94ee19b610f85ef4e80b701 SHA512 610e9aa8f76dc7a9b1d742ce03551ba74dc35bd2e8e4428fc64d88d7daf406606af6006a0f227d4aed9ea2e14b86caf104630ada35f3cb98543db158646099e4
 DIST pal-b1e752d402592628f61eb7e1aa2a802a205de798.tar.gz 8029839 BLAKE2B 776b85c0d5780a3b6a5a50d04609a20f1552a0afa0caff090013c2506bc9f97592b42f69941ac29697f3dced45e4619ca8be918e1b68fabd5c651893ba689d35 SHA512 5d98bcf1631d70620bb56a380c7b510f6f517d48e1cc0b2f7007687b929fc36af69d7478984756bf84e2f7e6934034c10f7bfce24b83df812de93e3a6b9b9faa
 DIST pal-f92844ecbba39be3d2663717ad69c3dffc282211.tar.gz 8049042 BLAKE2B a11b40deb3d9645b88861f9bb3ed198fab07baace72ee5c9566601d71b0cda94178161ea59d4ba09384b3c9f88fb40a956243aacbc5ccc3e1b6b58bc053ab98f SHA512 bc2bcfbfc6d1d39ae3ed0f409e9708c9ef7fe01c83d4941f68f3afd4936c014b143a82c65c4d59714c24d85c8dde4338de426ad3b48d68fb4077d0d08382a33c
+DIST spvgen-6b84106b7e107173428647850b4ba93a75b23d84.tar.gz 19676 BLAKE2B 93560bdb1810685d36e1f9d42e95b5b7b4c5c22740c46178be5c05d6d5055000b1c01a71403f89d2091339e13ab2083ad02f24e7a3c687794eb34f1e1c557a78 SHA512 01f2012bb5c894e0ae4f267d903b835f5197699ce00a55b249f7525146da036dee1ac195df6d4e3f67e9e222b826458595e4d1fb2c8f9b2c05749bf2c98d1136
 DIST spvgen-fb798cb760a436e9496dbaab8827e4d183b74744.tar.gz 19475 BLAKE2B ace1afe0f9b129fdf3079341a09f0e761b1604a415412a3ea33325e770cecb62e67945a5d83b3248a29222b2dca86ad63c4c7d89e250851edc37d22543e75f20 SHA512 2c4f72518e6f1fbefebfe51d6e7d14187bad99b036b26f131ed726d0525244b33017549f5a56a4f7770239eaa411ff93561be53072458c6f491452ae496ee156
 DIST xgl-86f61a31988a626371131a1633547b0d0ebfcfcb.tar.gz 818497 BLAKE2B 17973a57d15c96568107f6b27096f275a59405c97465f7788876282d1082e1d30f20a48b8a2c83553ec5ff0a7ba36c8a89885596386a8788192ed4a476035554 SHA512 028336666bc83a9df29b090852cfd1781a4dca70b477d8ddeb29e2347f01ff50c457f2da3ea9ad8880e6223451543cd8d695bd99108e2240b63e3b176a120536
+DIST xgl-88a4f8c5657824f93790eefe3c9e078806c2a768.tar.gz 804535 BLAKE2B 6cf6db041857f3f32cd35766611871c739b0b7c6eed8c05c63e54c9cd210cce05f9e9dc4f5fe9bbdf028de3336f525b886afe8df39f215a78dff15412448309b SHA512 c37846c53850a4c5c5c7021e837f9dcc6bac94dca49a9eaa48663ada8e32de02aebaab3cbca7d99c1d38f39c9f7d2eadcb52fa52a12de8310b7e3e3bbd591211
 DIST xgl-fc11e79aab63337702d8efc05e5433dec9efdf06.tar.gz 810567 BLAKE2B 452a9264df787d42f18618e8d49cad9fb79f4a6ece505d238f5a09652505886555db892c8c6f4f6139c28cf7db6efc387330f101e32c1262f00fc5c6e1c17e74 SHA512 db50fcdac279eb17b977f47ca66397c7194d021dd4db9b4e34e4a0eccb6fdbda5222a57c306ac8fba8eec2986703596a5cb1b2130d8a1bcf81c30f69be0f2808
diff --git a/media-libs/amdvlk/amdvlk-2021.1.2.ebuild b/media-libs/amdvlk/amdvlk-2021.1.2.ebuild
new file mode 100644
index 0000000000..eca5dccd50
--- /dev/null
+++ b/media-libs/amdvlk/amdvlk-2021.1.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib check-reqs
+
+#inherit cmake-multilib and cmake-utils build doesn't support https://github.com/GPUOpen-Drivers/AMDVLK/issues/151
+DESCRIPTION="AMD Open Source Driver for Vulkan"
+HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug wayland"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+###DEPENDS
+BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
+DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	${BUNDLED_LLVM_DEPEND}
+	>=dev-util/vulkan-headers-1.2.162"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	dev-util/cmake"
+RDEPEND=" ${DEPEND}
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
+	>=media-libs/vulkan-loader-1.2.162[${MULTILIB_USEDEP}]"
+
+CHECKREQS_MEMORY="4G"
+CHECKREQS_DISK_BUILD="2G"
+S="${WORKDIR}"
+CMAKE_USE_DIR="${S}/xgl"
+
+###SOURCE CODE VARIABLES
+FETCH_URI="https://github.com/GPUOpen-Drivers"
+CORRECT_AMDVLK_PV="v-$(ver_rs 1 '.Q')" #Works only for amdvlk source code: transforming version 2019.2.2 to v-2019.Q2.2. Any other commits should be updated manually
+##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml
+##and place commits in the desired variables
+## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
+## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
+XGL_COMMIT="88a4f8c5657824f93790eefe3c9e078806c2a768"
+PAL_COMMIT="57cd977c79e4321c28dcb1a18a4aa23880aa48f4"
+LLPC_COMMIT="86ed348f405120042a2540ec3157e28baf45dc81"
+SPVGEN_COMMIT="6b84106b7e107173428647850b4ba93a75b23d84"
+LLVM_PROJECT_COMMIT="1551e626ea6b19f81928d2e4eddab657eb82af9b"
+METROHASH_COMMIT="3c566dd9cda44ca7fd97659e0b53ac953f9037d2"
+CWPACK_COMMIT="7387247eb9889ddcabbc1053b9c2052e253b088e"
+## SRC_URI
+SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz
+${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> xgl-${XGL_COMMIT}.tar.gz
+${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> pal-${PAL_COMMIT}.tar.gz
+${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> llpc-${LLPC_COMMIT}.tar.gz
+${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> spvgen-${SPVGEN_COMMIT}.tar.gz
+${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
+${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> MetroHash-${METROHASH_COMMIT}.tar.gz
+${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> CWPack-${CWPACK_COMMIT}.tar.gz"
+
+###EBUILD FUNCTIONS
+src_prepare() {
+	##moving src to proper directories
+	mkdir -p "${S}"
+	mkdir -p "${S}/third_party"
+	mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK"
+	mv xgl-${XGL_COMMIT}/ "${S}/xgl"
+	mv pal-${PAL_COMMIT}/ "${S}/pal"
+	mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
+	mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen"
+	mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
+	mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
+	mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+			-DBUILD_WAYLAND_SUPPORT=$(usex wayland )
+			)
+	CMAKE_BUILD_TYPE=$(usex debug "Debug" "Release")
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if use abi_x86_64 && multilib_is_native_abi; then
+		mkdir -p "${D}/usr/lib64/"
+		mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"
+	else
+		mkdir -p "${D}/usr/lib/"
+		mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"
+	fi
+}
+
+pkg_postinst() {
+	elog "More information about the configuration can be found here:"
+	elog " https://github.com/GPUOpen-Drivers/AMDVLK"
+	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
+	ewarn "| Driver      \"modesetting\""
+	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
+	ewarn "Else AMDVLK breaks things"
+	ewarn "With some games AMDVLK is still not stable. Use it at you own risk"
+	elog "You may want to disable default vulkan mesa provider in package.use \"media-libs/mesa -vulkan\""
+	elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 "
+	elog "exampe| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\""
+	elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable"
+}
diff --git a/net-misc/wsdd/Manifest b/net-misc/wsdd/Manifest
index b9fdbef715..1c67a602eb 100644
--- a/net-misc/wsdd/Manifest
+++ b/net-misc/wsdd/Manifest
@@ -1,4 +1,5 @@
 DIST wsdd-0.5.tar.gz 16820 BLAKE2B 3744cf45812a54d1857d75adb9ad24868f6a29520cda3de5c69877196ffafea242e3c68f54a7849c6399fb038366825c6e42a3e1e98d37c893b7c4cde7cd49c2 SHA512 fe300de7d900f34b43c81358506b2e62ecbf980e6c65b377f87e3a9618afeef9dff2ed041b660b58bce0944d221ca26b2fc1c1ff7e0155edef615ed6d5ec5cd5
 DIST wsdd-0.6.1.tar.gz 27254 BLAKE2B 745eab6f8b404d56cfa99bf4691936ac294931495990b75e29d4d28db5bef82804b1215aca76b4e2f941e8d58daee8dbbbe091ce3bfe90bc82856f6960ffec75 SHA512 62d7694972dbd571b5c5d9a2f1086bc0ba244896df237d6514b0a7cf814d11faec8299a1618e2da8550bcaee3feede3e2e057d3a1d2e7296947b09d6894ac2a2
 DIST wsdd-0.6.2.tar.gz 27654 BLAKE2B 07a518517f8896682a6a04a4f904b3f696874da71b1b09202fc4b6117a32e2eaa463a111c5265a643d6cde49fef275ac0adcfdd4e21f89f2721719426f1926a0 SHA512 fb18c5018bbd0a6389ad8a58040351ddebab5628c7315d57d9aaf32effe1d7a4f5b91dfa9afae77d41c0eb408de6ad788c40d1cd6158e975fc94f8c3a9f8bd4b
+DIST wsdd-0.6.4.tar.gz 28574 BLAKE2B fbb98a3c14446f554f39d60fc42ebc268b9c055a08e8325e2fcdac1e3d45071c908caa97ca19404242a9479c0e6de452a46cddf47dc4513cdb53ab58dd9099e6 SHA512 facc13c9ebfc020d5d6dde9c1d3a5e0e20aebbd7942f25430c07706fe16140ca5618d525fcf1b45869cf1dd916a09939e4c5252bc9d07fb6bd7c618f5fc1500e
 DIST wsdd-0.6.tar.gz 27067 BLAKE2B ea8ca4235d7a8dc32ed6cdf04f3ceeb0b41114c8fdc38beb783d839e7771d4557af0c411b1568809d1ba6a3dcdc94436a3990852b6b7f0d47eb6c0e4261a8f89 SHA512 a57a7d75118e73b63269f7de44da22ee571c922455e1be2820595209c7eabeb4c95ba6b54a56d35c5a4bf0210e05ed8578f967170728edff854cc7d40c19ef48
diff --git a/net-misc/wsdd/wsdd-0.6.4.ebuild b/net-misc/wsdd/wsdd-0.6.4.ebuild
new file mode 100644
index 0000000000..f956899d8c
--- /dev/null
+++ b/net-misc/wsdd/wsdd-0.6.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 systemd
+
+DESCRIPTION="A Web Service Discovery host daemon."
+HOMEPAGE="https://github.com/christgau/wsdd"
+SRC_URI="https://github.com/christgau/wsdd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samba"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
+RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+BDEPEND=""
+
+src_install() {
+	python_foreach_impl python_newscript src/wsdd.py wsdd
+
+	# remove dependency on samba from init.d script if samba is not in use flags
+	if ! use samba ; then
+		sed -i -e '/need samba/d' etc/openrc/init.d/wsdd
+	fi
+
+	doinitd etc/openrc/init.d/wsdd
+	doconfd etc/openrc/conf.d/wsdd
+
+	# install systemd unit file with wsdd user and dependency on samba service if use flag is set
+	sed -i -e 's/=nobody/=daemon/' etc/systemd/wsdd.service
+	if use samba; then
+		sed -i -e 's/;Wants=smb.service/Wants=samba.service/' etc/systemd/wsdd.service
+	fi
+	systemd_dounit etc/systemd/wsdd.service
+
+	dodoc README.md
+	doman man/wsdd.1
+}
diff --git a/sys-fs/dwarfs/dwarfs-0.3.1-r1.ebuild b/sys-fs/dwarfs/dwarfs-0.3.1-r2.ebuild
similarity index 85%
rename from sys-fs/dwarfs/dwarfs-0.3.1-r1.ebuild
rename to sys-fs/dwarfs/dwarfs-0.3.1-r2.ebuild
index 4dcf6a8ead..d3be4941d7 100644
--- a/sys-fs/dwarfs/dwarfs-0.3.1-r1.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.3.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="python +jemalloc"
+IUSE="python +jemalloc fuse2"
 
 #test IUSE disabled because there is no googletest in portage tree
 #-DWITH_TESTS=$(usex test ON OFF)
@@ -38,6 +38,7 @@ RDEPEND="dev-libs/boost[context,threads,python?]
 		dev-cpp/gflags
 		dev-cpp/glog[gflags]
 		sys-fs/fuse:3
+		fuse2? ( sys-fs/fuse:0 )
 		sys-libs/binutils-libs
 		sys-libs/zlib
 		sys-libs/libunwind
@@ -52,8 +53,8 @@ CHECKREQS_DISK_BUILD="768M"
 
 DOCS=( "README.md" "CHANGES.md" "TODO" )
 
-CMAKE_IN_SOURCE_BUILD=true
-CMAKE_WARN_UNUSED_CLI=no
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_WARN_UNUSED_CLI=0
 
 QA_SONAME="${D}/usr/lib64/libdwarfs.so ${D}/usr/lib64/libxxhash.so"
 
@@ -78,6 +79,14 @@ src_install(){
 	cmake_src_install
 	dolib.so libmetadata_thrift.so libthrift_light.so
 	dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so
+	if ! use fuse2; then
+		rm "${D}"/usr/sbin/dwarfs2
+		rm "${D}"/usr/sbin/mount.dwarfs2
+		else
+			ewarn "If you have both sys-fs/fuse:2 and sys-fs/fuse:3 installed"
+			ewarn "Dwarfs will install /sbin/dwarfs for fuse3 and /sbin/dwarfs2 for fuse2"
+			ewarn "See https://github.com/mhx/dwarfs/issues/32"
+	fi
 }
 
 pkg_postinst(){
@@ -91,7 +100,4 @@ pkg_postinst(){
 	elog "${HOMEPAGE}"
 	elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
 	elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
-	ewarn "If you have both sys-fs/fuse:2 and sys-fs/fuse:3 installed"
-	ewarn "Dwarfs will install /sbin/dwarfs for fuse3 and /sbin/dwarfs2 for fuse2"
-	ewarn "See https://github.com/mhx/dwarfs/issues/32"
 }
diff --git a/sys-fs/dwarfs/metadata.xml b/sys-fs/dwarfs/metadata.xml
index 17e2efa0c1..f3f1fbff49 100644
--- a/sys-fs/dwarfs/metadata.xml
+++ b/sys-fs/dwarfs/metadata.xml
@@ -16,4 +16,7 @@
 		* Highly multi-threaded implementation. Both the file system creation tool as well as the FUSE driver are able to make good use of the many cores of your system.
 		* Optional experimental Lua support to provide custom filtering and ordering functionality.
 	</longdescription>
+	<use>
+		<flag name="fuse2">Install optional fuse2 bindings in addition to fuse3.</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index 832a710be2..f6ffbcfe38 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -1,6 +1,6 @@
-DIST code-server-3.4.1-linux-amd64.tar.gz 74127655 BLAKE2B 95e916e64c886688b370407ba932624a70b024cae64a57e7eb77f31c6a352138313fbced149adf2ee698d925b9e2a818823b25931a42a01d5e2eaedb082bbf1d SHA512 efd55c84fda96f22bec79b54f60d02a8d098f41cef77549c805c125eb845efae43d3f4703908f0542a78146eda67ebd9787f89b1c14b1b8044fdfd534f2b9173
-DIST code-server-3.4.1-linux-arm64.tar.gz 73470946 BLAKE2B 278a1fef95b612242f4126eea53d7b8dc824fc5dda55ff6b2f1e7752d3ebecebcf30045c1c2bb2a18d1ad7999b20c29398a3c5715920d6e8d8c94eaa76e8a619 SHA512 24168006e737a6579869b8e4b157e21d9ef85282b811783163f0d2291e47bee7e0794c8327663182922b473ff57999432e6c53502849836a53d300728341d1bc
 DIST code-server-3.6.1-linux-amd64.tar.gz 76288261 BLAKE2B 443135065cdab9e0477d9665e9e56d924bd9199ce19cfbdea1e811c2517e7e71beaf18a347a287d0013d7df655900fc08a8f7fcbfe402b1e22487a80876d1eaa SHA512 0e875dc78a2776897a5a1556183808da70c8a0b2e4d96653a419bdab08df6f3d10643f90f568edeafcb38c36bfefa9fe0a674ad020b5e08c17b2e0eece940bc1
 DIST code-server-3.6.1-linux-arm64.tar.gz 75331263 BLAKE2B c390e11b02472409ef0147f6dc5392f36eff93dd19a07e2eeed09a2626b541740c0191fdac0cca43e843b3195fc803921bf37b704b67a2e41fa0a531feca560c SHA512 badc150af52263232240edc16e960ac9e51b22e05bc96d81d11726e28d733b1d79139b0d85aa108011f2993c6a6e395134d2524e5fc13fe3b7dfeac24899eb75
 DIST code-server-3.8.0-linux-amd64.tar.gz 78942963 BLAKE2B 4c78ed40aec86a72dede21a82ae111884be5cba1958fb22d6353d63af98f6d3bab50c7ae1fa0b81079be6d035e84d873f4ebf00da76edaa15b2356e89b3d1261 SHA512 76cdbbdb63b3061ce9d1cb016466356d5184b83e742fc084d9a0376aa12dc9d68314061ea5cde93f6590b07862169cbd291f77b71dfadc4bee4140e277813ae8
 DIST code-server-3.8.0-linux-arm64.tar.gz 77939946 BLAKE2B c154561c308e5e233016f1b9b5f53647a2aaad12b73d27d1e84ee37234104048005b36cccdda5593973238ef279428b8f38309cad193a67afd87d77205eeb27c SHA512 0fe4a42eb1c50ae1d33f9c94e592ac8a3e69fad51abc1f5c90595a1588350e95f78bc2c44f728b3f155112f2db11e79b2227f2e847a45d58c87078d667119a1a
+DIST code-server-3.8.1-linux-amd64.tar.gz 78975468 BLAKE2B d4f6424108b0cd4cb46ba9597e02993fc704ee89d0757a575719592cfd7cc2b3e52fdb5fa09a55684999eafc33dcab4483c4339cc584a37bd19453022bff0b27 SHA512 4a530df07482c68ad40da11234835528819f93985895d79914ff14da792a83084c605cb6d34622e475efb51c2b5c1189a4de186734194c7df6685655cd5098e1
+DIST code-server-3.8.1-linux-arm64.tar.gz 78056961 BLAKE2B 0311b5a07d6047f8ff795a0001f04ad824a940e79d87b23d58cc0fa27d04e1653f33a19016406ffcabbd3dabe4df512ee27ad58b7b6dc341517cd7e6845540b7 SHA512 a08308531ff8665f3b83dd6f37a9d668aa73b08ae7652193dc8e842c76982864701989b1713246e3d64a87b0b942a1b426da0170841da17d6ca6782a78850111
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.8.1.ebuild
similarity index 81%
rename from www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
rename to www-apps/code-server-bin/code-server-bin-3.8.1.ebuild
index 97405ffe16..543e268b91 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,20 +51,23 @@ src_prepare() {
 	# thus "-bin".
 
 	# use system node
-	rm node || die
-	rm lib/node || die
+	rm ./node ./lib/node \
+		|| die "failed to remove bundled nodejs"
 
 	# remove bundled ripgrep binary
-	rm lib/vscode/node_modules/vscode-ripgrep/bin/rg || die
+	rm ./lib/vscode/node_modules/vscode-ripgrep/bin/rg \
+		|| die "failed to remove bundled ripgrep"
 
 	# not needed
-	rm code-server || die
-	rm postinstall.sh || die
+	rm ./code-server || die
+	rm ./postinstall.sh || die
+
 	# already in /usr/portage/licenses/MIT
-	rm LICENSE.txt || die
+	rm ./LICENSE.txt || die
 
 	if ! use gnome-keyring; then
-		rm -r ./lib/vscode/node_modules/keytar || die
+		rm -r ./lib/vscode/node_modules/keytar \
+			|| die "failed to remove bundled keytar"
 	fi
 }
 
diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index 3b1c615430..0ddcf13305 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,6 +1,3 @@
-DIST jackett-bin-0.17.405-amd64.tar.gz 44605014 BLAKE2B 036329345261d3f95eb7d5d20780e7c5ba8294c1b0dfc1db93577d2851f848cc6dc1e70b57b63c4fbac5c1757c76c8b770c6b298fe5577bcecaf47d70c118694 SHA512 e7cff8ffb5c5f009452079715c31471686c31f59b4ca90422fb5356a01b9e87edf8b0209aa23ad9726736c00cdf5ad746bd0b71217c4146510e9d5c41e786633
-DIST jackett-bin-0.17.405-arm.tar.gz 42475249 BLAKE2B 17010d7d7bba65787ab00df4a9d7a34bc16c6a94dc0e558577c6b5d829cca01eb4c9a6b7adaeeaba090782bee6a2fe818be61b0f5aecb137567a72bc264a6fd0 SHA512 1995d1d96498ce1ac1944a3782b7660c98a17deabf1e0b96fd1fca36beaeb0c464887b72e25639fcb1b17d0c8953560060bcaee180048ee8978285067923e1ac
-DIST jackett-bin-0.17.405-arm64.tar.gz 41835603 BLAKE2B dcde4e0d8666c4c7e16070b63bda8c5eb6b5ec9b157c972e7441534df871a83a75161b8aa59b0160a75df23a9d2910a087470e4b37c0724de874468e56f41386 SHA512 f4866eec0f02561ec3434891845acee7d95b4726f53f147406c484cc474ca95c91b25111ee541691e93a175260e573ac9adb9ab9ca8a986e8ae63f51f4e85ec4
-DIST jackett-bin-0.17.449-amd64.tar.gz 44604802 BLAKE2B c8db20c741ebf3a72d251647b731052314a650fbbc359330feb5f941f70841c73ac9c83e07b813b4dcdde97ef706814f485b11ce0a92d635e6b45375aa28c542 SHA512 22dc2648d52b4f7caa0e4c51af903b087cdc14e69eac226d3bb98698b3623dab4b221f4137b05cea327e4840b44b151f1ff032688f65a9fce2fb911dbae944b3
-DIST jackett-bin-0.17.449-arm.tar.gz 42477513 BLAKE2B 2bcf10339fd9184ad035f1eff1b5ed6a0ff5f1b5916e1b59b21d9fd0a236694808cff471812f16549195c235f78923aee19696ed768bae75975af7199e8c337b SHA512 61d37d6f73ec78653a4a6be9a7ca918772dcc0386c72e58546524de6e21a4f04be1abeab3257cc76b142efcadf997b34f4b27a144e720d2d5c60a88f71e52faa
-DIST jackett-bin-0.17.449-arm64.tar.gz 41838916 BLAKE2B 9fd207aa2f28f32d8a9b3075dcedaad2fa27800c3860bddb215b72961e8689fcedd1f9c996e6bb2df146eaa8110cba4e36e844247ea49c4a73ea0c91717af35f SHA512 a1c31af52bdf371198ae4b6646b8b4c58152b79f8e8547c2d24036b9e5ecd04c764025885818d8690867944ac778d1fce0708d5e4ba51f8d997f1c75d4cad8d5
+DIST jackett-bin-0.17.456-amd64.tar.gz 44602115 BLAKE2B c9752eeb4fbfdaff62dbc3b22cc884a3c3dc0f0ee49f67c2027d86500ff83e1c7ea93e0e4245f5fa5b53f84f24582b181c2a45c9de4eeb3ddcd8e8efba309226 SHA512 00f668b2c62e7669e81080f0969ad6ae0b531efffea80b181f1640a984fd01b8db6b4fda381b69fb32f88f6065786ea83c611096a8dd468b28e10f1f8b6f9f5c
+DIST jackett-bin-0.17.456-arm.tar.gz 42478130 BLAKE2B 1623ba6b72f0a3a0ad6c3711bf3b2b8114f20594d324cc31b66a899e2860081ba7ae88e4cd80fedcfde3f8ff0939ef5c47b9769406c01c3468cee25a258078f4 SHA512 15072bd2ba1d86d43dbc232407bf5c900a5f65d0f2d12df0114b5b312cbe8764fc67cd11402637d158d1cf7a29b64ecb89bd9f81571ad40e9f0eb1fd323417ba
+DIST jackett-bin-0.17.456-arm64.tar.gz 41840135 BLAKE2B a99181fca7e3f622bfa841bfeeaf828c503ae9d0a6bcdd384871cc34309b132c196acc46ae2263165a6a68f31cdbef2eded91be08741c725130a0903f45f36ea SHA512 eec546452fa42f4d973fc7f742b2573be23b94225bcd24ad47b0c8493362b37d5054ed1f3528a907c92e24f08ce0c60ddda1c1e177ca015dfc1d6021fe6ca728
diff --git a/www-apps/jackett-bin/jackett-bin-0.17.449.ebuild b/www-apps/jackett-bin/jackett-bin-0.17.449.ebuild
deleted file mode 100644
index 86776b54b1..0000000000
--- a/www-apps/jackett-bin/jackett-bin-0.17.449.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="API Support for your favorite torrent trackers"
-HOMEPAGE="https://github.com/Jackett/Jackett"
-SRC_URI="
-	amd64? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM32.tar.gz -> ${P}-arm.tar.gz )
-	arm64? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM64.tar.gz -> ${P}-arm64.tar.gz )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64"
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="strip"
-
-RDEPEND="
-	acct-user/jackett
-	app-crypt/mit-krb5
-	dev-libs/icu
-	dev-util/lttng-ust
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"/Jackett
-
-src_install() {
-	dodir /opt/jackett
-	cp -a "${S}"/. "${ED}"/opt/jackett || die
-	newinitd "${FILESDIR}"/jackett.initd jackett
-	systemd_dounit "${FILESDIR}"/jackett.service
-	doenvd "${FILESDIR}"/99jackett
-}
diff --git a/www-apps/jackett-bin/jackett-bin-0.17.405.ebuild b/www-apps/jackett-bin/jackett-bin-0.17.456.ebuild
similarity index 100%
rename from www-apps/jackett-bin/jackett-bin-0.17.405.ebuild
rename to www-apps/jackett-bin/jackett-bin-0.17.456.ebuild