Updating liguros repov21.1.3

15 files changed, 217 insertions, 197 deletions

diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 6e24c16e4339..86410a3935bb 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,3 +1,3 @@
 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
diff --git a/dev-cpp/asio/asio-1.18.0.ebuild b/dev-cpp/asio/asio-1.18.1.ebuild
index 1a7e5378adbc..55fc4cb2fe52 100644
--- a/dev-cpp/asio/asio-1.18.0.ebuild
+++ b/dev-cpp/asio/asio-1.18.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
@@ -16,7 +16,7 @@ RESTRICT="!test? ( test )"
 # patching configure to not search for it with USE=-ssl
 REQUIRED_USE="test? ( ssl )"
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 55fca7ae5df5..f3ba32e948c5 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,3 +1,4 @@
 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
diff --git a/dev-cpp/catch/catch-2.13.3.ebuild b/dev-cpp/catch/catch-2.13.3.ebuild
index bc3458e115d8..f5ad0bfe0c5e 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..99922d32e9d2
--- /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,7,8,9,10} )
+
+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 3af8545a82b1..d9afaa56ca84 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,2 +1 @@
-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
+DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e
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)
diff --git a/dev-cpp/string-theory/Manifest b/dev-cpp/string-theory/Manifest
new file mode 100644
index 000000000000..1f878e7484fb
--- /dev/null
+++ b/dev-cpp/string-theory/Manifest
@@ -0,0 +1 @@
+DIST string-theory-3.3.tar.gz 588360 BLAKE2B ad87857e6d5e3cad1346b759457b434de7612b97e1b19016b1dfc987ac67f0cab318745b14fe1f432cc921ffb1d33b875a2a62f0bc56d815dd35b405a9f08560 SHA512 86209333dce341078c3b973084bd9f3b8ff2ccac0e07a5e6acf5973bd1cfa420897b531b2d1bd6aba9f5ccc8927f85d91f06796ac0e62ec8a735564a0387d2f4
diff --git a/dev-cpp/string-theory/metadata.xml b/dev-cpp/string-theory/metadata.xml
new file mode 100644
index 000000000000..43416b113577
--- /dev/null
+++ b/dev-cpp/string-theory/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>misanthropos@gmx.net</email>
+    <name>Richard Fröhning</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">zrax/string_theory</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-cpp/string-theory/string-theory-3.3.ebuild b/dev-cpp/string-theory/string-theory-3.3.ebuild
new file mode 100644
index 000000000000..5706dd0292ea
--- /dev/null
+++ b/dev-cpp/string-theory/string-theory-3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible modern C++ library for string manipulation and storage"
+HOMEPAGE="https://github.com/zrax/string_theory/"
+SRC_URI="https://github.com/zrax/string_theory/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/string_theory-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# Drop -Werror from bundled gtest
+	# bug #766468
+	sed -i -e "s/-Werror//" test/gtest-1.10.0/cmake/internal_utils.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DST_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	./st_gtests || die
+}