diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
deleted file mode 100644
index 408dc82a03..0000000000
--- a/dev-cpp/cpp-taskflow/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cpp-taskflow-2.3.1.tar.gz 98888910 BLAKE2B 3ecbc3eaf8db68ded66222c512ff7e22633fc0276eaff8ca9fd43bad13bb810ef064d0c8e762a960cdfff9197e4a810b75005a0063042c724b42599a2716e609 SHA512 94d5784198571886520d9f5d69dbce659c3cd214d986e9ac001816033d7719ae21d22ed2f5879549df15b23035d06200938a07928dd773f507317ede8a121899
-DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild
deleted file mode 100644
index ced7f05318..0000000000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/cpp-taskflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-tests-examples.patch
-	"${FILESDIR}"/${P}-fix-lib-path.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTF_BUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
deleted file mode 100644
index 8edadb74c1..0000000000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/cpp-taskflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-tests-examples.patch
-	"${FILESDIR}"/${P}-fix-lib-path.patch
-	"${FILESDIR}"/${P}-fix-version-number.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTF_BUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild
deleted file mode 100644
index ced7f05318..0000000000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/cpp-taskflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-tests-examples.patch
-	"${FILESDIR}"/${P}-fix-lib-path.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTF_BUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch
deleted file mode 100644
index 2b89307798..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-fix-lib-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c267f84..3f357aa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,7 @@ option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF)
- 
- # Include additional language check
- include(CheckLanguage)
-+include(GNUInstallDirs)
- 
- # Compiler vendors
- ## g++
-@@ -157,8 +158,8 @@ target_link_libraries(
- #set(CMAKE_CXX_EXTENSIONS OFF)
- 
- # installation path
--set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
--set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-+set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- set(TF_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittests)
- set(TF_EXAMPLE_DIR ${PROJECT_SOURCE_DIR}/examples)
- set(TF_BENCHMARK_DIR ${PROJECT_SOURCE_DIR}/benchmarks)
-@@ -782,7 +783,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
- install(
-   EXPORT ${PROJECT_NAME}Targets 
-   NAMESPACE ${PROJECT_NAME}:: 
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
-+  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
- )
- 
- # set up config
-@@ -791,7 +792,7 @@ include(CMakePackageConfigHelpers)
- configure_package_config_file(
-   ${PROJECT_NAME}Config.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
-+  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
-   PATH_VARS TF_INC_INSTALL_DIR
- )
- 
-@@ -803,6 +804,6 @@ write_basic_package_version_file(
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake 
-+  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
- )
- 
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch
deleted file mode 100644
index 279277e7fe..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.3.1-optional-tests-examples.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fccfd2..c267f84 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,8 +9,8 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
- project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX)
- 
- # build options
--option(TF_BUILD_EXAMPLES "Enables build of examples" ON)
--option(TF_BUILD_TESTS "Enables build of tests" ON)
-+option(TF_BUILD_EXAMPLES "Enables build of examples" OFF)
-+option(TF_BUILD_TESTS "Enables build of tests" OFF)
- option(TF_ENABLE_CUDA "Enables build of cuda code" OFF)
- option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF)
- 
-@@ -222,7 +222,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
- # Example program 
- # -----------------------------------------------------------------------------
- 
--if(${TF_BUILD_EXAMPLES})
-+if(TF_BUILD_EXAMPLES)
- 
- message(STATUS "Building examples ...")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR})
-@@ -282,13 +282,13 @@ target_link_libraries(
- )
- endif(${TF_ENABLE_CUDA})
- 
--endif(${TF_BUILD_EXAMPLES})  # ---- if TF_BUILD_EXAMPLES
-+endif(TF_BUILD_EXAMPLES)  # ---- if TF_BUILD_EXAMPLES
- 
- # -----------------------------------------------------------------------------
- # Unittest
- # -----------------------------------------------------------------------------
- 
--if(${TF_BUILD_TESTS})
-+if(TF_BUILD_TESTS)
-  
- enable_testing()
- message(STATUS "Building unit tests ...")
-@@ -504,7 +504,7 @@ add_test(cuda_matrix.product ${TF_UTEST_DIR}/cuda/cuda_matrix -tc=product)
- 
- endif(${TF_ENABLE_CUDA})
- 
--endif(${TF_BUILD_TESTS})
-+endif(TF_BUILD_TESTS)
- 
- # -----------------------------------------------------------------------------
- # Benchmarking (enabled by TF_BUILD_BENCHMARKS)
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch
deleted file mode 100644
index 6a99a0b051..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-lib-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4b9c134..f49c398 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,7 @@ option(TF_BUILD_TESTS "Enable build of tests" OFF)
- 
- # Include additional language check
- include(CheckLanguage)
-+include(GNUInstallDirs)
- 
- # Compiler vendors
- ## g++
-@@ -166,8 +167,8 @@ target_link_libraries(
- #set(CMAKE_CXX_EXTENSIONS OFF)
- 
- # installation path
--set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
--set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-+set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- set(TF_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittests)
- set(TF_EXAMPLE_DIR ${PROJECT_SOURCE_DIR}/examples)
- set(TF_BENCHMARK_DIR ${PROJECT_SOURCE_DIR}/benchmarks)
-@@ -799,7 +800,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
- install(
-   EXPORT ${PROJECT_NAME}Targets 
-   NAMESPACE ${PROJECT_NAME}:: 
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
-+  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
- )
- 
- # set up config
-@@ -808,7 +809,7 @@ include(CMakePackageConfigHelpers)
- configure_package_config_file(
-   ${PROJECT_NAME}Config.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
-+  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
-   PATH_VARS TF_INC_INSTALL_DIR
- )
- 
-@@ -820,6 +821,6 @@ write_basic_package_version_file(
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake 
-+  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
- )
- 
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch
deleted file mode 100644
index 5b53c318a0..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix-version-number.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f49c398..834b32e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@ MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT})
- set(CMAKE_VERBOSE_MAKEFILE ON)
- 
- # Project name
--project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX)
-+project(Cpp-Taskflow VERSION 2.4.0 LANGUAGES CXX)
- 
- # build options
- option(TF_ENABLE_CUDA "Enables build of cuda code" OFF)
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch
deleted file mode 100644
index c1d8933655..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-optional-tests-examples.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8debfa4..4b9c134 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,8 @@ project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX)
- # build options
- option(TF_ENABLE_CUDA "Enables build of cuda code" OFF)
- option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF)
-+option(TF_BUILD_EXAMPLES "Enable build of examples" OFF)
-+option(TF_BUILD_TESTS "Enable build of tests" OFF)
- 
- # Include additional language check
- include(CheckLanguage)
-@@ -227,6 +229,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
- # Example program 
- # -----------------------------------------------------------------------------
- 
-+if (TF_BUILD_EXAMPLES)
- message(STATUS "Building examples ...")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR})
- 
-@@ -289,10 +292,12 @@ target_link_libraries(
-   device_property ${PROJECT_NAME} Threads::Threads tf::default_settings
- )
- endif(${TF_ENABLE_CUDA})
-+endif(TF_BUILD_EXAMPLES)
- 
- # -----------------------------------------------------------------------------
- # Unittest
- # -----------------------------------------------------------------------------
-+if (TF_BUILD_TESTS)
- enable_testing()
- message(STATUS "Building unit tests ...")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR})
-@@ -516,6 +521,7 @@ add_test(cuda_matrix.transpose ${TF_UTEST_DIR}/cuda/cuda_matrix -tc=transpose)
- add_test(cuda_matrix.product ${TF_UTEST_DIR}/cuda/cuda_matrix -tc=product)
- 
- endif(${TF_ENABLE_CUDA})
-+endif(TF_BUILD_TESTS)
- 
- # -----------------------------------------------------------------------------
- # Benchmarking (enabled by TF_BUILD_BENCHMARKS)
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch
deleted file mode 100644
index 4969debbb1..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-fix-lib-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b483a5..83d9430 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,6 +15,7 @@ option(TF_BUILD_TESTS "Enable build of tests" OFF)
- 
- # Include additional language check
- include(CheckLanguage)
-+include(GNUInstallDirs)
- 
- # Compiler vendors
- ## g++
-@@ -159,8 +160,8 @@ target_link_libraries(
- #set(CMAKE_CXX_EXTENSIONS OFF)
- 
- # installation path
--set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
--set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set(TF_INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-+set(TF_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- set(TF_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittests)
- set(TF_EXAMPLE_DIR ${PROJECT_SOURCE_DIR}/examples)
- set(TF_BENCHMARK_DIR ${PROJECT_SOURCE_DIR}/benchmarks)
-@@ -835,7 +836,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
- install(
-   EXPORT ${PROJECT_NAME}Targets 
-   NAMESPACE ${PROJECT_NAME}:: 
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
-+  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
- )
- 
- # set up config
-@@ -844,7 +845,7 @@ include(CMakePackageConfigHelpers)
- configure_package_config_file(
-   ${PROJECT_NAME}Config.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake
-+  INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
-   PATH_VARS TF_INC_INSTALL_DIR
- )
- 
-@@ -856,6 +857,6 @@ write_basic_package_version_file(
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake 
-+  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
- )
- 
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch
deleted file mode 100644
index 94b1dbcca7..0000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-9999-optional-tests-examples.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 281f47f..0b483a5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,8 @@ project(Cpp-Taskflow VERSION 2.4.0 LANGUAGES CXX)
- 
- # build options
- option(TF_BUILD_BENCHMARKS "Enables build of benchmarks" OFF)
-+option(TF_BUILD_EXAMPLES "Enable build of examples" OFF)
-+option(TF_BUILD_TESTS "Enable build of tests" OFF)
- 
- # Include additional language check
- include(CheckLanguage)
-@@ -219,6 +221,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
- # Example program 
- # -----------------------------------------------------------------------------
- 
-+if (TF_BUILD_EXAMPLES)
- message(STATUS "Building examples ...")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR})
- 
-@@ -291,10 +294,12 @@ target_link_libraries(
-   kmeans ${PROJECT_NAME} Threads::Threads tf::default_settings
- )
- endif(CMAKE_CUDA_COMPILER)
-+endif(TF_BUILD_EXAMPLES)
- 
- # -----------------------------------------------------------------------------
- # Unittest
- # -----------------------------------------------------------------------------
-+if (TF_BUILD_TESTS)
- enable_testing()
- message(STATUS "Building unit tests ...")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR})
-@@ -616,6 +621,7 @@ add_test(cuda_kmeans.1000.8C8G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.8C8G)
- add_test(cuda_kmeans.1000.16C16G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.16C16G)
- 
- endif(CMAKE_CUDA_COMPILER)
-+endif(TF_BUILD_TESTS)
- 
- # -----------------------------------------------------------------------------
- # Benchmarking (enabled by TF_BUILD_BENCHMARKS)
diff --git a/dev-cpp/cpp-taskflow/metadata.xml b/dev-cpp/cpp-taskflow/metadata.xml
deleted file mode 100644
index 23d1a01876..0000000000
--- a/dev-cpp/cpp-taskflow/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		Cpp-Taskflow helps you quickly write parallel programs with high performance scalability and simultaneous high productivity.
-	</longdescription>
-	<maintainer type="person">
-		<email>m.santullo@posteo.net</email>
-		<name>Michele Santullo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cpp-taskflow/cpp-taskflow</remote-id>
-		<bugs-to>https://github.com/cpp-taskflow/cpp-taskflow/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
deleted file mode 100644
index 2c0b011998..0000000000
--- a/dev-python/aiofiles/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
diff --git a/dev-python/aiofiles/aiofiles-0.5.0.ebuild b/dev-python/aiofiles/aiofiles-0.5.0.ebuild
deleted file mode 100644
index e61975b98b..0000000000
--- a/dev-python/aiofiles/aiofiles-0.5.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="File support for asyncio"
-HOMEPAGE="https://github.com/Tinche/aiofiles"
-SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiofiles/metadata.xml b/dev-python/aiofiles/metadata.xml
deleted file mode 100644
index a507be0a78..0000000000
--- a/dev-python/aiofiles/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-    <maintainer type="person">
-        <email>piotr.staroszczyk@get24.org</email>
-        <name>Piotr Staroszczyk</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
deleted file mode 100644
index 558e8a943c..0000000000
--- a/dev-python/dataclasses/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
deleted file mode 100644
index 7c318e4afd..0000000000
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A backport of the dataclasses module for Python 3.6"
-HOMEPAGE="https://github.com/ericvsmith/dataclasses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 "
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httpx/httpx-0.11.1.ebuild b/dev-python/httpx/httpx-0.11.1.ebuild
index c11a91991d..1da6e4195c 100644
--- a/dev-python/httpx/httpx-0.11.1.ebuild
+++ b/dev-python/httpx/httpx-0.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpx/httpx-0.12.1.ebuild b/dev-python/httpx/httpx-0.12.1.ebuild
index dd4c1f3c91..0f081affdc 100644
--- a/dev-python/httpx/httpx-0.12.1.ebuild
+++ b/dev-python/httpx/httpx-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 DOCBUILDER="mkdocs"
 DOCDEPEND="dev-python/mkdocs-material"
diff --git a/dev-python/httpx/httpx-0.13.3.ebuild b/dev-python/httpx/httpx-0.13.3.ebuild
index 57009b0c49..0021468037 100644
--- a/dev-python/httpx/httpx-0.13.3.ebuild
+++ b/dev-python/httpx/httpx-0.13.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 DOCBUILDER="mkdocs"
 DOCDEPEND="dev-python/mkdocs-material"
diff --git a/dev-python/httpx/httpx-0.9.3.ebuild b/dev-python/httpx/httpx-0.9.3.ebuild
index c21cd73c42..93c2c6b5f1 100644
--- a/dev-python/httpx/httpx-0.9.3.ebuild
+++ b/dev-python/httpx/httpx-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
deleted file mode 100644
index a0c111d5b4..0000000000
--- a/dev-python/influxdb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST influxdb-5.3.0.tar.gz 79773 BLAKE2B d70d5594698904018993ce33b27aee89aef9a34f74ef19dcb31888f11e8a2dcb510116f6c5a573b934bae4101b0e976f4dc87dcb16ec85a97054b7531a6c0256 SHA512 87129544b5bef8062d452447626b639b675bf6ba5076f38d4616a364fa6dfea6aa73beece239aeb8f2294314c4fe6bc7e3ae5d7e463592bd0f77ed3aaaff5557
diff --git a/dev-python/influxdb/influxdb-5.3.0.ebuild b/dev-python/influxdb/influxdb-5.3.0.ebuild
deleted file mode 100644
index ca38736e95..0000000000
--- a/dev-python/influxdb/influxdb-5.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for InfluxDB"
-HOMEPAGE="https://github.com/influxdata/influxdb-python"
-# pypi mirror don't have all required tests files
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-python-${PV}"
-
-RDEPEND="
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
deleted file mode 100644
index b2638d0013..0000000000
--- a/dev-python/influxdb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>davidroman96@gmail.com</email>
-        <name>David Roman</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">influxdata/influxdb-python</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/dev-python/pykeepass/pykeepass-3.2.0.ebuild b/dev-python/pykeepass/pykeepass-3.2.0.ebuild
index 8293619bd6..3a56459a53 100644
--- a/dev-python/pykeepass/pykeepass-3.2.0.ebuild
+++ b/dev-python/pykeepass/pykeepass-3.2.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/argon2_cffi-19.1.0[${PYTHON_USEDEP}]
+	>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
 	>=dev-python/construct-2.9.4[${PYTHON_USEDEP}]
 	>=dev-python/future-0.17.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-sanic/pytest-sanic-1.6.1.ebuild b/dev-python/pytest-sanic/pytest-sanic-1.6.1.ebuild
index bf36833fe8..ec16cbbbc2 100644
--- a/dev-python/pytest-sanic/pytest-sanic-1.6.1.ebuild
+++ b/dev-python/pytest-sanic/pytest-sanic-1.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
deleted file mode 100644
index 476e0a9e39..0000000000
--- a/dev-python/python-dotenv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-dotenv-0.13.0.tar.gz 28679 BLAKE2B 068c4cb499956a14bb4c310d2c9a63f4c33b6621efd11c231eeea2808951530fa6e7bd5356973c19f7ba6f3693434ca46bfadd065c7369f95014389badb2a00c SHA512 a7e725fd0fcb262f240a8f9eb6cf9b73560d799a10ec946cf901f960cbfa972396ead1aca833808a1675ebaec0b89720c32b2fe957ef9805faa942b0df1a9608
diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
deleted file mode 100644
index 384f1919e3..0000000000
--- a/dev-python/python-dotenv/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">theskumar/python-dotenv</remote-id>
-		<remote-id type="pypi">python-dotenv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
deleted file mode 100644
index 746e0370de..0000000000
--- a/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-# Some failures, likely an incompatibility with newer versions of sh (no old in ::gentoo)
-RESTRICT="test"
-
-DESCRIPTION="Get and set values in your .env file in local and production servers"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-distutils_enable_tests pytest
-
-DEPEND="test? (
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/rstcheck/rstcheck-3.3.1.ebuild b/dev-python/rstcheck/rstcheck-3.3.1.ebuild
index c92918af7b..1a29268f64 100644
--- a/dev-python/rstcheck/rstcheck-3.3.1.ebuild
+++ b/dev-python/rstcheck/rstcheck-3.3.1.ebuild
@@ -14,8 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
@@ -30,6 +28,8 @@ BDEPEND="
 
 S="${WORKDIR}/${P}"
 
+distutils_enable_tests pytest
+
 python_test() {
 	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
 	# Otherwise, ImportMismatchError may occur
diff --git a/dev-python/sanic/Manifest b/dev-python/sanic/Manifest
index 30b9cc7583..aa86a6d2cb 100644
--- a/dev-python/sanic/Manifest
+++ b/dev-python/sanic/Manifest
@@ -1,2 +1 @@
-DIST sanic-19.12.2.tar.gz 195755 BLAKE2B 0d903b06403f28a901d21bfc685219064d0ec2b11576baf714aa3250cc3474928da03c34f0a5a25bf92191242b0a41f76d41aabe92a805bea1801e569c892e9a SHA512 93e416ceea5577db4c443dd6dd03cc5e990d4f987d49821b70d5602421d38401e155e2aad166c88ec57fc5361350c641f087b461a6d92acde34455db81429c5c
-DIST sanic-20.3.0.tar.gz 200120 BLAKE2B 14c648f6607b924ee8c19a481b027866a1e24b13249129d3e3fd2ebaf48243ec30d800cd0f62f3f361ae265ef4139676b5aaa4d5481e57459360df11d9fb5c8d SHA512 05615b2b0a2f3b03b2cdf6cff9d2df6f95a54c12be98b54674a2060104327e9a98db55b5e9fbc608f4e624abbb68e7b2f169df26c8197669aad05a4e15ac3ee7
+DIST sanic-20.6.3.tar.gz 207406 BLAKE2B 323f9d0d4965ee8fab4ffb95140f85d059f1bba777f36cc69703b7569c29a852631dd446dd0469207e8ccca3636aa45acfb6b50f290c6ddcc4f56249683a12b7 SHA512 c2b3eafcaee77e75b603e62feeb397382b2017d80191507a43db2595cc64e8b37b569b204474f94f5bdaae909c83baca7d7667ef46a0dd7324991efe15b22ebf
diff --git a/dev-python/sanic/sanic-19.12.2.ebuild b/dev-python/sanic/sanic-19.12.2.ebuild
deleted file mode 100644
index 45084503c4..0000000000
--- a/dev-python/sanic/sanic-19.12.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Async Python 3.6+ web server/framework | Build fast. Run fast."
-HOMEPAGE="
-	https://pypi.python.org/pypi/sanic
-	https://github.com/huge-success/sanic
-"
-SRC_URI="https://github.com/huge-success/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiofiles[${PYTHON_USEDEP}]
-	~dev-python/httpx-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/httptools-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	<dev-python/multidict-5.0[${PYTHON_USEDEP}]
-	dev-python/uvloop[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	>=dev-python/websockets-7.0[${PYTHON_USEDEP}]
-	<dev-python/websockets-9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/httpcore[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/pytest-sanic[${PYTHON_USEDEP}]
-		dev-python/pytest-sugar[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-				dev-python/docutils \
-				dev-python/pygments \
-				">=dev-python/sphinx-2.1.2" \
-				dev-python/sphinx_rtd_theme \
-				">=dev-python/recommonmark-0.5.0"
diff --git a/dev-python/sanic/sanic-20.3.0.ebuild b/dev-python/sanic/sanic-20.6.3.ebuild
similarity index 80%
rename from dev-python/sanic/sanic-20.3.0.ebuild
rename to dev-python/sanic/sanic-20.6.3.ebuild
index 15a52d73c2..5db11eb05d 100644
--- a/dev-python/sanic/sanic-20.3.0.ebuild
+++ b/dev-python/sanic/sanic-20.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
@@ -20,15 +20,14 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/aiofiles[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.12[${PYTHON_USEDEP}]
+	~dev-python/httpx-0.11.1[${PYTHON_USEDEP}]
 	>=dev-python/httptools-0.0.10[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
 	<dev-python/multidict-5.0[${PYTHON_USEDEP}]
-	>=dev-python/ujson-1.35[${PYTHON_USEDEP}]
-	>=dev-python/uvloop-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/websockets-7.0[${PYTHON_USEDEP}]
-	<dev-python/websockets-8.0[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	dev-python/uvloop[${PYTHON_USEDEP}]
+	>=dev-python/websockets-8.1[${PYTHON_USEDEP}]
+	<dev-python/websockets-9.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-python/tekore/tekore-1.7.0.ebuild b/dev-python/tekore/tekore-1.7.0.ebuild
index 053b6d08ea..67deaf4eb8 100644
--- a/dev-python/tekore/tekore-1.7.0.ebuild
+++ b/dev-python/tekore/tekore-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
@@ -16,15 +16,11 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-# tests fail with py3_6: no module named run
-RESTRICT="python_targets_python3_6? ( test )"
-
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/httpx-0.11.1[${PYTHON_USEDEP}]
 	<dev-python/httpx-0.13[${PYTHON_USEDEP}]
 	media-sound/spotify
-	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
 "
 
 DOCS="readme.rst"
diff --git a/dev-python/tekore/tekore-2.1.0.ebuild b/dev-python/tekore/tekore-2.1.0.ebuild
index 26258cce36..84d7136360 100644
--- a/dev-python/tekore/tekore-2.1.0.ebuild
+++ b/dev-python/tekore/tekore-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
@@ -21,7 +21,6 @@ RDEPEND="
 	>=dev-python/httpx-0.11.1[${PYTHON_USEDEP}]
 	<dev-python/httpx-0.14[${PYTHON_USEDEP}]
 	media-sound/spotify
-	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
 "
 
 DOCS="readme.rst"
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
deleted file mode 100644
index 7cf837a09d..0000000000
--- a/dev-python/text-unidecode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
diff --git a/dev-python/text-unidecode/metadata.xml b/dev-python/text-unidecode/metadata.xml
deleted file mode 100644
index 3f17f6d77e..0000000000
--- a/dev-python/text-unidecode/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">text-unidecode</remote-id>
-    <maintainer status="unknown">
-      <email>kmike84@gmail.com</email>
-      <name>Mikhail Korobov</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
deleted file mode 100644
index cf75f07139..0000000000
--- a/dev-python/text-unidecode/text-unidecode-1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="The most basic Text::Unidecode port"
-HOMEPAGE="https://github.com/kmike/text-unidecode"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i '/pytest-runner/d' setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die
-	cp "${S}/test_unidecode.py" . || die
-	cp "${S}/setup.cfg" . || die
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/uvicorn/uvicorn-0.11.5.ebuild b/dev-python/uvicorn/uvicorn-0.11.5.ebuild
index 1598187716..605377a334 100644
--- a/dev-python/uvicorn/uvicorn-0.11.5.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
deleted file mode 100644
index 5c779d1d4e..0000000000
--- a/dev-python/websockets/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST websockets-7.0.tar.gz 122848 BLAKE2B 7c201831c563a8ae036f9310533a3627fca9e9f91ba77cac27a62852336d4c2a79bd07b3186e10e0c797520a73750201e3ca70358fe5a0304b35e9f6b637196c SHA512 08dd310d8f946522f60ba302f3246f81e283d11f308f658a3c3a3c597281a31b1376e5d16d900187d148b0c1ec1250cd730ccb26f6b753dd86ca5682a08af9a9
-DIST websockets-8.1.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
diff --git a/dev-python/websockets/metadata.xml b/dev-python/websockets/metadata.xml
deleted file mode 100644
index 5839cf4564..0000000000
--- a/dev-python/websockets/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-  <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
-    <name>Andrew Ammerlaan</name>
-  </maintainer>
-  <longdescription lang="en">
-What is websockets?
-
-websockets is a library for building WebSocket servers and clients in Python with a focus on correctness and simplicity.
-
-Built on top of asyncio, Python's standard asynchronous I/O framework, it provides an elegant coroutine-based API.
-Why should I use websockets?
-
-The development of websockets is shaped by four principles:
-
-    Simplicity: all you need to understand is msg = await ws.recv() and await ws.send(msg); websockets takes care of managing connections so you can focus on your application.
-    Robustness: websockets is built for production; for example it was the only library to handle backpressure correctly before the issue became widely known in the Python community.
-    Quality: websockets is heavily tested. Continuous integration fails under 100% branch coverage. Also it passes the industry-standard Autobahn Testsuite.
-    Performance: memory use is configurable. An extension written in C accelerates expensive operations. It's pre-compiled for Linux, macOS and Windows and packaged in the wheel format for each system and Python version.
-
-Documentation is a first class concern in the project. Head over to Read the Docs and see for yourself.
-Why shouldn't I use websockets?
-
-    If you prefer callbacks over coroutines: websockets was created to provide the best coroutine-based API to manage WebSocket connections in Python. Pick another library for a callback-based API.
-    If you're looking for a mixed HTTP / WebSocket library: websockets aims at being an excellent implementation of RFC 6455: The WebSocket Protocol and RFC 7692: Compression Extensions for WebSocket. Its support for HTTP is minimal — just enough for a HTTP health check.
-    If you want to use Python 2: websockets builds upon asyncio which only works on Python 3. websockets requires Python ≥ 3.6.1.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">aaugustin/websockets</remote-id>
-    <remote-id type="pypi">websockets</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/websockets/websockets-7.0.ebuild b/dev-python/websockets/websockets-7.0.ebuild
deleted file mode 100644
index ee9fcd1b04..0000000000
--- a/dev-python/websockets/websockets-7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
-HOMEPAGE="
-		https://github.com/aaugustin/websockets
-		https://pypi.org/project/websockets
-"
-SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_prepare_all() {
-	# these tests fail, probably because of
-	# a permission error (no internet)
-	rm tests/test_client_server.py || die
-	rm tests/test_protocol.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs dev-python/sphinx-autodoc-typehints dev-python/sphinxcontrib-spelling dev-python/sphinxcontrib-trio
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
deleted file mode 100644
index 9307bdd1b7..0000000000
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
-HOMEPAGE="
-		https://github.com/aaugustin/websockets
-		https://pypi.org/project/websockets/
-"
-SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_prepare_all() {
-	# these tests fail, probably because of
-	# a permission error (no internet)
-	rm tests/test_client_server.py || die
-	rm tests/test_protocol.py || die
-	rm tests/test_auth.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs dev-python/sphinx-autodoc-typehints dev-python/sphinxcontrib-spelling dev-python/sphinxcontrib-trio
diff --git a/gui-apps/wdisplays/Manifest b/gui-apps/wdisplays/Manifest
new file mode 100644
index 0000000000..0cb2a7b596
--- /dev/null
+++ b/gui-apps/wdisplays/Manifest
@@ -0,0 +1 @@
+DIST wdisplays-1.0.tar.gz 106819 BLAKE2B d8a34ea82b88f99e27b5c42dc2e8bfed2bf69db719617d81d5f2c994e9020d206937e940f57452c99b534ceda241cea570899c7bdc74377009f7aa013e78b638 SHA512 876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e
diff --git a/dev-python/dataclasses/metadata.xml b/gui-apps/wdisplays/metadata.xml
similarity index 50%
rename from dev-python/dataclasses/metadata.xml
rename to gui-apps/wdisplays/metadata.xml
index 628ab20176..7066f7e91b 100644
--- a/dev-python/dataclasses/metadata.xml
+++ b/gui-apps/wdisplays/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
+  <maintainer type="person">
+    <name>Matthias Coppens</name>
+    <email>coppens.matthias.abc@gmail.com</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/gui-apps/wdisplays/wdisplays-1.0.ebuild b/gui-apps/wdisplays/wdisplays-1.0.ebuild
new file mode 100644
index 0000000000..02f3aa33f5
--- /dev/null
+++ b/gui-apps/wdisplays/wdisplays-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/cyclopsian/${PN}"
+case "${PV}" in
+	"9999")
+		inherit git-r3
+		;;
+	*)
+		SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+esac
+inherit meson xdg
+
+DESCRIPTION="GUI display configurator for wlroots compositors"
+HOMEPAGE="https://cyclopsian.github.io/${PN}"
+
+BDEPEND="
+	x11-libs/gtk+:3
+	gui-libs/wlroots"
+DEPEND="${BDEPEND}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="~amd64"
diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild b/gui-apps/wdisplays/wdisplays-9999.ebuild
new file mode 100644
index 0000000000..88406d32c9
--- /dev/null
+++ b/gui-apps/wdisplays/wdisplays-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/cyclopsian/${PN}"
+case "${PV}" in
+	"9999")
+		inherit git-r3
+		;;
+	*)
+		SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+esac
+inherit meson xdg
+
+DESCRIPTION="GUI display configurator for wlroots compositors"
+HOMEPAGE="https://cyclopsian.github.io/${PN}"
+
+BDEPEND="
+	x11-libs/gtk+:3
+	gui-libs/wlroots"
+DEPEND="${BDEPEND}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS=""
diff --git a/gui-apps/wofi/Manifest b/gui-apps/wofi/Manifest
deleted file mode 100644
index b99b663391..0000000000
--- a/gui-apps/wofi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wofi-1.1.1.tar.gz 64769 BLAKE2B ee9b7959afd0d91164046211bf4122e4cb0a04ec2f448f2feb063a87c9b75c7e1be1a53f583432791293ff66ca4552192eda027ef454998cb739d9823db2f0d7 SHA512 3c0569c86789f2834879782bf11aed893e1a5334e613cd04676651af36009c61e0cdb5ce197b56c44f434088a9da35f6bbbe65a58a95afdf5a7f4ba637e018df
-DIST wofi-1.1.2.tar.gz 64808 BLAKE2B a48fb574a185e1fb93504dc9cd7ab7177871b992918a506507934e9c60c049eb76aed3e7884ca42e63b8fbc7246b27d79ab0882502527d9c22f0b7eb168fe3db SHA512 5edef74d6c6fe64b1024e67a5cfba1820ccc3f09815130bf82c7c726b6c64d9bdd94341096f202ffe6427c910ac632cedc00a7a36c356d45adafa560ec2bbcfe
diff --git a/gui-apps/wofi/wofi-1.1.1.ebuild b/gui-apps/wofi/wofi-1.1.1.ebuild
index 791e0d6fca..7f527dae0f 100644
--- a/gui-apps/wofi/wofi-1.1.1.ebuild
+++ b/gui-apps/wofi/wofi-1.1.1.ebuild
@@ -3,20 +3,21 @@
 
 EAPI=7
 
+# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
+# This makes them impossible to validate, so every version has a live ebuild.
+
 EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
+inherit meson mercurial
 case "${PV}" in
 	"9999")
-		inherit mercurial
 		;;
 	*)
-		SRC_URI="${EHG_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-v${PV}"
+		EHG_REVISION="v${PV}"
 esac
-inherit meson
 
 DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
 HOMEPAGE="${EHG_REPO_URI}"
 LICENSE="GPL-3"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
diff --git a/gui-apps/wofi/wofi-1.1.2.ebuild b/gui-apps/wofi/wofi-1.1.2.ebuild
index 791e0d6fca..7f527dae0f 100644
--- a/gui-apps/wofi/wofi-1.1.2.ebuild
+++ b/gui-apps/wofi/wofi-1.1.2.ebuild
@@ -3,20 +3,21 @@
 
 EAPI=7
 
+# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
+# This makes them impossible to validate, so every version has a live ebuild.
+
 EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
+inherit meson mercurial
 case "${PV}" in
 	"9999")
-		inherit mercurial
 		;;
 	*)
-		SRC_URI="${EHG_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-v${PV}"
+		EHG_REVISION="v${PV}"
 esac
-inherit meson
 
 DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
 HOMEPAGE="${EHG_REPO_URI}"
 LICENSE="GPL-3"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
diff --git a/gui-apps/wofi/wofi-9999.ebuild b/gui-apps/wofi/wofi-9999.ebuild
index d9a1fc7dc7..7f527dae0f 100644
--- a/gui-apps/wofi/wofi-9999.ebuild
+++ b/gui-apps/wofi/wofi-9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=7
 
+# Upstream's tarballs are timestamped (https://todo.sr.ht/~sircmpwn/hg.sr.ht/33).
+# This makes them impossible to validate, so every version has a live ebuild.
+
 EHG_REPO_URI="https://hg.sr.ht/~scoopta/${PN}"
+inherit meson mercurial
 case "${PV}" in
 	"9999")
-		inherit mercurial
 		;;
 	*)
-		SRC_URI="${EHG_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-v${PV}"
+		EHG_REVISION="v${PV}"
 esac
-inherit meson
 
 DESCRIPTION="Wofi is a launcher/menu program for wlroots based wayland compositors like sway"
 HOMEPAGE="${EHG_REPO_URI}"
diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
index aebb02f195..059572edef 100644
--- a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
+++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
diff --git a/media-video/vidify/vidify-2.2.5.ebuild b/media-video/vidify/vidify-2.2.5.ebuild
index 55298d9f62..c207e1d67d 100644
--- a/media-video/vidify/vidify-2.2.5.ebuild
+++ b/media-video/vidify/vidify-2.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/net-im/srain/Manifest b/net-im/srain/Manifest
index f56bd1ccae..3a0ed1a2cb 100644
--- a/net-im/srain/Manifest
+++ b/net-im/srain/Manifest
@@ -1 +1 @@
-DIST srain-1.1.0.tar.gz 941873 BLAKE2B db8039b4fa5f6ae31dba24cd6274608c994e85fffc237d12cdde7b4d3b47d94fd88d8ae4ace828dffb3eb76d6c1e05a797eabaca2caa31c09cb3f938fab33039 SHA512 0303d1734840c9af81f786da405617392570c2f34a9098fe7d1148f63642fb034877549477a8b52add8f1da7dc4ac38474a1cf3e42e51cc443b06b50c765b02a
+DIST srain-1.1.1.tar.gz 941824 BLAKE2B 96b53e7e05f42514bc429cc30938f3a104d65f48ffbc08f0ec176e8bff6fc346cc6dabbcd8cfaa9db41af205a4079400f4b24ea1ad7ef4cb787b34eedd6d6cf5 SHA512 1cd8604b79d03a054b6b785529feef9479836f5fdc406101f3e67bfcb6a400ab8dae2b1ac317fd92b491e60faae069c3a61f4997ae15b6c9b2373b20e8ab7ac0
diff --git a/net-im/srain/srain-1.1.0.ebuild b/net-im/srain/srain-1.1.1.ebuild
similarity index 100%
rename from net-im/srain/srain-1.1.0.ebuild
rename to net-im/srain/srain-1.1.1.ebuild