13 files changed, 163 insertions, 253 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1858b7f23d05..71839f6eb9ff 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 648abdd5329a..f5ed2228f75b 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,7 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
 DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
-DIST asio-1.18.0.tar.bz2 1724947 BLAKE2B 6772a70c035e7df08484703b6f2fa294b6a1ade4b1e661481df0e790fe4a36d74f0f4b14023c7505fc599c4eefb3e3baf392fd7897c10c07707a0474870a6557 SHA512 4b21b72463951ffc5ef72636858955ae5af5ce0dec4c835fccf3c7e8ccfa10bd97530bfc2ec9c3f601374da8300ac2e61418845d3331c980fa9876057bbbb1e0
 DIST asio-1.18.1.tar.bz2 1729219 BLAKE2B 3f020407403175ffb6777b855a38e708241499e0fc8f1389b367bac4faf1e14b94cdf45f3b5ba64e12303237c8a3f817f7b7c320e7a58d72be6b19e04022c681 SHA512 06b41869858b69bc523564d5b219f8ebc995ca862e989f65233778c7596143075662880b6c5dd2eb24c21ba6e68a450888ab07a6bc8585bb6ede9a738e1e27c0
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.17.0.ebuild 1182 BLAKE2B ac2cfb623111f9f7d4e64ddeaa395f3f4126aeccd666f82f0145ad62bb4a166cdaad9735bd7400071873e9e6b3718e20986150969ca2acb12dd81cbbfa9218f5 SHA512 4c518c0cc5988a5b821735df8fff7953c5511cb69efbcb8f44584867d1a195cd0f7e896fbf7187b9091324960c379ce5b2e46200e0fdd2440935911e44bd8c90
-EBUILD asio-1.18.0.ebuild 1187 BLAKE2B bd32997c2ee92bcb2854e5f6491467017b129d75bd2fc166caffbffd0494821eb083009fc89b090eaaf8c88971cc16b838fdc221b4bfa8c2731c30c99b98c21e SHA512 16dccbbfe6f1b40aa626465d8a3cb4c15dfbc34a638d727852c723ec8f31c398b02fa0041bea0617799023397954518099d152265033110faaadc7193b98cb18
 EBUILD asio-1.18.1.ebuild 1189 BLAKE2B c295b2e1390300049aa5398a223ad6f3d587b9757177edb977a3688171123d5ffc7445cfb4a61c9bddcf653196ceb198cb76e7e653389df2e1100aedeb74e450 SHA512 c3aedc8a54cbe87e01242c56549ad389a17fae7d785e71166a169f51e5060ca392641e0f0737c002e3717d44980bda12575241aa9ec8d81ddd6527a028f859c2
 MISC metadata.xml 456 BLAKE2B b92702f7cd621e3bb4191c6dedc380e21d934e7299202b572c68e9bb029fb0abd1b834bc053b18ddd6293d65d522ade938791fdc6a885a85aab63e3b90f0adf8 SHA512 451257fa1e2f3ccab92aea2e81984de91ffe61e61ba57d56fe86d06a09dbcdb6491e13b2e7e3dc02c0cd924b19bde0000772100eaef8929b1a3779d174e918cf
diff --git a/dev-cpp/asio/asio-1.18.0.ebuild b/dev-cpp/asio/asio-1.18.0.ebuild
deleted file mode 100644
index 1a7e5378adbc..000000000000
--- a/dev-cpp/asio/asio-1.18.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples libressl ssl test"
-RESTRICT="!test? ( test )"
-# test searches for libssl during ./configure, and REQUIRED_USE is easier than
-# patching configure to not search for it with USE=-ssl
-REQUIRED_USE="test? ( ssl )"
-
-RDEPEND="dev-libs/boost
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 644af35ee53a..8b3f0380f77c 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,9 +1,11 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784 SHA512 caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55
+DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
-EBUILD catch-2.13.3.ebuild 916 BLAKE2B 559f727bbda4475f593c3705325d1d1a7a612b0ae34a10b6105ef563b3324ee3665c6a251a12e248160553ff127fcb2a6928459d5305b1e43c3697509d1e1042 SHA512 b4af3da0fa6725cdd3acd567d8241a90b512a84f4e2a3ae02077026a4b835865f4b12b3171f9d7c036c33fdfea60c2f79998c93ca3dcc71318d66964e0fe476a
+EBUILD catch-2.13.3.ebuild 915 BLAKE2B 951ce9998c21adafbe197e7f79f08f9cdbeb5d0616834da196eb04d8b2eb4cd0599ae261c5c7761f09c11123bb1ac2eb6556948000c5c819bc56643bf7e65633 SHA512 b3f044f1b8db5a9423bc7c6cdf196c7b6144235c5d45c924ecbf8f4e4880e0707eb0aca3bd64bce566510a83b020d9ce1b12b3a8e0cfca209f70b69e6f41088d
+EBUILD catch-2.13.4.ebuild 916 BLAKE2B 83e70999eed844a26d305d6289e3a75638838c289f1c308237b31e63eb67c8051ae0d3e1432422f65b0a4d86c0f9fd4699b3abdafca0bd21bdf9696d4ce8f025 SHA512 be30df1917e8f0b01674d4247e2e110e658a7deb4194fc6226b14188c3f95a596dd48628a28a5cf0535a9a9d7a5162f8e04a86386f5dac8e821b8c7366dc87f3
 EBUILD catch-2.5.0.ebuild 904 BLAKE2B 46a8193ac8712652a0ebbb951af317baa92c451498fb7bbadd86e642505bcdd950e42b813cc2ef449e6fe4d7781c2e5e5e08c2df6f85128c29ac3d3c7cd6950c SHA512 524bb5a1ab8eeca5e4cb626590f5b4a5512bf0f27b6e9c2a64e782e02c206fc22ab830481d5a962e739ea6b373d1951f5239b4b2e6ec8e02b686fa698af6032c
 EBUILD catch-9999.ebuild 957 BLAKE2B 205ee11310e6632771e9a8705fc24a5b0652b72dd8c1bd8492d507d409713cc1e67396a8095f39349a5bc8d5f36f839abbd446cc2343d0fdb3547ae13c688003 SHA512 1a362aa2a514d5787de98744ed7a56e1374ec790b9d45646bc03e10b8b0996092db757f65c9c9cf52aceb818a81dee0c65121785279723f8e9b3cf2c00a7fdc6
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.13.3.ebuild b/dev-cpp/catch/catch-2.13.3.ebuild
index 87bf6c59f3c9..b5755bce9997 100644
--- a/dev-cpp/catch/catch-2.13.3.ebuild
+++ b/dev-cpp/catch/catch-2.13.3.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/dev-cpp/catch/catch-2.13.4.ebuild b/dev-cpp/catch/catch-2.13.4.ebuild
new file mode 100644
index 000000000000..d59bb07bc66a
--- /dev/null
+++ b/dev-cpp/catch/catch-2.13.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake python-any-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+else
+	MY_P=${PN^}2-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCATCH_ENABLE_WERROR=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	use test &&
+		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index 59113d5cc7b0..7204301b23c0 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,7 +1,4 @@
-AUX cpp-taskflow-2.4.0-do_not_compile_examples.patch 2634 BLAKE2B 6b326b97e721061892abe0e01bcfb49dffea91b641684b1c860c8f8384153103107d9ab26dfaa4b577897e49f45fa2a6cfaaf5cf49409afa429b5dd0c7aefda9 SHA512 21b61ba80536cf8baa24c67e35902b66fb98408f86be8a4611b15304525c2e14a20af80507ccdd4d6a365303abdc38d1d199f1888baa0a35a04483a837ddadd5
-AUX cpp-taskflow-2.4.0-fix_installation_path.patch 739 BLAKE2B 6cf25c76b91d3e60c7a9f35bcf0d5a89f28dd42efb32c3fa57eefd9b716e9905d20cd8becc0a47cf74f992bf2e77b6051034f62533dbfdab4b57a70a4b24eecf SHA512 36e2284da55eba9ca24a34e8baa105a28e411d54927378f6978c96c19af08a760fc4f3caff6ec4f325d63ca8974e7b66e27e3c69ba39e22f6b8e67d3ae303b24
-DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f
-DIST cpp-taskflow-2.6.0.tar.gz 68626469 BLAKE2B d85b1615be47c1e98e613e7875424892613205a0cc3f380f7d6fd0521045c5750441e9267382ec5282299e4074a7b85f442e53f38a2f12aff7d3d925a94b8773 SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133
-EBUILD cpp-taskflow-2.4.0-r1.ebuild 603 BLAKE2B 0620b659d11e94d1fde1e6f53767a98aded76fc8f7b2af238e0ff4a900484dbae00a288e12bce48a4c3adde8ced548dcef577528473328408e93219b1e49ebb3 SHA512 fd5822c2ff54904142ebf6fc5c36f263ce16178d6b161aa412dad4cb378f9e9449943e2a836cc815c9e3d6ef4f4f32bed6ef86ae0f712689cc81bb2cc4b9887f
-EBUILD cpp-taskflow-2.6.0.ebuild 873 BLAKE2B 61b2318d8380aaabf27a8965bf5759b90d8941d9c7cb183273141d462fc4cfc0d41b705fc5a69537d5154325298634dde3808a207ea0bca29f49b230e589bf47 SHA512 914ad99f49f82aa63a8a700ac4c9e6bd6f0e9af0b0e90a651f7d02fb0b180fd5b1e359b8b9fbab7557a0ca242c9440a9384d66d7a9ee5ad1c0291fcb4eed033a
+AUX cpp-taskflow-3.0.0-gnuinstalldir.patch 3340 BLAKE2B 2e36ea275ff93b12189e14d9a9e4a7141fb0b183ab68ce8fd76336feee34150a8f36d07bfd0eee41df04654968ae4c8de2e45df0d5de73e7e5b49f36de61a1b8 SHA512 f42539ec5612920112f7e56b7300cdee2efd8c6e93167d410b66bdacd6c827c09220162e6217fb22163ed152a364f68f16c9f255157436cc9086efcfb67ad722
+DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e
+EBUILD cpp-taskflow-3.0.0.ebuild 692 BLAKE2B 403c306382a21a930d1de638ae95fca69ea983a3a69eb530e35b0e89a4905b16cc2bd639df2bcfdbba6d04f855d2eb178faebbe2411ea443b66d2aa78ef7c68f SHA512 2ab540db996797b44c9fbf64a6a84f7cdf33b51243f822f4b4b0a42511ccb603fecaae63253b990701324e47824e572d1c448c22328653abf22afc59cc716d01
 MISC metadata.xml 662 BLAKE2B 9a3c9f4208ed92f0957323e281cedd321b9e15c15af231eeca1b88b8e0d87df81a546afd8877f496151c0815cb566d9e205fe1eb8b8fce33114435e2c66f75ab SHA512 9b0b6de9d422df44507429af356aa0d31411a564efe4a58065cdff38845f1e1e53fef6aef8a8537ccfff8ee36e3e77beff65aca3bda4efb2a5f3166c41ea68d2
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild
deleted file mode 100644
index b3df053c1da1..000000000000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.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
-
-inherit cmake-utils
-
-DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-do_not_compile_examples.patch
-	"${FILESDIR}"/${P}-fix_installation_path.patch
-)
-
-HTML_DOCS=( docs/. )
-
-src_install() {
-	cmake-utils_src_install
-
-	if $(use doc); then
-		einstalldocs
-	fi
-}
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild
deleted file mode 100644
index aba4692adef3..000000000000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/taskflow-${PV}"
-
-PATCHES=(
-)
-
-HTML_DOCS=( docs/. )
-
-src_prepare() {
-	default
-
-	# fix library directoy
-	sed -i "s#/lib#/$(get_libdir)#g" CMakeLists.txt || die "sed failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# FIXME: enable CUDA and TESTS via use flag
-	local mycmakeargs=(
-		-DTF_BUILD_CUDA=OFF
-		-DTF_BUILD_TESTS=OFF
-		-DTF_BUILD_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if $(use doc); then
-		einstalldocs
-	fi
-}
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
new file mode 100644
index 000000000000..ee708046e377
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 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"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${P}-gnuinstalldir.patch )
+
+S="${WORKDIR}/taskflow-${PV}"
+HTML_DOCS=( docs/. )
+
+src_configure() {
+	# TODO: enable CUDA via USE flag
+	local mycmakeargs=(
+		-DTF_BUILD_CUDA=OFF
+		-DTF_BUILD_EXAMPLES=$(usex examples)
+		-DTF_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch
deleted file mode 100644
index 99f4658adfe4..000000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1bf8ed3..190dabe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,76 +223,10 @@ target_include_directories(${PROJECT_NAME} INTERFACE
-   $<INSTALL_INTERFACE:include/> 
- )
- 
--# -----------------------------------------------------------------------------
--# Example program 
--# -----------------------------------------------------------------------------
--
--message(STATUS "Building examples ...")
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR})
--
--add_executable(simple ${TF_EXAMPLE_DIR}/simple.cpp)
--target_link_libraries(
--  simple ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(observer ${TF_EXAMPLE_DIR}/observer.cpp)
--target_link_libraries(
--  observer ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(subflow ${TF_EXAMPLE_DIR}/subflow.cpp)
--target_link_libraries(
--  subflow ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(condition ${TF_EXAMPLE_DIR}/condition.cpp)
--target_link_libraries(
--  condition ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(visualization ${TF_EXAMPLE_DIR}/visualization.cpp)
--target_link_libraries(
--  visualization ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(reduce ${TF_EXAMPLE_DIR}/reduce.cpp)
--target_link_libraries(
--  reduce ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(parallel_for ${TF_EXAMPLE_DIR}/parallel_for.cpp)
--target_link_libraries(
--  parallel_for ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(run ${TF_EXAMPLE_DIR}/run.cpp)
--target_link_libraries(
--  run ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(composition ${TF_EXAMPLE_DIR}/composition.cpp)
--target_link_libraries(
-- composition ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--#### CUDA examples
--if(${TF_ENABLE_CUDA})
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}/cuda)
--
--add_executable(saxpy ${TF_EXAMPLE_DIR}/cuda/saxpy.cu)
--target_link_libraries(
--  saxpy ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--
--add_executable(device_property ${TF_EXAMPLE_DIR}/cuda/device_property.cu)
--target_link_libraries(
--  device_property ${PROJECT_NAME} Threads::Threads tf::default_settings
--)
--endif(${TF_ENABLE_CUDA})
--
- # -----------------------------------------------------------------------------
- # Unittest
- # -----------------------------------------------------------------------------
-+
- enable_testing()
- message(STATUS "Building unit tests ...")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR})
diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch
deleted file mode 100644
index f68e572f5ab2..000000000000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 190dabe..6d613d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@ MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT})
- #_cmake_modify_IGNORE 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)
-@@ -748,7 +748,7 @@ 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-3.0.0-gnuinstalldir.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
new file mode 100644
index 000000000000..8e974f2f8269
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
@@ -0,0 +1,79 @@
+https://github.com/taskflow/taskflow/pull/280
+Author: David Seifert <soap@gentoo.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
+ # Include additional language check
+ include(CheckLanguage)
+ 
++# Adhere to GNU conventions
++include(GNUInstallDirs)
++
+ # Compiler vendors
+ ## g++
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+@@ -244,6 +247,8 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR})
+ message(STATUS "CMAKE_CURRENT_LIST_DIR: " ${CMAKE_CURRENT_LIST_DIR})
+ message(STATUS "CMAKE_EXE_LINKER_FLAGS: " ${CMAKE_EXE_LINKER_FLAGS})
+ message(STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX})
++message(STATUS "CMAKE_INSTALL_FULL_INCLUDEDIR: " ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++message(STATUS "CMAKE_INSTALL_FULL_LIBDIR: " ${CMAKE_INSTALL_FULL_LIBDIR})
+ message(STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH})
+ message(STATUS "CMAKE_PREFIX_PATH: " ${CMAKE_PREFIX_PATH})
+ message(STATUS "TF_BUILD_BENCHMARKS: " ${TF_BUILD_BENCHMARKS})
+@@ -252,8 +257,6 @@ message(STATUS "TF_BUILD_SYCL: " ${TF_BUILD_SYCL})
+ message(STATUS "TF_BUILD_TESTS: " ${TF_BUILD_TESTS})
+ message(STATUS "TF_BUILD_EXAMPLES: " ${TF_BUILD_EXAMPLES})
+ message(STATUS "TF_BUILD_PROFILER: " ${TF_BUILD_PROFILER})
+-message(STATUS "TF_INC_INSTALL_DIR: " ${TF_INC_INSTALL_DIR})
+-message(STATUS "TF_LIB_INSTALL_DIR: " ${TF_LIB_INSTALL_DIR})
+ message(STATUS "TF_UTEST_DIR: " ${TF_UTEST_DIR})
+ message(STATUS "TF_EXAMPLE_DIR: " ${TF_EXAMPLE_DIR})
+ message(STATUS "TF_BENCHMARK_DIR: " ${TF_BENCHMARK_DIR})
+@@ -334,7 +337,7 @@ endif(TF_BUILD_BENCHMARKS)
+ # -----------------------------------------------------------------------------
+ 
+ # install header
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${TF_INC_INSTALL_DIR})
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ # export target
+ set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME ${PROJECT_NAME})
+@@ -350,7 +353,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
+ install(
+   EXPORT ${PROJECT_NAME}Targets 
+   NAMESPACE ${PROJECT_NAME}:: 
+-  DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
+ 
+ # set up config
+@@ -359,8 +362,8 @@ 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/${PROJECT_NAME}
+-  PATH_VARS TF_INC_INSTALL_DIR
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
+ )
+ 
+ write_basic_package_version_file(
+@@ -371,6 +374,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/${PROJECT_NAME}
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
+ 
+--- a/TaskflowConfig.cmake.in
++++ b/TaskflowConfig.cmake.in
+@@ -1,6 +1,6 @@
+ @PACKAGE_INIT@
+ 
+-set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_TF_INC_INSTALL_DIR@")
++set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+ 
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)