summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/abseil-cpp/Manifest2
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild60
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild1
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild2
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild)24
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild2
-rw-r--r--dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch58
-rw-r--r--dev-cpp/abseil-cpp/files/include_limits.patch10
-rw-r--r--dev-cpp/aixlog/aixlog-1.5.0.ebuild4
-rw-r--r--dev-cpp/asio/Manifest3
-rw-r--r--dev-cpp/asio/asio-1.19.2.ebuild49
-rw-r--r--dev-cpp/asio/asio-1.21.0.ebuild2
-rw-r--r--dev-cpp/asio/asio-1.22.1.ebuild (renamed from dev-cpp/asio/asio-1.20.0.ebuild)16
-rw-r--r--dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch29
-rw-r--r--dev-cpp/atkmm/atkmm-2.28.2.ebuild6
-rw-r--r--dev-cpp/atkmm/atkmm-2.36.1.ebuild6
-rw-r--r--dev-cpp/benchmark/Manifest3
-rw-r--r--dev-cpp/benchmark/benchmark-1.5.6.ebuild36
-rw-r--r--dev-cpp/benchmark/benchmark-1.6.1.ebuild (renamed from dev-cpp/benchmark/benchmark-1.6.0.ebuild)26
-rw-r--r--dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch11
-rw-r--r--dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch12
-rw-r--r--dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch9
-rw-r--r--dev-cpp/benchmark/metadata.xml3
-rw-r--r--dev-cpp/cairomm/cairomm-1.14.3.ebuild4
-rw-r--r--dev-cpp/cairomm/cairomm-1.16.1.ebuild4
-rw-r--r--dev-cpp/catch/Manifest4
-rw-r--r--dev-cpp/catch/catch-1.12.2-r1.ebuild (renamed from dev-cpp/catch/catch-1.12.2.ebuild)14
-rw-r--r--dev-cpp/catch/catch-1.9999.ebuild8
-rw-r--r--dev-cpp/catch/catch-2.13.4.ebuild44
-rw-r--r--dev-cpp/catch/catch-2.13.6.ebuild44
-rw-r--r--dev-cpp/catch/catch-2.13.8.ebuild (renamed from dev-cpp/catch/catch-2.13.7.ebuild)6
-rw-r--r--dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch67
-rw-r--r--dev-cpp/catch/files/catch-2.13.8-musl-tests.patch24
-rw-r--r--dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild4
-rw-r--r--dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild40
-rw-r--r--dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch51
-rw-r--r--dev-cpp/cpp-taskflow/Manifest1
-rw-r--r--dev-cpp/doctest/Manifest2
-rw-r--r--dev-cpp/doctest/doctest-2.4.6.ebuild8
-rw-r--r--dev-cpp/doctest/doctest-2.4.7.ebuild23
-rw-r--r--dev-cpp/doctest/doctest-2.4.8.ebuild23
-rw-r--r--dev-cpp/doctest/metadata.xml2
-rw-r--r--dev-cpp/eigen/Manifest2
-rw-r--r--dev-cpp/eigen/eigen-3.3.7-r1.ebuild98
-rw-r--r--dev-cpp/eigen/eigen-3.3.9.ebuild107
-rw-r--r--dev-cpp/eigen/eigen-3.4.0-r1.ebuild5
-rw-r--r--dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch15
-rw-r--r--dev-cpp/elfio/Manifest2
-rw-r--r--dev-cpp/elfio/elfio-3.10.ebuild27
-rw-r--r--dev-cpp/elfio/elfio-3.9.ebuild27
-rw-r--r--dev-cpp/elfio/metadata.xml11
-rw-r--r--dev-cpp/folly/Manifest2
-rw-r--r--dev-cpp/folly/folly-2022.03.28.00.ebuild61
-rw-r--r--dev-cpp/folly/folly-2022.04.11.00.ebuild74
-rw-r--r--dev-cpp/folly/metadata.xml11
-rw-r--r--dev-cpp/glibmm/Manifest7
-rw-r--r--dev-cpp/glibmm/glibmm-2.66.2.ebuild4
-rw-r--r--dev-cpp/glibmm/glibmm-2.66.4.ebuild (renamed from dev-cpp/glibmm/glibmm-2.66.1.ebuild)10
-rw-r--r--dev-cpp/glibmm/glibmm-2.70.0.ebuild52
-rw-r--r--dev-cpp/glibmm/glibmm-2.72.0.ebuild (renamed from dev-cpp/glibmm/glibmm-2.68.2.ebuild)8
-rw-r--r--dev-cpp/glibmm/glibmm-2.72.1.ebuild (renamed from dev-cpp/glibmm/glibmm-2.68.1.ebuild)10
-rw-r--r--dev-cpp/glog/glog-0.4.0.ebuild4
-rw-r--r--dev-cpp/glog/glog-0.5.0.ebuild12
-rw-r--r--dev-cpp/glog/metadata.xml6
-rw-r--r--dev-cpp/gtest/Manifest1
-rw-r--r--dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch3
-rw-r--r--dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild80
-rw-r--r--dev-cpp/gtest/gtest-1.11.0.ebuild4
-rw-r--r--dev-cpp/gtest/metadata.xml2
-rw-r--r--dev-cpp/gtkmm/Manifest4
-rw-r--r--dev-cpp/gtkmm/gtkmm-3.24.5.ebuild6
-rw-r--r--dev-cpp/gtkmm/gtkmm-3.24.6.ebuild53
-rw-r--r--dev-cpp/gtkmm/gtkmm-4.6.0.ebuild (renamed from dev-cpp/gtkmm/gtkmm-4.2.0.ebuild)8
-rw-r--r--dev-cpp/gtkmm/gtkmm-4.6.1.ebuild52
-rw-r--r--dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r2.ebuild (renamed from dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r1.ebuild)13
-rw-r--r--dev-cpp/gulrak-filesystem/Manifest2
-rw-r--r--dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild (renamed from dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.10.ebuild)4
-rw-r--r--dev-cpp/highway/Manifest1
-rw-r--r--dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch17
-rw-r--r--dev-cpp/highway/highway-0.16.0-r1.ebuild41
-rw-r--r--dev-cpp/highway/highway-9999.ebuild37
-rw-r--r--dev-cpp/highway/metadata.xml16
-rw-r--r--dev-cpp/json11/json11-1.0.0.ebuild4
-rw-r--r--dev-cpp/json11/metadata.xml2
-rw-r--r--dev-cpp/kokkos/Manifest1
-rw-r--r--dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild45
-rw-r--r--dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild12
-rw-r--r--dev-cpp/libglademm/libglademm-2.6.7-r3.ebuild (renamed from dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild)33
-rw-r--r--dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch13
-rw-r--r--dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild56
-rw-r--r--dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild45
-rw-r--r--dev-cpp/libjson-rpc-cpp/Manifest1
-rw-r--r--dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild68
-rw-r--r--dev-cpp/libodb-sqlite/Manifest2
-rw-r--r--dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch38
-rw-r--r--dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild7
-rw-r--r--dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild117
-rw-r--r--dev-cpp/libodb/Manifest2
-rw-r--r--dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch38
-rw-r--r--dev-cpp/libodb/libodb-2.5.0_beta19.ebuild7
-rw-r--r--dev-cpp/libodb/libodb-2.5.0_beta21.ebuild111
-rw-r--r--dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild (renamed from dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild)13
-rw-r--r--dev-cpp/mm-common/Manifest2
-rw-r--r--dev-cpp/mm-common/mm-common-1.0.4.ebuild (renamed from dev-cpp/mm-common/mm-common-1.0.3.ebuild)6
-rw-r--r--dev-cpp/ms-gsl/Manifest1
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild4
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild33
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-9999.ebuild5
-rw-r--r--dev-cpp/muParser/Manifest2
-rw-r--r--dev-cpp/muParser/files/muParser-1.32-parallel-build.patch15
-rw-r--r--dev-cpp/muParser/muParser-2.2.6.1.ebuild45
-rw-r--r--dev-cpp/muParser/muParser-2.3.2-r1.ebuild4
-rw-r--r--dev-cpp/muParser/muParser-2.3.3.ebuild40
-rw-r--r--dev-cpp/nlohmann_json/Manifest5
-rw-r--r--dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild62
-rw-r--r--dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild62
-rw-r--r--dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild (renamed from dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild)21
-rw-r--r--dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild62
-rw-r--r--dev-cpp/notcurses/Manifest4
-rw-r--r--dev-cpp/notcurses/notcurses-3.0.5.ebuild (renamed from dev-cpp/notcurses/notcurses-2.4.5.ebuild)10
-rw-r--r--dev-cpp/opentelemetry-cpp/Manifest2
-rw-r--r--dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch92
-rw-r--r--dev-cpp/opentelemetry-cpp/metadata.xml12
-rw-r--r--dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild50
-rw-r--r--dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild50
-rw-r--r--dev-cpp/pangomm/Manifest4
-rw-r--r--dev-cpp/pangomm/pangomm-2.46.2.ebuild (renamed from dev-cpp/pangomm/pangomm-2.42.2.ebuild)11
-rw-r--r--dev-cpp/pangomm/pangomm-2.50.0.ebuild (renamed from dev-cpp/pangomm/pangomm-2.48.1.ebuild)9
-rw-r--r--dev-cpp/popl/popl-1.2.0.ebuild4
-rw-r--r--dev-cpp/prometheus-cpp/Manifest2
-rw-r--r--dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild (renamed from dev-cpp/prometheus-cpp/prometheus-cpp-0.13.0.ebuild)0
-rw-r--r--dev-cpp/pystring/pystring-1.1.3-r1.ebuild4
-rw-r--r--dev-cpp/range-v3/range-v3-0.11.0.ebuild4
-rw-r--r--dev-cpp/rapidyaml/Manifest4
-rw-r--r--dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch9
-rw-r--r--dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch8
-rw-r--r--dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch18
-rw-r--r--dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch23
-rw-r--r--dev-cpp/rapidyaml/metadata.xml12
-rw-r--r--dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild81
-rw-r--r--dev-cpp/robin-hood-hashing/Manifest1
-rw-r--r--dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild23
-rw-r--r--dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild23
-rw-r--r--dev-cpp/robin-map/robin-map-0.6.3.ebuild4
-rw-r--r--dev-cpp/sdbus-c++/Manifest4
-rw-r--r--dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch58
-rw-r--r--dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch10
-rw-r--r--dev-cpp/sdbus-c++/metadata.xml12
-rw-r--r--dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild140
-rw-r--r--dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild144
-rw-r--r--dev-cpp/string-theory/Manifest1
-rw-r--r--dev-cpp/string-theory/string-theory-3.5.ebuild38
-rw-r--r--dev-cpp/taskflow/Manifest1
-rw-r--r--dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch377
-rw-r--r--dev-cpp/taskflow/files/taskflow-9999-fix_doctest.patch377
-rw-r--r--dev-cpp/taskflow/metadata.xml (renamed from dev-cpp/cpp-taskflow/metadata.xml)4
-rw-r--r--dev-cpp/taskflow/taskflow-3.3.0.ebuild (renamed from dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild)13
-rw-r--r--dev-cpp/taskflow/taskflow-9999.ebuild (renamed from dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild)13
-rw-r--r--dev-cpp/tbb/Manifest1
-rw-r--r--dev-cpp/tbb/files/tbb-2021.4.0-lto.patch2
-rw-r--r--dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch23
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch27
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch25
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch32
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch30
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch43
-rw-r--r--dev-cpp/tbb/tbb-2020.3.ebuild11
-rw-r--r--dev-cpp/tbb/tbb-2021.4.0.ebuild6
-rw-r--r--dev-cpp/tbb/tbb-2021.5.0-r1.ebuild49
-rw-r--r--dev-cpp/tclap/Manifest2
-rw-r--r--dev-cpp/tclap/tclap-1.2.5.ebuild (renamed from dev-cpp/tclap/tclap-1.2.2.ebuild)8
-rw-r--r--dev-cpp/termcolor/Manifest2
-rw-r--r--dev-cpp/termcolor/metadata.xml11
-rw-r--r--dev-cpp/termcolor/termcolor-2.0.0.ebuild29
-rw-r--r--dev-cpp/termcolor/termcolor-2.1.0.ebuild29
-rw-r--r--dev-cpp/waylandpp/Manifest3
-rw-r--r--dev-cpp/waylandpp/waylandpp-0.2.10.ebuild41
-rw-r--r--dev-cpp/waylandpp/waylandpp-0.2.9.ebuild41
-rw-r--r--dev-cpp/waylandpp/waylandpp-1.0.0.ebuild41
-rw-r--r--dev-cpp/waylandpp/waylandpp-9999.ebuild6
-rw-r--r--dev-cpp/websocketpp/Manifest1
-rw-r--r--dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch139
-rw-r--r--dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild49
-rw-r--r--dev-cpp/websocketpp/websocketpp-0.8.2.ebuild2
184 files changed, 3518 insertions, 1421 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 200bbc3d59e..9eea1b17c07 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,6 +1,4 @@
-DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
-DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
deleted file mode 100644
index fe5a91286a0..00000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-# requires source of gtest and other libs
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
- "${FILESDIR}/include_limits.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # un-hardcode abseil compiler flags
- sed -i \
- -e '/"-maes",/d' \
- -e '/"-msse4.1",/d' \
- -e '/"-mfpu=neon"/d' \
- -e '/"-march=armv8-a+crypto"/d' \
- absl/copts/copts.py || die
-
- # now generate cmake files
- python_fix_shebang absl/copts/generate_copts.py
- absl/copts/generate_copts.py || die
-}
-
-src_configure() {
- if use arm || use arm64; then
- # bug #778926
- if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
- append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
- fi
- fi
-
- local mycmakeargs=(
- -DABSL_ENABLE_INSTALL=TRUE
- -DBUILD_SHARED_LIBS=TRUE
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
index 40f5fbae8e2..788d8cd9c0a 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
@@ -36,6 +36,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+ "${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch"
)
src_prepare() {
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
index 18482a89b9b..af0821bbd99 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
@@ -21,7 +21,7 @@ LICENSE="
test? ( BSD )
"
SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
IUSE="test"
DEPEND=""
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
index 087d0e5ce2b..9873c85b8ee 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake flag-o-matic python-any-r1 toolchain-funcs
+inherit cmake python-any-r1
# yes, it needs SOURCE, not just installed one
-GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
-GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
+# and no, 1.11.0 is not enough
+GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
+GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz"
DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
HOMEPAGE="https://abseil.io"
@@ -21,7 +22,7 @@ LICENSE="
test? ( BSD )
"
SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
DEPEND=""
@@ -35,8 +36,7 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
- "${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch"
+ "${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch"
)
src_prepare() {
@@ -61,17 +61,11 @@ src_prepare() {
}
src_configure() {
- if use arm || use arm64; then
- # bug #778926
- if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
- append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
- fi
- fi
-
local mycmakeargs=(
-DABSL_ENABLE_INSTALL=TRUE
-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
-DCMAKE_CXX_STANDARD=17
+ -DABSL_PROPAGATE_CXX_STD=TRUE
$(usex test -DBUILD_TESTING=ON '') #intentional usex
)
cmake_src_configure
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
index fc4916e27e7..f50605a6fbc 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
@@ -22,7 +22,7 @@ LICENSE="
test? ( BSD )
"
SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
IUSE="test"
DEPEND=""
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
new file mode 100644
index 00000000000..45a9fc5406e
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
@@ -0,0 +1,58 @@
+Fixes compile failure with CUDA nvcc
+https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10
+https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235
+
+From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001
+From: Abseil Team <absl-team@google.com>
+Date: Tue, 1 Feb 2022 13:52:49 -0800
+Subject: [PATCH] Export of internal Abseil changes
+
+--
+121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>:
+
+Internal change
+
+PiperOrigin-RevId: 425707805
+
+--
+0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>:
+
+macOS CI: Avoid depending on external sites like GitHub by prepopulating
+dependencies and setting --distdir
+
+Our Linux CI does this, but for some reason was never enabled on macOS
+
+PiperOrigin-RevId: 425668638
+GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
+Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
+---
+ absl/container/internal/inlined_vector.h | 8 ++++----
+ ci/macos_xcode_bazel.sh | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h
+index cd34a413a..2baf26f3e 100644
+--- a/absl/container/internal/inlined_vector.h
++++ b/absl/container/internal/inlined_vector.h
+@@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
+ inlined_ptr->GetSize());
+ }
+ ABSL_INTERNAL_CATCH_ANY {
+- allocated_ptr->SetAllocation(
+- {allocated_storage_view.data, allocated_storage_view.capacity});
++ allocated_ptr->SetAllocation(Allocation<A>{
++ allocated_storage_view.data, allocated_storage_view.capacity});
+ ABSL_INTERNAL_RETHROW;
+ }
+
+@@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
+ inlined_ptr->GetInlinedData(),
+ inlined_ptr->GetSize());
+
+- inlined_ptr->SetAllocation(
+- {allocated_storage_view.data, allocated_storage_view.capacity});
++ inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data,
++ allocated_storage_view.capacity});
+ }
+
+ swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated());
diff --git a/dev-cpp/abseil-cpp/files/include_limits.patch b/dev-cpp/abseil-cpp/files/include_limits.patch
deleted file mode 100644
index c64229db984..00000000000
--- a/dev-cpp/abseil-cpp/files/include_limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/absl/synchronization/internal/graphcycles.cc
-+++ b/absl/synchronization/internal/graphcycles.cc
-@@ -37,6 +37,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include "absl/base/internal/hide_ptr.h"
- #include "absl/base/internal/raw_logging.h"
- #include "absl/base/internal/spinlock.h"
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
index bd6ee183403..e49c384fb94 100644
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 03ae280eb36..06d0aa659bb 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,4 +1,3 @@
DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.19.2.tar.bz2 1842597 BLAKE2B b2236c33432984ab660eba4c93be32374bb49f688a1e6a0711d7bac322cc4a7f817db209278f216468c6a72b9d3dd564cf298e1f49f8098c3fd9aec7acd66eb7 SHA512 07f9c29d8f02090b4d4b6a1867bcc07a8e9f3388556dff787ca3ba143022eeb63bfac0b5bc264076fed4db3b2e5ec6b7ff0ebefde40ba4753c832032a72d54cc
-DIST asio-1.20.0.tar.bz2 1845826 BLAKE2B a768dc0b9ae380bef07d674507f7571d0bc47e182cdde10b24cee246814874dd7739c523b071dfede61a12059f52e04d7bbd309a03d93070bc1dd4640c253c19 SHA512 6421960abd2cf0c205cc50e86adfe492bca2870b486328b4825dc0cefc9c40cdc085516d474c23e15a73f4c108c0e69add5fab6dbe594a1e53636c5c3027e4c5
DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd292302c0f502ec678639b70af7e6f9b86ee2c50c7f7e3e3437ce4474323e44b5e371c08f3a9ed464ffb3f428de728b SHA512 62252b2d3ca4fb99579c5fe57bf64b700792198dd7fa45acb4af7f64e83494bade1885b848f9e364f4c42d9db025841324cbd9a0fd3fe45526e7e4be6f60f8c0
+DIST asio-1.22.1.tar.bz2 3085878 BLAKE2B 07326a2273d5b8c0aef8402c92a6a88abbcb961d2a029596d58735d6626279e6d4d591371cc368a41fac1d0161b8786174ba71153e73aac38fa81a83f5f5be86 SHA512 be4a066d9f73662f68a771f63a59fc2e16e8ee1ae1ca6c581e09922514029e58c479edfc0517ee6b29a1fd377d202a2a6eb80d9d17f6e957233c11331f04a479
diff --git a/dev-cpp/asio/asio-1.19.2.ebuild b/dev-cpp/asio/asio-1.19.2.ebuild
deleted file mode 100644
index 0e025f305ee..00000000000
--- a/dev-cpp/asio/asio-1.19.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/boost
- dev-libs/openssl
- )
-"
-
-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/asio/asio-1.21.0.ebuild b/dev-cpp/asio/asio-1.21.0.ebuild
index 0b91e779c0b..0e025f305ee 100644
--- a/dev-cpp/asio/asio-1.21.0.ebuild
+++ b/dev-cpp/asio/asio-1.21.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/asio/asio-1.20.0.ebuild b/dev-cpp/asio/asio-1.22.1.ebuild
index 0b91e779c0b..1917fccbef7 100644
--- a/dev-cpp/asio/asio-1.20.0.ebuild
+++ b/dev-cpp/asio/asio-1.22.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+inherit autotools
+
DESCRIPTION="Asynchronous Network Library"
HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
@@ -20,9 +22,15 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${P}-cpp20ex.patch"
+)
+
src_prepare() {
default
+ eautoreconf
+
if ! use test; then
# Don't build nor install any examples or unittests
# since we don't have a script to run them
@@ -45,5 +53,11 @@ src_install() {
emake clean
dodoc -r src/examples
docompress -x /usr/share/doc/${PF}/examples
+
+ # Make links to the example .cpp files work
+ # https://bugs.gentoo.org/828648
+ if use doc; then
+ dosym ../examples /usr/share/doc/${PF}/src/examples
+ fi
fi
}
diff --git a/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch b/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch
new file mode 100644
index 00000000000..55de22b8a13
--- /dev/null
+++ b/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch
@@ -0,0 +1,29 @@
+The cpp20 dir doesn't exist
+https://github.com/chriskohlhoff/asio/issues/1026
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,7 +15,6 @@ EXAMPLES_CPP17 = examples/cpp17
+ endif
+
+ if HAVE_CXX20
+-EXAMPLES_CPP20 = examples/cpp20
+ endif
+
+ SUBDIRS = \
+@@ -23,7 +22,6 @@ SUBDIRS = \
+ $(EXAMPLES_CPP11) \
+ $(EXAMPLES_CPP14) \
+ $(EXAMPLES_CPP17) \
+- $(EXAMPLES_CPP20) \
+ tests
+
+ DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,4 +241,4 @@ AC_OUTPUT([
+ src/examples/cpp11/Makefile
+ src/examples/cpp14/Makefile
+ src/examples/cpp17/Makefile
+- src/examples/cpp20/Makefile])
++ ])
diff --git a/dev-cpp/atkmm/atkmm-2.28.2.ebuild b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
index ffb10b24f7c..e247f63c3ee 100644
--- a/dev-cpp/atkmm/atkmm-2.28.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for the ATK library"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
DEPEND="
diff --git a/dev-cpp/atkmm/atkmm-2.36.1.ebuild b/dev-cpp/atkmm/atkmm-2.36.1.ebuild
index 6889038a2d5..985508042c4 100644
--- a/dev-cpp/atkmm/atkmm-2.36.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for the ATK library"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
DEPEND="
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index fcd377803e1..8c7d92a3418 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,2 +1 @@
-DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
-DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
+DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
diff --git a/dev-cpp/benchmark/benchmark-1.5.6.ebuild b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
deleted file mode 100644
index 447bfdaa52d..00000000000
--- a/dev-cpp/benchmark/benchmark-1.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug test"
-
-RESTRICT="!test? ( test )"
-
-# Version not in the tree yet
-#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
- -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
- )
-
- use debug || append-cppflags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.6.0.ebuild b/dev-cpp/benchmark/benchmark-1.6.1.ebuild
index 604dda9d01d..e80684fba3f 100644
--- a/dev-cpp/benchmark/benchmark-1.6.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
DESCRIPTION="A microbenchmark support library"
HOMEPAGE="https://github.com/google/benchmark"
@@ -11,25 +11,23 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug test"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
+IUSE="debug doc lto test"
RESTRICT="!test? ( test )"
-# Version not in the tree yet
-#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
- "${FILESDIR}"/${PN}-1.6.0-disable_Werror.patch
- "${FILESDIR}"/${PN}-1.6.0-versioned_docdir.patch
-)
+BDEPEND="doc? ( app-doc/doxygen )
+ test? ( >=dev-cpp/gtest-1.11.0 )"
src_configure() {
local mycmakeargs=(
- -DBENCHMARK_ENABLE_TESTING=$(usex test)
- -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+ -DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
+ -DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
+ -DBENCHMARK_ENABLE_LTO=$(usex lto)
+ -DBENCHMARK_ENABLE_TESTING=$(usex test)
+ -DBENCHMARK_ENABLE_WERROR=OFF
+ -DBENCHMARK_USE_BUNDLED_GTEST=OFF
)
use debug || append-cppflags -DNDEBUG
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch b/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
deleted file mode 100644
index 98aa9490407..00000000000
--- a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -307,7 +307,7 @@
- if (BENCHMARK_ENABLE_GTEST_TESTS AND
- NOT (TARGET gtest AND TARGET gtest_main AND
- TARGET gmock AND TARGET gmock_main))
-- include(GoogleTest)
-+ find_package(GTest 1.11 REQUIRED)
- endif()
- add_subdirectory(test)
- endif()
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
deleted file mode 100644
index 8a3de98008e..00000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -160,9 +160,6 @@
- add_cxx_compiler_flag(-Wall)
- add_cxx_compiler_flag(-Wextra)
- add_cxx_compiler_flag(-Wshadow)
-- add_cxx_compiler_flag(-Werror RELEASE)
-- add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
-- add_cxx_compiler_flag(-Werror MINSIZEREL)
- if (NOT BENCHMARK_ENABLE_TESTING)
- # Disable warning when compiling tests as gtest does not use 'override'.
- add_cxx_compiler_flag(-Wsuggest-override)
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
deleted file mode 100644
index 156e8b0c2a6..00000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -120,5 +120,5 @@
-
- install(
- DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
- endif()
diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml
index ac75eeab418..1a6a996e42c 100644
--- a/dev-cpp/benchmark/metadata.xml
+++ b/dev-cpp/benchmark/metadata.xml
@@ -10,4 +10,7 @@
<doc lang="en">https://github.com/google/benchmark/tree/master/docs/</doc>
<remote-id type="github">google/benchmark</remote-id>
</upstream>
+ <use>
+ <flag name="lto">Optimize the build using Link Time Optimization (LTO)</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-cpp/cairomm/cairomm-1.14.3.ebuild b/dev-cpp/cairomm/cairomm-1.14.3.ebuild
index 19bb074bda6..a3f3af9b428 100644
--- a/dev-cpp/cairomm/cairomm-1.14.3.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/cairomm/cairomm-1.16.1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
index 5130d24cf11..715ca5acea4 100644
--- a/dev-cpp/cairomm/cairomm-1.16.1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 5c6628ab91d..b726e173baf 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,4 +1,2 @@
DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
-DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
-DIST Catch2-2.13.6.tar.gz 659811 BLAKE2B d876c51589259ef9fa9640811c17049ee5f1559a2863d146b0d8f79e9531b3528db34bc23e4fee090436a92b430756442eee4820083e71225da0f24399131a73 SHA512 f63e240994b5982cf019a33b8999b62237cce174962f00437d64fd287b34f7217d066225d99322431ef60da67b025f36db703dab94b3d58bbd81095d98917278
-DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
+DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2-r1.ebuild
index 22741eef010..42c555075f8 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
if [[ ${PV} == *9999 ]]; then
inherit git-r3
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_P=${PN^}-${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 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
S="${WORKDIR}/${PN^}2-${PV}"
fi
@@ -27,14 +27,18 @@ RESTRICT="!test? ( test )"
RDEPEND="!<dev-cpp/catch-1.12.2:0"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.2-glibc-2.34-sigstksz.patch
+)
+
src_configure() {
local mycmakeargs=(
-DNO_SELFTEST=$(usex !test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
dodoc -r docs/.
}
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index 3514580992a..9b275ede982 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
if [[ ${PV} == *9999 ]]; then
inherit git-r3
@@ -31,10 +31,10 @@ src_configure() {
local mycmakeargs=(
-DNO_SELFTEST=$(usex !test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
dodoc -r docs/.
}
diff --git a/dev-cpp/catch/catch-2.13.4.ebuild b/dev-cpp/catch/catch-2.13.4.ebuild
deleted file mode 100644
index 4ef09010228..00000000000
--- a/dev-cpp/catch/catch-2.13.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/catch/catch-2.13.6.ebuild b/dev-cpp/catch/catch-2.13.6.ebuild
deleted file mode 100644
index dcf3ff6e118..00000000000
--- a/dev-cpp/catch/catch-2.13.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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/catch/catch-2.13.7.ebuild b/dev-cpp/catch/catch-2.13.8.ebuild
index bea68985144..170be3f4e3d 100644
--- a/dev-cpp/catch/catch-2.13.7.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
fi
DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -28,6 +28,8 @@ RESTRICT="!test? ( test )"
BDEPEND="test? ( ${PYTHON_DEPS} )"
+PATCHES=( "${FILESDIR}"/${P}-musl-tests.patch )
+
pkg_setup() {
use test && python-any-r1_pkg_setup
}
diff --git a/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch b/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch
new file mode 100644
index 00000000000..3c6e08384a5
--- /dev/null
+++ b/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch
@@ -0,0 +1,67 @@
+https://src.fedoraproject.org/rpms/catch1/raw/rawhide/f/catch1-sigstksz.patch
+https://bugs.gentoo.org/803962
+
+commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680
+Author: Tom Hughes <tom@compton.nu>
+Date: Fri Feb 19 10:45:49 2021 +0000
+
+ Patch for non-constant SIGSTKSZ
+
+--- a/include/internal/catch_fatal_condition.hpp
++++ b/include/internal/catch_fatal_condition.hpp
+@@ -136,7 +136,7 @@ namespace Catch {
+ static bool isSet;
+ static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+ static stack_t oldSigStack;
+- static char altStackMem[SIGSTKSZ];
++ static char altStackMem[32768];
+
+ static void handleSignal( int sig ) {
+ std::string name = "<unknown signal>";
+@@ -156,7 +156,7 @@ namespace Catch {
+ isSet = true;
+ stack_t sigStack;
+ sigStack.ss_sp = altStackMem;
+- sigStack.ss_size = SIGSTKSZ;
++ sigStack.ss_size = 32768;
+ sigStack.ss_flags = 0;
+ sigaltstack(&sigStack, &oldSigStack);
+ struct sigaction sa = { 0 };
+@@ -188,7 +188,7 @@ namespace Catch {
+ bool FatalConditionHandler::isSet = false;
+ struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+ stack_t FatalConditionHandler::oldSigStack = {};
+- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++ char FatalConditionHandler::altStackMem[32768] = {};
+
+
+ } // namespace Catch
+--- a/single_include/catch.hpp
++++ b/single_include/catch.hpp
+@@ -6540,7 +6540,7 @@ namespace Catch {
+ static bool isSet;
+ static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+ static stack_t oldSigStack;
+- static char altStackMem[SIGSTKSZ];
++ static char altStackMem[32768];
+
+ static void handleSignal( int sig ) {
+ std::string name = "<unknown signal>";
+@@ -6560,7 +6560,7 @@ namespace Catch {
+ isSet = true;
+ stack_t sigStack;
+ sigStack.ss_sp = altStackMem;
+- sigStack.ss_size = SIGSTKSZ;
++ sigStack.ss_size = 32768;
+ sigStack.ss_flags = 0;
+ sigaltstack(&sigStack, &oldSigStack);
+ struct sigaction sa = { 0 };
+@@ -6591,7 +6591,7 @@ namespace Catch {
+ bool FatalConditionHandler::isSet = false;
+ struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+ stack_t FatalConditionHandler::oldSigStack = {};
+- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++ char FatalConditionHandler::altStackMem[32768] = {};
+
+ } // namespace Catch
+
diff --git a/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch b/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
new file mode 100644
index 00000000000..86c60c15f34
--- /dev/null
+++ b/dev-cpp/catch/files/catch-2.13.8-musl-tests.patch
@@ -0,0 +1,24 @@
+From 3e88ccff3ba573fb6d1ab746596411eebe310a6b Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Thu, 31 Dec 2020 16:24:16 +0100
+Subject: [PATCH] Do not match exact amount of spaces for errno macro expansion
+ in approvalTests.py
+
+E.g. musl libc expands errno() to __errno_location() without a space between, glibc has 1 space.
+---
+ scripts/approvalTests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
+index f8b9425c7c..73e9b83239 100755
+--- a/scripts/approvalTests.py
++++ b/scripts/approvalTests.py
+@@ -44,7 +44,7 @@
+
+ # errno macro expands into various names depending on platform, so we need to fix them up as well
+ errnoParser = re.compile(r'''
+- \(\*__errno_location\ \(\)\)
++ \(\*__errno_location\s*\(\)\)
+ |
+ \(\*__error\(\)\)
+ |
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index 89e1b97f672..6ee79676be5 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
MY_PN="${PN}"-core
MY_P="${MY_PN}"-"${PV}"
-inherit cmake multilib
+inherit cmake
DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
HOMEPAGE="http://clucene.sourceforge.net/"
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild
new file mode 100644
index 00000000000..f8f3b60de63
--- /dev/null
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake prefix
+
+DESCRIPTION="Provides C++ support for the HOCON configuration file format"
+HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/boost-1.54:=[nls]
+ >=dev-libs/leatherman-0.9.3:=
+"
+DEPEND="${DEPEND}
+ test? ( dev-cpp/catch:1 )"
+
+#PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.3.0-use-system-catch.patch )
+
+src_prepare() {
+ cmake_src_prepare
+
+ eprefixify lib/tests/CMakeLists.txt
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch
new file mode 100644
index 00000000000..0964e3e7bc7
--- /dev/null
+++ b/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/823419
+
+Wanted to make this "proper" but Catch2 lacks a pkgconfig file (or a CMake one)
+and it's easier to just do this for now.
+
+Based on patch version of sed commands from upstream bug
+(https://github.com/puppetlabs/cpp-hocon/issues/132) and
+Fedora (https://src.fedoraproject.org/rpms/cpp-hocon/blob/rawhide/f/cpp-hocon.spec#_76).
+
+Makes tests conditional too.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,12 +16,16 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif()
+
+-enable_testing()
+-
+ # Leatherman setup
+-set(LEATHERMAN_COMPONENTS locale catch nowide util)
++set(LEATHERMAN_COMPONENTS locale nowide util)
+ find_package(Leatherman REQUIRED COMPONENTS ${LEATHERMAN_COMPONENTS})
+
++option(BUILD_TESTING "Build test suite (needs Catch)" ON)
++
++if(BUILD_TESTING)
++ enable_testing()
++endif()
++
+ ## Before we find any packages, we want to pull in the common leatherman options, as they can affect commonly-used packages.
+ include(options)
+ ## Pull in common cflags setting from leatherman. Don't override CMAKE_CXX_FLAGS at the project root to avoid impacting 3rd party code.
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -91,4 +91,6 @@ symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h"
+ leatherman_install(lib${PROJECT_NAME})
+ install(DIRECTORY inc/hocon DESTINATION include)
+
+-add_subdirectory(tests)
++if (BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+--- a/lib/tests/CMakeLists.txt
++++ b/lib/tests/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Setup compiling the test executable. C++ compile flags are inherited from the parent directory.
+-include_directories(${LEATHERMAN_CATCH_INCLUDE})
++include_directories(@GENTOO_PORTAGE_EPREFIX@/usr/include/catch)
+
+ set(TEST_CASES
+ concatenation_test.cc
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
deleted file mode 100644
index 3a4c979f17c..00000000000
--- a/dev-cpp/cpp-taskflow/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpp-taskflow-3.2.0.tar.gz 79152157 BLAKE2B 03b4b1cf772c9dec4557a706c7872de95312d4e72ec7dcef1accfd1d5eaf470e60440d75ea0c993ab494ef460dc44639719ea1732fa92c54d64dde31b90b9224 SHA512 e30d95b69f64524c9b06cf7442236998f91b1083818f06439888d78d5a1b988bc952c02fd0ec88114283cbe6c31a7bbfe810a7114998f4b5f60c4cff921bb0fa
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 21c9d2b1246..ce394009932 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1 +1,3 @@
DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
+DIST doctest-2.4.7.tar.gz 2281756 BLAKE2B 9e10a30ca20ab08c4b5e7bc65e6d89e7fde45da7e6ff8ecbf9e848c7c61a7864bc4fbb49b0b1d2d6eeab16da2b4a2d935d06a593dab9be1fdb400e8ab641af7e SHA512 bb2d410397700aa7be1161fcf26949524d4f7c333bb9ffe7d223dfd14e770d6eeff75336f27fe0c8051dcb6c403c6b3af506872f6ba207d2d86cc9e9d1d2bfbf
+DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c
diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild
index 4c3df901696..c8d01f2279f 100644
--- a/dev-cpp/doctest/doctest-2.4.6.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,12 +6,12 @@ EAPI=7
inherit cmake
DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework"
-HOMEPAGE="https://github.com/onqtam/doctest"
-SRC_URI="https://github.com/onqtam/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/doctest/doctest"
+SRC_URI="https://github.com/doctest/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/doctest/doctest-2.4.7.ebuild b/dev-cpp/doctest/doctest-2.4.7.ebuild
new file mode 100644
index 00000000000..ef28c59976c
--- /dev/null
+++ b/dev-cpp/doctest/doctest-2.4.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework"
+HOMEPAGE="https://github.com/doctest/doctest"
+SRC_URI="https://github.com/doctest/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOCTEST_WITH_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/doctest/doctest-2.4.8.ebuild b/dev-cpp/doctest/doctest-2.4.8.ebuild
new file mode 100644
index 00000000000..fa60bdec885
--- /dev/null
+++ b/dev-cpp/doctest/doctest-2.4.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework"
+HOMEPAGE="https://github.com/doctest/doctest"
+SRC_URI="https://github.com/doctest/doctest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOCTEST_WITH_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/doctest/metadata.xml b/dev-cpp/doctest/metadata.xml
index d74c17749c0..02076edda23 100644
--- a/dev-cpp/doctest/metadata.xml
+++ b/dev-cpp/doctest/metadata.xml
@@ -10,6 +10,6 @@
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
- <remote-id type="github">onqtam/doctest</remote-id>
+ <remote-id type="github">doctest/doctest</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index d6069d9926d..3955c4711b2 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1 @@
-DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
-DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
diff --git a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
deleted file mode 100644
index 68821a80607..00000000000
--- a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/${PV}/${P}.tar.bz2 -> ${P}-gitlab.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( virtual/pkgconfig )
-"
-DEPEND="
- cuda? ( dev-util/nvidia-cuda-toolkit )
- test? (
- dev-libs/gmp:0
- dev-libs/mpfr:0
- media-libs/freeglut
- media-libs/glew
- sci-libs/adolc[sparse]
- sci-libs/cholmod
- sci-libs/fftw:3.0
- sci-libs/pastix
- sci-libs/scotch
- sci-libs/spqr
- sci-libs/superlu
- sci-libs/umfpack
- virtual/opengl
- )
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo-cmake.patch )
-
-src_prepare() {
- cmake_src_prepare
-
- cmake_comment_add_subdirectory demos
-
- if ! use test; then
- sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
- -i CMakeLists.txt || die
- fi
-
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKEPACKAGE_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/cmake/${PN}${SLOT}
- )
- use test && mycmakeargs+=(
- -DEIGEN_TEST_CXX11=ON
- -DEIGEN_TEST_NOQT=ON
- -DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
- -DEIGEN_TEST_CUDA=$(usex cuda)
- -DEIGEN_TEST_OPENMP=$(usex openmp)
- -DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
- -DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
- if use test; then
- cmake_src_compile blas
- cmake_src_compile buildtests
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- cmake_src_install
-}
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
deleted file mode 100644
index 6d4b9b34524..00000000000
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( virtual/pkgconfig )
-"
-DEPEND="
- cuda? ( dev-util/nvidia-cuda-toolkit )
- test? (
- dev-libs/gmp:0
- dev-libs/mpfr:0
- media-libs/freeglut
- media-libs/glew
- sci-libs/adolc[sparse]
- sci-libs/cholmod
- sci-libs/fftw:3.0
- sci-libs/pastix
- sci-libs/scotch
- sci-libs/spqr
- sci-libs/superlu
- sci-libs/umfpack
- virtual/opengl
- )
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
- "${FILESDIR}"/${PN}-3.3.9-max-macro.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- cmake_comment_add_subdirectory demos
-
- if ! use test; then
- sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
- -i CMakeLists.txt || die
- fi
-
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKEPACKAGE_INSTALL_DIR=$(get_libdir)/cmake/${PN}${SLOT}
- )
- use test && mycmakeargs+=(
- # the OpenGL testsuite is extremely brittle, bug #712808
- -DEIGEN_TEST_NO_OPENGL=ON
- # the cholmod tests are broken and always fail
- -DCMAKE_DISABLE_FIND_PACKAGE_Cholmod=ON
- -DEIGEN_TEST_CXX11=ON
- -DEIGEN_TEST_NOQT=ON
- -DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
- -DEIGEN_TEST_CUDA=$(usex cuda)
- -DEIGEN_TEST_OPENMP=$(usex openmp)
- -DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
- -DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- cmake_src_compile doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- fi
- if use test; then
- cmake_src_compile blas
- cmake_src_compile buildtests
-
- # tests generate random data, which
- # obviously fails for some seeds
- export EIGEN_SEED=712808
- fi
-}
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
index a787eecd000..6703c424542 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
# Tests failing again because of compiler issues
@@ -54,6 +54,7 @@ DEPEND="
PATCHES=(
#"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
+ "${FILESDIR}"/${P}-doc-nocompress.patch # bug 830064
)
src_prepare() {
diff --git a/dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch b/dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch
new file mode 100644
index 00000000000..b9c252ebb09
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.4.0-doc-nocompress.patch
@@ -0,0 +1,15 @@
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -112,11 +112,7 @@
+ COMMAND doxygen
+ COMMAND doxygen Doxyfile-unsupported
+ COMMAND ${CMAKE_COMMAND} -E copy ${Eigen_BINARY_DIR}/doc/html/group__TopicUnalignedArrayAssert.html ${Eigen_BINARY_DIR}/doc/html/TopicUnalignedArrayAssert.html
+- COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc
+- COMMAND ${CMAKE_COMMAND} -E remove eigen-doc/eigen-doc.tgz eigen-doc/unsupported/_formulas.log eigen-doc/_formulas.log
+- COMMAND ${CMAKE_COMMAND} -E tar cfz eigen-doc.tgz eigen-doc
+- COMMAND ${CMAKE_COMMAND} -E rename eigen-doc.tgz eigen-doc/eigen-doc.tgz
+- COMMAND ${CMAKE_COMMAND} -E rename eigen-doc html
++ COMMAND ${CMAKE_COMMAND} -E remove html/unsupported/_formulas.log html/_formulas.log
+ WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc)
+
+ add_dependencies(doc doc-eigen-prerequisites doc-unsupported-prerequisites)
diff --git a/dev-cpp/elfio/Manifest b/dev-cpp/elfio/Manifest
new file mode 100644
index 00000000000..8207c887f2a
--- /dev/null
+++ b/dev-cpp/elfio/Manifest
@@ -0,0 +1,2 @@
+DIST elfio-3.10.tar.gz 4243841 BLAKE2B a4cd5e7cb8b2f13cd7341adacb623b996e07e8ac761cd0f1e8eb20a87770fa936bf97ad79a0ff8d700ac41278bae7c5dd00d277f4c2d47e73340aaf607b7ee49 SHA512 f609fe5162d1609d1d65f441dbf01011ca5ae36195d8b3a74dec2b72891e9f8f90d3fdbc9bf893f7186494071606e898e5519fda18665fc88ae9781c504cd4a9
+DIST elfio-3.9.tar.gz 4265086 BLAKE2B 3f2f40930ad82b9bd4f53f14c117e71e5c8ba39f0952555c51f196ca03b187702347c80db30ecf6ad9d19bc4edfae18d1b3f04d4cd09e2b85f9bba9736e0a78a SHA512 479c4132ac3575940bd1e8190ba5253e54ae57f38319d7bca75ea85ee2f744f5d5b460d2d4ceb17eca0d0561c6e281673f050bbdab2f5ff526c031c220876bf1
diff --git a/dev-cpp/elfio/elfio-3.10.ebuild b/dev-cpp/elfio/elfio-3.10.ebuild
new file mode 100644
index 00000000000..18f8232d6cf
--- /dev/null
+++ b/dev-cpp/elfio/elfio-3.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="ELF reader/producer header-only C++ library"
+HOMEPAGE="https://github.com/serge1/ELFIO"
+SRC_URI="https://github.com/serge1/${PN}/archive/Release_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN^^}-Release_${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DELFIO_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/elfio/elfio-3.9.ebuild b/dev-cpp/elfio/elfio-3.9.ebuild
new file mode 100644
index 00000000000..048dd0370aa
--- /dev/null
+++ b/dev-cpp/elfio/elfio-3.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="ELF reader/producer header-only C++ library"
+HOMEPAGE="https://github.com/serge1/ELFIO"
+SRC_URI="https://github.com/serge1/${PN}/archive/Release_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN^^}-Release_${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DELFIO_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/elfio/metadata.xml b/dev-cpp/elfio/metadata.xml
new file mode 100644
index 00000000000..430dfaf9ea0
--- /dev/null
+++ b/dev-cpp/elfio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">serge1/ELFIO</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
new file mode 100644
index 00000000000..b5fa17da6fb
--- /dev/null
+++ b/dev-cpp/folly/Manifest
@@ -0,0 +1,2 @@
+DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74
+DIST folly-2022.04.11.00.tar.gz 3632587 BLAKE2B 13820f6dc600727fa97603181be97a568cc8b3c713659717592853827dac050d5f1f6d98178e3054871233b48ac18f713589bf43b36ea29445cad557ce13bacf SHA512 7aa0be95d6f8b21aaa88558cf5921c526ab5a8c8121b858eb6e7ea19946d7a82dff06d90b7a365cef5c56a43d8d57af8d01b8b11b27262fbed9ee8c9e701b5ac
diff --git a/dev-cpp/folly/folly-2022.03.28.00.ebuild b/dev-cpp/folly/folly-2022.03.28.00.ebuild
new file mode 100644
index 00000000000..f832bf20f63
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.03.28.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+ app-arch/lz4:=
+ app-arch/snappy:=
+ app-arch/xz-utils
+ app-arch/zstd:=
+ dev-cpp/gflags:=
+ dev-cpp/glog[gflags]
+ dev-libs/boost:=[context,threads(+)]
+ dev-libs/double-conversion:=
+ dev-libs/libaio
+ dev-libs/libevent:=
+ dev-libs/libfmt:=
+ dev-libs/libsodium:=
+ dev-libs/openssl:=
+ sys-libs/liburing:=
+ sys-libs/zlib
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+ sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+ if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+ ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+ ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+ export CC=${CHOST}-clang
+ export CXX=${CHOST}-clang++
+ fi
+}
+
+src_configure() {
+ # TODO: liburing could in theory be optional but fails to link
+
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/folly/folly-2022.04.11.00.ebuild b/dev-cpp/folly/folly-2022.04.11.00.ebuild
new file mode 100644
index 00000000000..ef4a97e38b6
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.04.11.00.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+ app-arch/lz4:=
+ app-arch/snappy:=
+ app-arch/xz-utils
+ app-arch/zstd:=
+ dev-cpp/gflags:=
+ dev-cpp/glog[gflags]
+ dev-libs/boost:=[context,threads(+)]
+ dev-libs/double-conversion:=
+ dev-libs/libaio
+ dev-libs/libevent:=
+ dev-libs/libfmt:=
+ dev-libs/libsodium:=
+ dev-libs/openssl:=
+ sys-libs/liburing:=
+ sys-libs/zlib
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+ sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+ if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+ ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+ ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+ export CC=${CHOST}-clang
+ export CXX=${CHOST}-clang++
+ fi
+}
+
+src_configure() {
+ # TODO: liburing could in theory be optional but fails to link
+
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest
+ # Long-standing known test failure
+ # TODO: report upstream
+ # - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout
+ # Timeouts are fragile
+ -E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout)"
+ )
+
+ cmake_src_test
+}
diff --git a/dev-cpp/folly/metadata.xml b/dev-cpp/folly/metadata.xml
new file mode 100644
index 00000000000..a512b80f6fc
--- /dev/null
+++ b/dev-cpp/folly/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">facebook/folly</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index e3240765a51..35615848938 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,4 +1,5 @@
-DIST glibmm-2.66.1.tar.xz 7509820 BLAKE2B 4750940093cadbae7c32d387ac8b16c8230eb08ed1645e457edfa27542a2e8a01d70de08bb41d1872dd1f03d1506bfaefc2af582250ca64ad480ce5f98f20d56 SHA512 caf57c2c9d163fff45041c33ed70d2692040d7bea44660d68e8c16a76be2609e0f857a5e16ad5220a0ec681a560c864dc86c2988a2c40741b4f29c9fe5b7d8b9
DIST glibmm-2.66.2.tar.xz 7603104 BLAKE2B 5696391bd5dbb35f8c961250af6d9b2644e900ac6a800054e9e7630cbf4882c17ef1bf8cf322e89a3bdbe613d13d4a045920bfc1071442daa3afc78afa8cd759 SHA512 097af6b140a5af3e52cc2c5d251475a5aa923d0c528c3cbc97f31d3a95868bcb3aa2328047ca94a55ef7fd188f271917dfe29faa86f477a441f0a024284216f9
-DIST glibmm-2.68.1.tar.xz 7657712 BLAKE2B a8141e53f89c981a9916d5f71dfd8c6d08e45a653b98c507acaadfefbedf2f22e8130a722f3398f5e0dff8196ffc8efa6567ebb2c8290f7373e34377e281db18 SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
-DIST glibmm-2.68.2.tar.xz 7844508 BLAKE2B 890f3a8f15580891df000acfe365989a6b09a63712b5f24f999a70e62983c725c9aef2b386b8995933c41b345164bb0b330b6cb0af182476f14657db8ba7d0cf SHA512 96b2970ac47e6a8de2d4352412f0107fbdcb61942d27f20a2f533f9704304e5f55c52829567457e7c925f830a69c739bf00676882741ed2969e52caf3e135c46
+DIST glibmm-2.66.4.tar.xz 7606108 BLAKE2B 5ff069110701d315c5d639e5efd824eb136b73fa29dc6e3fe5aead675e87b335bb2cbbbad2d9187285ce7086014aa316c07b672d88c5ba5fdaa3b8888e13af0a SHA512 9b1e0c09a11182384313ea4a7ba484ebab894528e08169a610387f207b5a7f8db9338466cd3e9eb3fa55e1c12817351ea27c39d6503208af67ba619f9d249c75
+DIST glibmm-2.70.0.tar.xz 7874312 BLAKE2B 5d0fb24444b8764e3f972f342a540164debb841f74e5d27db721feff9baa70c9ff5821b26642cb8c5da048f9a1271b1ed7283d9f0338ba0f184be396981310e3 SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518
+DIST glibmm-2.72.0.tar.xz 7921092 BLAKE2B 5f4fc6df527c6aa99886d5afe3233e15a37319b1c9f7814c9edfb574abb9b0f1b04b887d2a275c113382b0b301df7d3a22fc4398bc61746bd353e73015ec8770 SHA512 73b8a7a3848e6c5c9b532547002e44dd77ffc1ff80a849772cf48ad5aa14965bd6d50e01b2597320a578c3655bc1ef42804c0f2fed3ac632fe0218f8ae4788ff
+DIST glibmm-2.72.1.tar.xz 7921260 BLAKE2B 4078c2a6a12257a84844d3fa70c8b6a1a28b7c184f7bfbbf2adc882806099f7211378d6f7a23b1bbd18514ced9ada56642eb4ff877ee23cd70b4ee6b1a270510 SHA512 aa52c7b73e8f3437c2da9e8da74f84b9f07c7aa40a5fa232a7418b4af19575cbde01f6cbe9fb3fc3227bd9281a9439156a51d10a0c2c1a1beca226c7c93fe660
diff --git a/dev-cpp/glibmm/glibmm-2.66.2.ebuild b/dev-cpp/glibmm/glibmm-2.66.2.ebuild
index d6657cf05be..387dcf44d14 100644
--- a/dev-cpp/glibmm/glibmm-2.66.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/glibmm/glibmm-2.66.1.ebuild b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
index 5977b8dd7ac..c31432d315c 100644
--- a/dev-cpp/glibmm/glibmm-2.66.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/glibmm/glibmm-2.70.0.ebuild b/dev-cpp/glibmm/glibmm-2.70.0.ebuild
new file mode 100644
index 00000000000..fa089ef8ecd
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.70.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.68"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+"
+
+src_prepare() {
+ default
+
+ # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+ sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
+ if ! use test; then
+ sed -i -e "/^subdir('tests')/d" meson.build || die
+ fi
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dwarnings=min
+ -Dbuild-deprecated-api=true
+ $(meson_native_use_bool doc build-documentation)
+ $(meson_use debug debug-refcounting)
+ -Dbuild-examples=false
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/glibmm/glibmm-2.68.2.ebuild b/dev-cpp/glibmm/glibmm-2.72.0.ebuild
index b380e4af013..f40448c218b 100644
--- a/dev-cpp/glibmm/glibmm-2.68.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.72.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for glib2"
@@ -10,12 +10,12 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.71.2:2[${MULTILIB_USEDEP}]
dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/dev-cpp/glibmm/glibmm-2.68.1.ebuild b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
index a40dc5dd7ad..f40448c218b 100644
--- a/dev-cpp/glibmm/glibmm-2.68.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for glib2"
@@ -10,12 +10,12 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.71.2:2[${MULTILIB_USEDEP}]
dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
index e48bfd35045..9b10f2e2fc9 100644
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
# -sparc as libunwind is not ported on sparc
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
IUSE="gflags static-libs test"
RESTRICT="test"
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 4df075626ad..e2ac655eab6 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-CMAKE_ECLASS="cmake"
+EAPI="8"
inherit cmake-multilib
@@ -22,7 +21,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="gflags +libunwind llvm-libunwind test"
RESTRICT="!test? ( test )"
@@ -55,3 +54,8 @@ src_configure() {
cmake-multilib_src_configure
}
+
+src_test() {
+ # See bug #832355
+ cmake-multilib_src_test -j1
+}
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index 0f91ce1bb22..b109eca5bd2 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -5,9 +5,9 @@
<email>arfrever.fta@gmail.com</email>
<name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
- <maintainer type="person" proxied="proxy">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
</maintainer>
<use>
<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 3b3e722caa7..cb7e7695b14 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,2 +1 @@
-DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
diff --git a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
index 3e06777ac9a..0c47681ba34 100644
--- a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
+++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
@@ -1,4 +1,5 @@
Bug: https://bugs.gentoo.org/692464
+ https://bugs.gentoo.org/834068
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -7,7 +8,7 @@ Bug: https://bugs.gentoo.org/692464
if (!use_fork) {
static const bool stack_grows_down = StackGrowsDown();
- const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-+ const auto stack_size = static_cast<size_t>(getpagesize() * 10);
++ const auto stack_size = static_cast<size_t>(getpagesize() * 12);
// MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
deleted file mode 100644
index 58067c7a096..00000000000
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{8..10} )
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib python-any-r1
-
-GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/google/googletest"
-else
- if [[ -z ${GOOGLETEST_COMMIT} ]]; then
- URI_PV=v${MY_PV:-${PV}}
- else
- URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
- fi
- SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- S="${WORKDIR}"/googletest-${MY_PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e '/set(cxx_base_flags /s:-Werror::' \
- googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_GMOCK=ON
- -DINSTALL_GTEST=ON
-
- # tests
- -Dgmock_build_tests=$(usex test)
- -Dgtest_build_tests=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake_src_configure
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/.
- docinto googlemock
- dodoc -r googlemock/docs/.
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.11.0.ebuild
index 89518bffd1d..b2c3ebbb46e 100644
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,7 @@ else
-> ${P}.tar.gz"
S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
fi
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index c870874aadc..2a73b6d6508 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -10,7 +10,7 @@
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
- <doc lang="en">https://github.com/google/googletest/tree/master/googletest/docs</doc>
+ <doc lang="en">https://github.com/google/googletest/tree/HEAD/docs</doc>
<remote-id type="github">google/googletest</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 58c7f6edc8e..daed86c4db6 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,3 +1,5 @@
DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
-DIST gtkmm-4.2.0.tar.xz 13850496 BLAKE2B 0e39824085fde11ebe3ecd65e3fbdb1778f307292a51b98955f4fa1418e7d1a349838126093b0a2b6d628b66d39bffffba76f66d2928999f777a4abb7961dc77 SHA512 c4532c427da0a37e4f8ba6f0e6d3975c3f84db461bc08263a4a81e6ee9e750112a2b4b0c5000ba22f8fd4fc5f833ef320f2c1f56580157f7ae41667ff15ccc72
+DIST gtkmm-3.24.6.tar.xz 13530384 BLAKE2B 74fdf054a69a483a25234d30cc8cb920a3c1c8609601802d92bf7c57fcdc468d29bedf32b34997fbcaa5f72a07e467bc68a0c87a481b071d95a3a068e9fcaac7 SHA512 d6fc2d0689baca2b968820d1af86cc0b175b6f38f720d315bc50663d30bd0a841da57ac4336abec236542fb2893b28b2de84087419b73aba58b41f07568d4d93
+DIST gtkmm-4.6.0.tar.xz 13910344 BLAKE2B fd46c2e0fbda32daf472cae00591ab2cff6027dc0dfeee627ab1e3ac8d44066e702781ba452926dd808b30de260f9f6700242b0d80abd91b2b3ee5faef6eee17 SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199
+DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f14152488703c77c5a5d8532b1caa074954af875559bea8739022e4ca2cda49ed6a424946362bf39c0acd94a3a69c SHA512 87867deb2b4b0e50841e42d5957f9030c31c4ec1178b71a884a84c3c3aca178100ceb011729559f8f8f761dbe241c3cf4d420cc16c5b5aedcdd1d78f582d006d
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
index e482e204b76..16031f43abf 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1 virtualx
DESCRIPTION="C++ interface for GTK+"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc test wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
new file mode 100644
index 00000000000..8abb75354ca
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1 virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE="aqua doc test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-cpp/atkmm-2.24.2:0[doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/cairomm-1.12.0:0[doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.54.0:2[doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/pangomm-2.38.2:1.4[doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
+ >=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+ ${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dbuild-atkmm-api=true
+ -Dbuild-demos=false
+ $(meson_native_use_bool doc build-documentation)
+ $(meson_use test build-tests)
+ $(meson_use X build-x11-api)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ virtx meson_src_test
+}
diff --git a/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.0.ebuild
index eb7e2245e9f..7b8a615f09a 100644
--- a/dev-cpp/gtkmm/gtkmm-4.2.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,16 +11,16 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-cpp/glibmm-2.68.0:2.68[doc?]
- >=gui-libs/gtk-4.2.0:4
+ >=gui-libs/gtk-4.6.0:4
>=dev-cpp/cairomm-1.15.4:1.16[doc?]
- >=dev-cpp/pangomm-2.48.0:2.48[doc?]
+ >=dev-cpp/pangomm-2.50.0:2.48[doc?]
>=x11-libs/gdk-pixbuf-2.35.5:2
>=media-libs/libepoxy-1.2
"
diff --git a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
new file mode 100644
index 00000000000..09535b3cee8
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson python-any-r1 virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-cpp/glibmm-2.68.0:2.68[doc?]
+ >=gui-libs/gtk-4.6.0:4
+ >=dev-cpp/cairomm-1.15.4:1.16[doc?]
+ >=dev-cpp/pangomm-2.50.0:2.48[doc?]
+ >=x11-libs/gdk-pixbuf-2.35.5:2
+ >=media-libs/libepoxy-1.2
+"
+DEPEND="
+ ${RDEPEND}
+ doc? ( dev-libs/libsigc++:3 )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+ ${PYTHON_DEPS}
+"
+
+src_configure() {
+ local emesonargs=(
+ -Dbuild-demos=false
+ $(meson_use doc build-documentation)
+ $(meson_use test build-tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r1.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r2.ebuild
index a44c29f5fc7..25437c7d3f9 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r2.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
inherit gnome2
DESCRIPTION="C++ bindings for gtksourceview"
HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+LICENSE="LGPL-2.1"
+SLOT="3.0"
KEYWORDS="amd64 ppc x86"
IUSE="doc"
-SLOT="3.0"
-LICENSE="LGPL-2.1"
RDEPEND="
>=dev-cpp/glibmm-2.46.1:2
@@ -23,12 +22,12 @@ RDEPEND="
dev-cpp/cairomm:0
dev-cpp/pangomm:1.4
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
src_configure() {
- DOCS="AUTHORS ChangeLog* NEWS README"
gnome2_src_configure $(use_enable doc documentation)
}
diff --git a/dev-cpp/gulrak-filesystem/Manifest b/dev-cpp/gulrak-filesystem/Manifest
index 570717e1d82..d086439e82e 100644
--- a/dev-cpp/gulrak-filesystem/Manifest
+++ b/dev-cpp/gulrak-filesystem/Manifest
@@ -1 +1 @@
-DIST gulrak-filesystem-1.5.10.tar.gz 176873 BLAKE2B 0c9ccfd918ede195c65a25a361c9d3a7acca99d2e5e917911a5dcd7e74c989c291f37e962943771860ea8b14f26d066863faea4dd17cb25d44aa9061913d5e5c SHA512 470dd9e1c4358f9d8d9f531d8c3c6716cdd156c815315748436a1dc3caf095d320e58eae2274df8c15e293cc96170752fb00aed8ad2210d417b174c13297fbac
+DIST gulrak-filesystem-1.5.12.tar.gz 209661 BLAKE2B 9eb0bce08659396f3ef254b0ad772ae9ad29654aef3c90ab1f9eee1c4f830544ad947680e072fcf7d3c251a3afb77447617610c49931d50743444a6b88b4745d SHA512 2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c
diff --git a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.10.ebuild b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
index ea6c138fc1a..35894094c0a 100644
--- a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.10.ebuild
+++ b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gulrak/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
new file mode 100644
index 00000000000..7510c7106e7
--- /dev/null
+++ b/dev-cpp/highway/Manifest
@@ -0,0 +1 @@
+DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
diff --git a/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
new file mode 100644
index 00000000000..de157925c6e
--- /dev/null
+++ b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
@@ -0,0 +1,17 @@
+https://github.com/google/highway/commit/daf441c78191b3433410498d27a5bfdfdf93a142
+
+diff --git a/hwy/targets.cc b/hwy/targets.cc
+index 2a0ab4ef..7e7e2d79 100644
+--- a/hwy/targets.cc
++++ b/hwy/targets.cc
+@@ -328,8 +328,8 @@ uint32_t SupportedTargets() {
+ if (!IsBitSet(xcr0, 2)) {
+ bits &= ~uint32_t(HWY_AVX2 | HWY_AVX3 | HWY_AVX3_DL);
+ }
+- // ZMM + opmask
+- if ((xcr0 & 0x70) != 0x70) {
++ // opmask, ZMM lo/hi
++ if (!IsBitSet(xcr0, 5) || !IsBitSet(xcr0, 6) || !IsBitSet(xcr0, 7)) {
+ bits &= ~uint32_t(HWY_AVX3 | HWY_AVX3_DL);
+ }
+ }
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
new file mode 100644
index 00000000000..98782f199f5
--- /dev/null
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+ SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-AVX512-detection-on-IceLakeClient.patch
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DHWY_WARNINGS_ARE_ERRORS=OFF
+ )
+
+ use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
new file mode 100644
index 00000000000..2c36b3475ab
--- /dev/null
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+ SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DHWY_WARNINGS_ARE_ERRORS=OFF
+ )
+
+ use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/highway/metadata.xml b/dev-cpp/highway/metadata.xml
new file mode 100644
index 00000000000..211c94e70a5
--- /dev/null
+++ b/dev-cpp/highway/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>dnovomesky@gmail.com</email>
+ <name>Daniel Novomesky</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Highway is a C++ library for SIMD (Single Instruction, Multiple Data),
+ i.e. applying the same operation to multiple 'lanes' using a single CPU instruction.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-cpp/json11/json11-1.0.0.ebuild b/dev-cpp/json11/json11-1.0.0.ebuild
index 94fcfeb98c4..f19252f78fb 100644
--- a/dev-cpp/json11/json11-1.0.0.ebuild
+++ b/dev-cpp/json11/json11-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
PATCHES=(
"${FILESDIR}"/${P}-fix-multiarch-install.patch
diff --git a/dev-cpp/json11/metadata.xml b/dev-cpp/json11/metadata.xml
index 87a759d410c..a7fa285c747 100644
--- a/dev-cpp/json11/metadata.xml
+++ b/dev-cpp/json11/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<name>Florian Schmaus</name>
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index f3ff3912549..4da29b139ec 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,2 +1 @@
-DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8 SHA512 c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
DIST kokkos-3.1.01.tar.gz 1972707 BLAKE2B fe31556ecba6b01ed6e480f0cb4ca4d7dc487d6b2a7e52df94d0e93b864ed5269a752f4fcdbacb55383e9dee3b72236f121b67d2f5eed10f3351219b063e7099 SHA512 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
diff --git a/dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild b/dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild
deleted file mode 100644
index 3f10ae6936c..00000000000
--- a/dev-cpp/kokkos/kokkos-3.0.00-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
-HOMEPAGE="https://github.com/kokkos"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -x86"
-IUSE="+openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- sys-apps/hwloc:=
- "
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && \
- use openmp && ! tc-has-openmp ; then
- die "Need an OpenMP capable compiler"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
- -DKokkos_ENABLE_TESTS=$(usex test)
- -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
- -DKokkos_ENABLE_DEPRECATED_CODE=ON
- -DKokkos_ENABLE_SERIAL=ON
- -DKokkos_ENABLE_HWLOC=ON
- -DKokkos_HWLOC_DIR="${EPREFIX}/usr"
- -DKokkos_ENABLE_OPENMP=$(usex openmp)
- -DBUILD_SHARED_LIBS=ON
- )
-
- cmake-utils_src_configure
-}
diff --git a/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild b/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
index 52828debf31..eaa8cf4e4ec 100644
--- a/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
+++ b/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,13 +17,13 @@ RESTRICT="!test? ( test )"
DEPEND="sys-apps/hwloc:="
RDEPEND="${DEPEND}"
-BDEPEND=""
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && \
- use openmp && ! tc-has-openmp ; then
- die "Need an OpenMP capable compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r3.ebuild
index 4b75e756ca7..0a8fa5f985c 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
+
GNOME_TARBALL_SUFFIX="bz2"
-inherit eutils flag-o-matic gnome2 multilib-minimal
+inherit gnome2 multilib-minimal
DESCRIPTION="C++ bindings for libglade"
HOMEPAGE="https://www.gtkmm.org"
@@ -20,9 +20,8 @@ RDEPEND="
>=dev-cpp/gtkmm-2.24.3:2.4[${MULTILIB_USEDEP}]
>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_prepare() {
# we will control install manually in install
@@ -33,8 +32,6 @@ src_prepare() {
sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
Makefile.am Makefile.in || die "sed Makefile.{am,in} failed (2)"
- append-cxxflags -std=c++11 #566584
-
gnome2_src_prepare
}
@@ -45,30 +42,22 @@ multilib_src_configure() {
multilib_src_compile() {
gnome2_src_compile
- if multilib_is_native_abi && use doc; then
- emake -C "docs/reference" all
- fi
+ multilib_is_native_abi && use doc && emake -C docs/reference all
}
multilib_src_install() {
gnome2_src_install
- if use examples; then
- emake -C "examples" distclean
- fi
+ use examples && emake -C examples distclean
}
multilib_src_install_all() {
+ use doc && HTML_DOCS=( docs/reference/html/. )
einstalldocs
- if use doc ; then
- dohtml -r docs/reference/html/*
- fi
-
if use examples; then
- find "${S}/examples" -name "Makefile*" -delete \
+ find examples/ -name 'Makefile*' -delete \
|| die "examples cleanup failed"
- insinto "/usr/share/doc/${PF}"
- doins -r examples
+ dodoc -r examples
fi
}
diff --git a/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch b/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch
new file mode 100644
index 00000000000..e750a355967
--- /dev/null
+++ b/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch
@@ -0,0 +1,13 @@
+don't waste time building the examples
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -195,7 +195,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tools libgnomecanvas docs examples demos
++SUBDIRS = tools libgnomecanvas docs demos
+ DIST_SUBDIRS = $(SUBDIRS) scripts
+ EXTRA_DIST = libgnomecanvasmm.spec.in \
+ build_shared/Makefile_build.am_fragment \
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
deleted file mode 100644
index d18b3c0b134..00000000000
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for libgnomecanvas"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples"
-
-RDEPEND="
- >=gnome-base/libgnomecanvas-2.6
- >=dev-cpp/gtkmm-2.4:2.4
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- if ! use examples; then
- # don't waste time building the examples
- sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
- die "sed Makefile.in failed"
- fi
- gnome2_src_prepare
- append-cxxflags -std=c++11 #568300
-}
-
-src_compile() {
- gnome2_src_compile
-
- if use doc; then
- cd "${S}/docs/reference"
- emake all
- fi
-}
-
-src_install() {
- gnome2_src_install
-
- if use doc ; then
- dohtml -r docs/reference/html/*
- fi
-
- if use examples; then
- cp -R examples "${D}/usr/share/doc/${PF}"
- fi
-}
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild
new file mode 100644
index 00000000000..d403ca36593
--- /dev/null
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="C++ bindings for libgnomecanvas"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+RDEPEND="
+ >=gnome-base/libgnomecanvas-2.6
+ >=dev-cpp/gtkmm-2.4:2.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-disable-building-examples.patch )
+
+src_compile() {
+ gnome2_src_compile
+
+ if use doc; then
+ emake -C docs/reference all
+ HTML_DOCS=( docs/reference/html/. )
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ rm examples/Makefile* examples/*/Makefile* || die
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 9296ea8ddd5..4173caf1a46 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,2 +1 @@
-DIST libjson-rpc-cpp-1.3.0.tar.gz 182354 BLAKE2B 512392c37e61833a98c1f682bdbb3ed0e3c72ff56f17407d49e5a0f134795daf5ff4c2702dd5222bfc8962b2c9a56c0c7856cc8fe1b923ea68c369a24d334b5c SHA512 4eb53c7b77845a0e845e42413c491dcfa1d6f72411276e8614dae6612edde8905013588465437ea39c5cc5700c2d48df07d15c83222924fc24e015fb9f7a02ea
DIST libjson-rpc-cpp-1.4.0.tar.gz 179478 BLAKE2B 1b5807665a5e055790a6ca3e977845ab6b8dc7fbcaf6baece170567cc4c5b16202b74cb72f47136a075352ee408dac26de85cf02e41873cbbb55aeac1145e1a6 SHA512 28774604fe91f0893fb36017f648556dced71cb731f0f76c95084af5dd35e167b69a0f5fdb64557ff273f7dc971bc6c469e4f32ada35d7cac18add18baf2f5ae
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
deleted file mode 100644
index 81b0d2bc501..00000000000
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/jsoncpp:=
- http-client? ( net-misc/curl:= )
- http-server? ( net-libs/libmicrohttpd:= )
- redis-client? ( dev-libs/hiredis:= )
- redis-server? ( dev-libs/hiredis:= )
- stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-cpp/catch:0 )"
-
-src_configure() {
- local mycmakeargs=(
- -DHTTP_CLIENT=$(usex http-client)
- -DHTTP_SERVER=$(usex http-server)
- -DREDIS_CLIENT=$(usex redis-client)
- -DREDIS_SERVER=$(usex redis-server)
- # they have no deps
- -DTCP_SOCKET_CLIENT=ON
- -DTCP_SOCKET_SERVER=ON
- -DSERIAL_PORT_CLIENT=ON
- -DSERIAL_PORT_SERVER=ON
- -DUNIX_DOMAIN_SOCKET_CLIENT=ON
- -DUNIX_DOMAIN_SOCKET_SERVER=ON
- # they are not installed
- -DCOMPILE_EXAMPLES=OFF
- -DCOMPILE_STUBGEN=$(usex stubgen)
- -DCOMPILE_TESTS=$(usex test)
- -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- use doc && emake -C "${BUILD_DIR}" doc
-}
-
-src_test() {
- # Tests fail randomly when run in parallel
- local MAKEOPTS=-j1
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- use doc && dodoc -r "${BUILD_DIR}"/doc/html
-}
diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
index 1e13937d466..beffdc9e332 100644
--- a/dev-cpp/libodb-sqlite/Manifest
+++ b/dev-cpp/libodb-sqlite/Manifest
@@ -1,2 +1,4 @@
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0 SHA512 be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
+DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce SHA512 a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
diff --git a/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index 00000000000..00b685600c8
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000
++++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+
+ #include <libbuild2/script/regex.hxx>
+
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
++{
++ if (__s.__current_ != __s.__last_)
++ {
++ switch (*__s.__current_)
++ {
++ case '\r':
++ case '\n':
++ __s.__do_ = __state::__reject;
++ __s.__node_ = nullptr;
++ break;
++ default:
++ __s.__do_ = __state::__accept_and_consume;
++ ++__s.__current_;
++ __s.__node_ = this->first();
++ break;
++ }
++ }
++ else
++ {
++ __s.__do_ = __state::__reject;
++ __s.__node_ = nullptr;
++ }
++}
++#endif
++
+ using namespace std;
+
+ namespace build2
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
index a8f86d0c81e..667455d569e 100644
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -56,6 +56,7 @@ src_prepare() {
cd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+ eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
sed \
-e 's:libsqlite3[/]\?::' \
-i buildfile build/bootstrap.build \
@@ -97,7 +98,6 @@ src_configure() {
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
- config.install.chroot="${D}" \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -113,5 +113,6 @@ src_test() {
}
src_install() {
- b install
+ b install \
+ config.install.chroot="${D}"
}
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
new file mode 100644
index 00000000000..996133e1f47
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+ https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-cpp/libodb
+ dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+ !<dev-util/build2-0.14.0
+"
+
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+b() {
+ local myargs=(
+ --jobs $(makeopts_jobs)
+ --verbose 3
+ )
+ export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
+ set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
+ echo "${@}"
+ "${@}" || die "${@} failed"
+}
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+ for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
+ printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+ "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
+ "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
+ ${i} \
+ || die
+ done
+
+ cd "${BS}" || die
+ eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+ sed \
+ -e 's:libsqlite3[/]\?::' \
+ -i buildfile build/bootstrap.build \
+ || die
+
+ if has_version dev-util/pkgconf; then
+ for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+ printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+ "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+ "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+ "${i}" \
+ || die
+ done
+ sed \
+ -e 's:libpkgconf[/]\?::' \
+ -i buildfile build/bootstrap.build \
+ || die
+ fi
+
+ cd "${S}" || die
+ default
+}
+
+src_configure() {
+ pushd ${BS} || die
+ emake -C build2 -f bootstrap.gmake \
+ CXX=$(tc-getCXX) \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+ popd || die
+
+ b configure \
+ config.cxx="$(tc-getCXX)" \
+ config.cxx.coptions="${CXXFLAGS}" \
+ config.cxx.loptions="${LDFLAGS}" \
+ config.c="$(tc-getCC)" \
+ config.cc.coptions="${CFLAGS}" \
+ config.cc.loptions="${LDFLAGS}" \
+ config.bin.ar="$(tc-getAR)" \
+ config.bin.ranlib="$(tc-getRANLIB)" \
+ config.bin.lib=shared \
+ config.install.root="${EPREFIX}"/usr \
+ config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+ config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_compile() {
+ b update-for-install
+ use test && b update-for-test
+}
+
+src_test() {
+ b test
+}
+
+src_install() {
+ b install \
+ config.install.chroot="${D}"
+}
diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
index b7102edd0e6..8d523e99383 100644
--- a/dev-cpp/libodb/Manifest
+++ b/dev-cpp/libodb/Manifest
@@ -1,2 +1,4 @@
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
+DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941 SHA512 68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
diff --git a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index 00000000000..00b685600c8
--- /dev/null
+++ b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000
++++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+
+ #include <libbuild2/script/regex.hxx>
+
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
++{
++ if (__s.__current_ != __s.__last_)
++ {
++ switch (*__s.__current_)
++ {
++ case '\r':
++ case '\n':
++ __s.__do_ = __state::__reject;
++ __s.__node_ = nullptr;
++ break;
++ default:
++ __s.__do_ = __state::__accept_and_consume;
++ ++__s.__current_;
++ __s.__node_ = this->first();
++ break;
++ }
++ }
++ else
++ {
++ __s.__do_ = __state::__reject;
++ __s.__node_ = nullptr;
++ }
++}
++#endif
++
+ using namespace std;
+
+ namespace build2
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
index df3cbb7b3e1..32154f06086 100644
--- a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -45,6 +45,7 @@ b() {
src_prepare() {
pushd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+ eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
@@ -91,7 +92,6 @@ src_configure() {
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
- config.install.chroot="${D}" \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -107,5 +107,6 @@ src_test() {
}
src_install() {
- b install
+ b install \
+ config.install.chroot="${D}"
}
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
new file mode 100644
index 00000000000..3556b3eb4d7
--- /dev/null
+++ b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+ https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+ !<dev-util/build2-0.14.0
+"
+
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+b() {
+ local myargs=(
+ --jobs $(makeopts_jobs)
+ --verbose 3
+ )
+ export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
+ set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
+ echo "${@}"
+ "${@}" || die "${@} failed"
+}
+
+src_prepare() {
+ pushd "${BS}" || die
+ eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+ printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+ "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
+ "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
+ libodb-sqlite/buildfile \
+ || die
+ sed \
+ -e 's:libsqlite3[/]\?::' \
+ -i buildfile build/bootstrap.build \
+ || die
+
+ if has_version dev-util/pkgconf; then
+ for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+ printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+ "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+ "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+ "${i}" \
+ || die
+ done
+ sed \
+ -e 's:libpkgconf[/]\?::' \
+ -i buildfile build/bootstrap.build \
+ || die
+ fi
+ popd || die
+
+ default
+}
+
+src_configure() {
+ pushd "${BS}" || die
+ emake -C build2 -f bootstrap.gmake \
+ CXX=$(tc-getCXX) \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+ popd || die
+
+ b configure \
+ config.cxx="$(tc-getCXX)" \
+ config.cxx.coptions="${CXXFLAGS}" \
+ config.cxx.loptions="${LDFLAGS}" \
+ config.c="$(tc-getCC)" \
+ config.cc.coptions="${CFLAGS}" \
+ config.cc.loptions="${LDFLAGS}" \
+ config.bin.ar="$(tc-getAR)" \
+ config.bin.ranlib="$(tc-getRANLIB)" \
+ config.bin.lib=shared \
+ config.install.root="${EPREFIX}"/usr \
+ config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+ config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_compile() {
+ b update-for-install
+ use test && b update-for-test
+}
+
+src_test() {
+ b test
+}
+
+src_install() {
+ b install \
+ config.install.chroot="${D}"
+}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
index dbcdc3dcd83..787ddd47f5c 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
+
GNOME_ORG_MODULE="${PN/pp/++}"
inherit gnome2 multilib-minimal
@@ -12,16 +12,15 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
LICENSE="LGPL-2.1"
SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc"
RDEPEND="
>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
>=dev-cpp/glibmm-2.32:2[${MULTILIB_USEDEP}]
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
multilib_src_prepare() {
gnome2_src_prepare
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index bf9e4e494ff..f45676cec67 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1 +1 @@
-DIST mm-common-1.0.3.tar.xz 272932 BLAKE2B 90459cfa75dbcab8bb9b0512f3f3f3703850000e4ea0124afb020c476fce9948ec0128d67510b13482d52f165ba0b7a8aa72e6b1afd4a88554fa52bc4f5598d2 SHA512 fdd79e9a2ca3d7ed311a6994bd04e7cbf2b1562c39968d309765ce3b5268128f98b3f1c08a434b460276e6d911d302a12ccc7aebd6cd67e4df13241a97034a70
+DIST mm-common-1.0.4.tar.xz 290164 BLAKE2B 2731c501ed79d2481b9094639bad1971e5a27e6416a7433982481e939bd44202f7e5769f3a9dbe5b7fd2e09a3f7bd4687d7ce85d79dafa877f5cc3c333f9d526 SHA512 e686f19cb4d40a3dda68e30b98b43fca3db51b387e28f5569bef0cfbb1cc3a7d72503ec5dfa0f2621dd349ac4c9c21f0fe93bdda224026534c509fbb60400243
diff --git a/dev-cpp/mm-common/mm-common-1.0.3.ebuild b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
index c313e2e311c..7eb43d535b2 100644
--- a/dev-cpp/mm-common/mm-common-1.0.3.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org python-any-r1 meson
DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 978e15f0d16..c1e82bb88d4 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1 +1,2 @@
DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696
+DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29
diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
index 3e690129c15..f5c2d7ee0ce 100644
--- a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild
new file mode 100644
index 00000000000..5163b667edb
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/GSL-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DGSL_TEST=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
index d7f19d2bb29..79f60335475 100644
--- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake git-r3
@@ -22,7 +22,6 @@ DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
PATCHES=(
"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
- "${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch"
)
src_configure() {
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 01cb9ff97db..2a400643c4b 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,2 +1,2 @@
-DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
+DIST muParser-2.3.3.tar.gz 112100 BLAKE2B 79a0a29781596f114aeea9756a5a2141eed19857c08d0a32093353eb049f8b179af577cbd07747d2b8093e448714397b47f36c68e54bbce22386f5ec06365bda SHA512 f7e01c83f6ffe71e240653c47fdb8f3152d7fdf61b5997a3c717dec50d0175065c4fc4241ec95fb35b60b968c5c965a820009163ebe84f0fa57d64b3a23226b4
diff --git a/dev-cpp/muParser/files/muParser-1.32-parallel-build.patch b/dev-cpp/muParser/files/muParser-1.32-parallel-build.patch
deleted file mode 100644
index 1681c6e6803..00000000000
--- a/dev-cpp/muParser/files/muParser-1.32-parallel-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing parallel build issue
-
-http://bugs.gentoo.org/show_bug.cgi?id=310037
-
---- muparser_v132/Makefile.in
-+++ muparser_v132/Makefile.in
-@@ -291,7 +291,7 @@
- @COND_SHARED_1@ rm -f $(DESTDIR)$(prefix)/$$f; \
- @COND_SHARED_1@ done
-
--@COND_SAMPLES_1@$(top_builddir)/samples/example1/example1$(EXEEXT): $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname)
-+@COND_SAMPLES_1@$(top_builddir)/samples/example1/example1$(EXEEXT): $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname) lib
- @COND_SAMPLES_1@ $(CXX) -o $@ $(EXAMPLE1_OBJECTS) -L$(top_builddir)/lib -L$(srcdir)/lib $(LDFLAGS) -lmuparser$(DEBUG_BUILD_POSTFIX) $(LIBS)
- @COND_SAMPLES_1@
- @COND_SAMPLES_1@ $(__example1___mac_setfilecmd)
diff --git a/dev-cpp/muParser/muParser-2.2.6.1.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
deleted file mode 100644
index d8bd2f678d9..00000000000
--- a/dev-cpp/muParser/muParser-2.2.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="https://beltoforion.de/en/muparser/"
-SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/muparser-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.32-parallel-build.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:-O2::g' \
- configure || die
-}
-
-src_configure() {
- econf $(use_enable test samples)
-}
-
-src_test() {
- cat > test.sh <<- EOFTEST
- LD_LIBRARY_PATH="${S}/lib" samples/example1/example1 <<- EOF
- quit
- EOF
- EOFTEST
- sh ./test.sh || die "test failed"
-}
-
-src_install() {
- default
- dodoc Changes.txt
-}
diff --git a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
index 612fd5ad566..a7adf4aa398 100644
--- a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/muparser-${PV}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc openmp test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/muParser/muParser-2.3.3.ebuild b/dev-cpp/muParser/muParser-2.3.3.ebuild
new file mode 100644
index 00000000000..6ff856ad49c
--- /dev/null
+++ b/dev-cpp/muParser/muParser-2.3.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# The upstream tag is v2.3.3-1 instead of v2.3.3
+suffix="-1"
+
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="https://beltoforion.de/en/muparser/"
+SRC_URI="https://github.com/beltoforion/muparser/archive/refs/tags/v${PV}${suffix}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/muparser-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc openmp test"
+RESTRICT="!test? ( test )"
+
+S="${S}${suffix}"
+
+PATCHES=(
+)
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_OPENMP=$(usex openmp)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_src_compile test
+}
+
+src_install() {
+ cmake_src_install
+}
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 5234c2e1989..35ece5669df 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,2 @@
-DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B 2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2 SHA512 1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
-DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
-DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B 7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913 SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
-DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
+DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
deleted file mode 100644
index 39a2c4c723a..00000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
- https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
- # Tests are built by default so we can't group the test logic below
- local mycmakeargs=(
- -DJSON_MultipleHeaders=ON
- -DJSON_BuildTests=$(usex test)
- )
-
- # Define test data directory here to avoid unused var QA warning, bug #747826
- use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- emake -C doc
- HTML_DOCS=( doc/html/. )
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}/test" || die
-
- # Skip certain tests needing git per upstream
- # https://github.com/nlohmann/json/issues/2189
- local myctestargs=(
- "-LE git_required"
- )
-
- cmake_src_test
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
deleted file mode 100644
index 39a2c4c723a..00000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
- https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
- # Tests are built by default so we can't group the test logic below
- local mycmakeargs=(
- -DJSON_MultipleHeaders=ON
- -DJSON_BuildTests=$(usex test)
- )
-
- # Define test data directory here to avoid unused var QA warning, bug #747826
- use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- emake -C doc
- HTML_DOCS=( doc/html/. )
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}/test" || die
-
- # Skip certain tests needing git per upstream
- # https://github.com/nlohmann/json/issues/2189
- local myctestargs=(
- "-LE git_required"
- )
-
- cmake_src_test
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 39a2c4c723a..64ba3b9af5c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -1,8 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
inherit cmake
# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
@@ -16,15 +21,12 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+IUSE="test"
# Need to report failing tests upstream
# Tests only just added, large test suite, majority pass
RESTRICT="test"
-BDEPEND="doc? ( app-doc/doxygen )"
-
DOCS=( ChangeLog.md README.md )
src_configure() {
@@ -42,11 +44,6 @@ src_configure() {
src_compile() {
cmake_src_compile
-
- if use doc; then
- emake -C doc
- HTML_DOCS=( doc/html/. )
- fi
}
src_test() {
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
deleted file mode 100644
index 727db8df498..00000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
- https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
- # Tests are built by default so we can't group the test logic below
- local mycmakeargs=(
- -DJSON_MultipleHeaders=ON
- -DJSON_BuildTests=$(usex test)
- )
-
- # Define test data directory here to avoid unused var QA warning, bug #747826
- use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- emake -C doc
- HTML_DOCS=( doc/html/. )
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}/test" || die
-
- # Skip certain tests needing git per upstream
- # https://github.com/nlohmann/json/issues/2189
- local myctestargs=(
- "-LE git_required"
- )
-
- cmake_src_test
-}
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 069e97c8ca6..7a9da35027f 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,2 +1,2 @@
-DIST notcurses-2.4.5.tar.gz 10082686 BLAKE2B 7205f4b5864cf9c09342a4c171f16be85abe92c1ad445ff31aa180837628b897fee8ce702340b68457b729f741a67d360e233d4344244627ed7bffcc07ae9818 SHA512 0ad1f22b591fd36eea9917c50b51a7811aec9662edec475d5555896115b5c7d3e51487a3b1d67298cfc5472be367d7b8a71b6554811e8e3a4d9d781adc2d01eb
-DIST notcurses-doc-2.4.5.tar.gz 133547 BLAKE2B 65795b4f58eb9f905f17a58e7435579f1bc17e72d0aa8816f6dd7c9f41fc1b8568dc078a93c9184e6324e6c02d3187f36e95f41ba9cf8dbd3dd1be5074b55f11 SHA512 9c29fda1b13530931f7f1768b607371e553f8b1fbd573c4cd80bbfacafa2e9b2eaa2063c4c324e8d9878fe62f44c013ab2402126e97f484a4442e791922c3622
+DIST notcurses-3.0.5.tar.gz 10135637 BLAKE2B a0ce682dca69de15eb17b153a96e7159ae2ff00f36694dbd72caa6fe0938bf52a5a1e1319ca8f3f011c56fb51fcb23e1b029b6b3307153f8c8768a58fd150aa8 SHA512 81aef639afc78225c4eb81f5576b773a5714476f09062f5ff290c10d4ab6ad3d67646c836556a0404f638684bfc3774897f75408033f447a6a14529c5f9f04b6
+DIST notcurses-doc-3.0.5.tar.gz 148376 BLAKE2B d899a21e40b5c39ee455326c607301a73fbe63f7e5336323397441bdb127324b50c444de578de08752a735b38476549c54b3902a0f4675722db6667ecd383195 SHA512 88537f912b9044337542d0c2dfa3777f5837a6a9fdbbe9ba2152c2e2874fca1c54a73e9f6459b9bd78784f4b3042845e9dc3ef7018cf9be043c6111eda70a82e
diff --git a/dev-cpp/notcurses/notcurses-2.4.5.ebuild b/dev-cpp/notcurses/notcurses-3.0.5.ebuild
index 56e13b2f06a..5ec6a07f778 100644
--- a/dev-cpp/notcurses/notcurses-2.4.5.ebuild
+++ b/dev-cpp/notcurses/notcurses-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,12 +17,12 @@ KEYWORDS="~amd64 ~x86"
DEPEND="dev-libs/libunistring:=
media-video/ffmpeg:=
sys-libs/gpm
- sys-libs/ncurses:=
- sys-libs/zlib"
+ sys-libs/ncurses:="
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DUSE_DEFLATE=OFF
-DUSE_DOCTEST=OFF
-DUSE_GPM=ON
-DUSE_MULTIMEDIA=ffmpeg
@@ -37,8 +37,10 @@ src_compile() {
cmake-multilib_src_compile
}
+# warning: these will fail if you don't have your (utf8) locale available,
+# or the proper terminfo database for your (hopefully correct) TERM.
src_test() {
- multilib_src_test
+ cmake-multilib_src_test
}
src_install() {
diff --git a/dev-cpp/opentelemetry-cpp/Manifest b/dev-cpp/opentelemetry-cpp/Manifest
new file mode 100644
index 00000000000..6433b1022ab
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/Manifest
@@ -0,0 +1,2 @@
+DIST opentelemetry-cpp-1.3.0.tar.gz 710030 BLAKE2B 56aa3213fd9c9ac5266197c2ca417f5ff181ca28016033c9320e63122eaf9a53bdb265e1778227a9036bc42f8837755a3009cb23610268bc03b9fb24b3844c82 SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836
+DIST opentelemetry-cpp-1.4.0.tar.gz 722520 BLAKE2B c34867846708218e5ffcff9cdaa275e0c43201f681a68ad697d9f83ac04b7fdc6cdb69d942274cbe200b241e407ba11218c7e92da4f9adf4490e89c06388347f SHA512 a2339c0f9b2dc0d4f1964536a844241436bd68774445a0eab6e89e51965e01d3c40d2aa776d751eb497c50e9fdaa4e0023095efb14c8abbd6bbe23a2596eb3c9
diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch
new file mode 100644
index 00000000000..a1ef0ff1d3c
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch
@@ -0,0 +1,92 @@
+diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
+index f8d248b..9a5be49 100644
+--- a/ext/test/http/curl_http_test.cc
++++ b/ext/test/http/curl_http_test.cc
+@@ -187,50 +187,6 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
+ ASSERT_EQ(count, 4);
+ }
+
+-TEST_F(BasicCurlHttpTests, SendGetRequest)
+-{
+- received_requests_.clear();
+- auto session_manager = http_client::HttpClientFactory::Create();
+- EXPECT_TRUE(session_manager != nullptr);
+-
+- auto session = session_manager->CreateSession("http://127.0.0.1:19000");
+- auto request = session->CreateRequest();
+- request->SetUri("get/");
+- GetEventHandler *handler = new GetEventHandler();
+- session->SendRequest(*handler);
+- ASSERT_TRUE(waitForRequests(30, 1));
+- session->FinishSession();
+- ASSERT_TRUE(handler->is_called_);
+- delete handler;
+-}
+-
+-TEST_F(BasicCurlHttpTests, SendPostRequest)
+-{
+- received_requests_.clear();
+- auto session_manager = http_client::HttpClientFactory::Create();
+- EXPECT_TRUE(session_manager != nullptr);
+-
+- auto session = session_manager->CreateSession("http://127.0.0.1:19000");
+- auto request = session->CreateRequest();
+- request->SetUri("post/");
+- request->SetMethod(http_client::Method::Post);
+-
+- const char *b = "test-data";
+- http_client::Body body = {b, b + strlen(b)};
+- request->SetBody(body);
+- request->AddHeader("Content-Type", "text/plain");
+- PostEventHandler *handler = new PostEventHandler();
+- session->SendRequest(*handler);
+- ASSERT_TRUE(waitForRequests(30, 1));
+- session->FinishSession();
+- ASSERT_TRUE(handler->is_called_);
+-
+- session_manager->CancelAllSessions();
+- session_manager->FinishAllSessions();
+-
+- delete handler;
+-}
+-
+ TEST_F(BasicCurlHttpTests, RequestTimeout)
+ {
+ received_requests_.clear();
+@@ -271,17 +227,6 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations)
+ delete handler;
+ }
+
+-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
+-{
+- received_requests_.clear();
+- curl::HttpClientSync http_client;
+-
+- http_client::Headers m1 = {};
+- auto result = http_client.Get("http://127.0.0.1:19000/get/", m1);
+- EXPECT_EQ(result, true);
+- EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
+-}
+-
+ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+ {
+ received_requests_.clear();
+@@ -296,18 +241,6 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+ result.GetSessionState() == http_client::SessionState::SendFailed);
+ }
+
+-TEST_F(BasicCurlHttpTests, SendPostRequestSync)
+-{
+- received_requests_.clear();
+- curl::HttpClientSync http_client;
+-
+- http_client::Headers m1 = {};
+- http_client::Body body = {};
+- auto result = http_client.Post("http://127.0.0.1:19000/post/", body, m1);
+- EXPECT_EQ(result, true);
+- EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
+-}
+-
+ TEST_F(BasicCurlHttpTests, GetBaseUri)
+ {
+ curl::HttpClient session_manager;
diff --git a/dev-cpp/opentelemetry-cpp/metadata.xml b/dev-cpp/opentelemetry-cpp/metadata.xml
new file mode 100644
index 00000000000..c4293b76629
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <use>
+ <flag name="jaeger">Include the jaeger exporter</flag>
+ <flag name="prometheus">include the Prometheus Client in the SDK</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
new file mode 100644
index 00000000000..d37e2bfc376
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The OpenTelemetry C++ Client"
+HOMEPAGE="
+ https://opentelemetry.io/
+ https://github.com/open-telemetry/opentelemetry-cpp
+"
+SRC_URI="https://github.com/open-telemetry/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+jaeger prometheus test"
+
+RDEPEND="
+ net-misc/curl:=
+ dev-libs/thrift:=
+ dev-libs/boost:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-cpp/gtest
+ dev-cpp/benchmark
+ )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ # remove tests the need network
+ "${FILESDIR}/opentelemetry-cpp-1.3.0-tests.patch"
+)
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+ -DBUILD_SHARED_LIBS:BOOL=ON
+ -DBUILD_TESTING:BOOL=$(usex test)
+ -DWITH_JAEGER:BOOL=$(usex jaeger)
+ -DWITH_PROMETHEUS:BOOL=$(usex prometheus)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
new file mode 100644
index 00000000000..d37e2bfc376
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The OpenTelemetry C++ Client"
+HOMEPAGE="
+ https://opentelemetry.io/
+ https://github.com/open-telemetry/opentelemetry-cpp
+"
+SRC_URI="https://github.com/open-telemetry/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+jaeger prometheus test"
+
+RDEPEND="
+ net-misc/curl:=
+ dev-libs/thrift:=
+ dev-libs/boost:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-cpp/gtest
+ dev-cpp/benchmark
+ )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ # remove tests the need network
+ "${FILESDIR}/opentelemetry-cpp-1.3.0-tests.patch"
+)
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+ -DBUILD_SHARED_LIBS:BOOL=ON
+ -DBUILD_TESTING:BOOL=$(usex test)
+ -DWITH_JAEGER:BOOL=$(usex jaeger)
+ -DWITH_PROMETHEUS:BOOL=$(usex prometheus)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 3fdd6184d2b..b62277b2d44 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,2 +1,2 @@
-DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
-DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
+DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
+DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
diff --git a/dev-cpp/pangomm/pangomm-2.42.2.ebuild b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
index 1415ead43d3..f739fa1d411 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for pango"
@@ -11,14 +11,14 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
DEPEND="
>=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
>=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.41.0[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.45.1[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
BDEPEND="
@@ -33,6 +33,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
+ -Dmaintainer-mode=false
$(meson_native_use_bool doc build-documentation)
)
meson_src_configure
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
index a7d98ee56e4..759433faaf6 100644
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for pango"
@@ -11,14 +11,14 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
DEPEND="
>=dev-cpp/cairomm-1.16.0:1.16[doc?,${MULTILIB_USEDEP}]
>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
>=dev-libs/libsigc++-3:3[doc?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.48.0[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.49.4[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
BDEPEND="
@@ -33,6 +33,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
+ -Dmaintainer-mode=false
$(meson_native_use_bool doc build-documentation)
)
meson_src_configure
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index a83ee4c545b..c042e0f356b 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index 8266f0a3e04..c9aa7b0d0b1 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1 +1 @@
-DIST prometheus-cpp-0.13.0.tar.gz 55448 BLAKE2B 5790e74f5bb783070b6928adf9d850dc59ff8507d580a96549e62a2ea9ca1cf5b5de0fb445dd373bbae6da3fdae59d1dbf2eca5e04dc3d6adb58e5c52da1e666 SHA512 d2c6708047cec1998697931d5e9b420dfa513ade9f298761b08ae87a5526cbe64476ebc56793c21d8c3d741e3a4db5ce8d27af1d39b4ca30a45de34f40fdca67
+DIST prometheus-cpp-1.0.0.tar.gz 56244 BLAKE2B 51ff199c0cd09367de873310a835b7a4a5893de11a6115b3de8ef142eb12b326ea7498a8adc155f3bbea6389da41eef91b5ef23cb0227ef1d1ceb64e4d7eac2e SHA512 baeb12725dd47b170e1ac94c23b2b18ba8aa11dedd95af7adee8fdf9ddebaddfca1ef75c30b1d65c94e1cfbcba2c41e0f4686f1a1de66beaba7dcd70ab190164
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.13.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild
index 07f8033472a..07f8033472a 100644
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-0.13.0.ebuild
+++ b/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild
diff --git a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
index 2a716f8f1a5..7256d7703bc 100644
--- a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
+++ b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/imageworks/pystring.git"
else
SRC_URI="https://github.com/imageworks/pystring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
fi
BDEPEND="
diff --git a/dev-cpp/range-v3/range-v3-0.11.0.ebuild b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
index c1e6dbe55a0..2c78e057a78 100644
--- a/dev-cpp/range-v3/range-v3-0.11.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
new file mode 100644
index 00000000000..48a56f09005
--- /dev/null
+++ b/dev-cpp/rapidyaml/Manifest
@@ -0,0 +1,4 @@
+DIST c4fs-f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz 22163 BLAKE2B c3ed63e9e92dbcba63faa415d4de56ce275fb3b493238235930c629362d75e08ca2f6ec2ad34fda12154544b9972e45b75c24c5a9c80d9d7a68febe6f6e462c8 SHA512 c25d1122851ef2d46b00a2fd5083313c742758530a0d5a9c0353ccd637fbe38228ef8fb45bc8addf9006cc7655dec4b4fc571af13dcedf75f19c551c5011e377
+DIST c4log-e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz 11985 BLAKE2B 15cc7c1bd9a1693e5419e4904e1cb30f297c7003e1480014f7782d35d0222cb000643901e6afffbe13bdbb61aa10aa4ce759c5333b327b81d3ade1e043283310 SHA512 93f4e8854cf3a5f00beb9a427004a360961caf47c53aaa817f5ca43f4cab7bad6333ba35aad24d1e7aecea75f9f3a8628527ccb0be241bdec25c5aebfb0be8e3
+DIST rapidyaml-0.4.1-src.tgz 910816 BLAKE2B b9ef92045009b1b38d9142b2856e747edf446261c2271ee580a3aa51a3b5a2b0dfbdbcd1da6c520697dff092e9918f273d77e3f1b1e1a6ee28305aac648e6b4e SHA512 99051f452d61262188cb824623dd950cf51e0db48f519e45e7ed1edf40f3445f73547f1fc0de6b5654a7a6986d48fd3659f72f2d46019af77349957ee14cdd79
+DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch
new file mode 100644
index 00000000000..a10fbc49585
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-libdir.patch
@@ -0,0 +1,9 @@
+--- a/ext/c4core/cmake/c4Project.cmake
++++ b/ext/c4core/cmake/c4Project.cmake
+@@ -2643,4 +2643,4 @@
+ set(_RUNTIME_INSTALL_DIR bin/)
+- set(_ARCHIVE_INSTALL_DIR lib/)
+- set(_LIBRARY_INSTALL_DIR lib/) # TODO on Windows, ARCHIVE and LIBRARY dirs must be different to prevent name clashes
++ set(_ARCHIVE_INSTALL_DIR lib/ CACHE STRING "")
++ set(_LIBRARY_INSTALL_DIR lib/ CACHE STRING "")
+ set(_INCLUDE_INSTALL_DIR include/)
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch
new file mode 100644
index 00000000000..0e404f09d78
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-system-gtest.patch
@@ -0,0 +1,8 @@
+--- a/ext/c4core/cmake/c4Project.cmake
++++ b/ext/c4core/cmake/c4Project.cmake
+@@ -2762,2 +2762,5 @@
+ if(NOT TARGET gtest)
++ find_package(GTest REQUIRED)
++ endif()
++ if(FALSE)
+ c4_import_remote_proj(gtest ${CMAKE_CURRENT_BINARY_DIR}/ext/gtest
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch
new file mode 100644
index 00000000000..97aeb72ee1a
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-tests-no-install.patch
@@ -0,0 +1,18 @@
+--- a/ext/c4fs/CMakeLists.txt
++++ b/ext/c4fs/CMakeLists.txt
+@@ -18,6 +18,4 @@
+ )
+
+-c4_install_target(c4fs)
+-c4_install_exports()
+
+ c4_add_dev_targets()
+--- a/ext/c4log/CMakeLists.txt
++++ b/ext/c4log/CMakeLists.txt
+@@ -21,6 +21,4 @@
+ )
+
+-c4_install_target(c4log)
+-c4_install_exports()
+
+ c4_add_dev_targets()
diff --git a/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch b/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch
new file mode 100644
index 00000000000..51fb56e7ed6
--- /dev/null
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.4.0-no-download.patch
@@ -0,0 +1,23 @@
+--- a/ext/testbm.cmake
++++ b/ext/testbm.cmake
+@@ -1,4 +1,2 @@
+ # these are used both for testing and benchmarking
+-c4_require_subproject(c4fs REMOTE
+- GIT_REPOSITORY https://github.com/biojppm/c4fs
+- GIT_TAG master)
++c4_require_subproject(c4fs SUBDIRECTORY ext/c4fs)
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -155,10 +155,6 @@
+
+- c4_require_subproject(c4log REMOTE
+- GIT_REPOSITORY https://github.com/biojppm/c4log
+- GIT_TAG master)
++ c4_require_subproject(c4log SUBDIRECTORY ../ext/c4log)
+
+ set(tsdir ${ed}/yaml-test-suite)
+- c4_download_remote_proj(yaml-test-suite suite_dir
+- GIT_REPOSITORY https://github.com/yaml/yaml-test-suite
+- GIT_TAG data-2022-01-17)
++ set(suite_dir ${CMAKE_SOURCE_DIR}/ext/yaml-test-suite)
+ if(NOT EXISTS ${suite_dir}/229Q)
diff --git a/dev-cpp/rapidyaml/metadata.xml b/dev-cpp/rapidyaml/metadata.xml
new file mode 100644
index 00000000000..0955cf95463
--- /dev/null
+++ b/dev-cpp/rapidyaml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">biojppm/rapidyaml</remote-id>
+ <remote-id type="pypi">rapidyaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
new file mode 100644
index 00000000000..cf4cdabc759
--- /dev/null
+++ b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# see *-no-download.patch
+C4FS_COMMIT="f78cbd86a77c976395c9834726a14a1bba059af0"
+C4LOG_COMMIT="e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d"
+YAMLTS_COMMIT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
+C4FS_P="c4fs-${C4FS_COMMIT}"
+C4LOG_P="c4log-${C4LOG_COMMIT}"
+YAMLTS_P="yaml-test-suite-${YAMLTS_COMMIT}"
+
+DESCRIPTION="Library to parse and emit YAML, and do it fast"
+HOMEPAGE="https://github.com/biojppm/rapidyaml/"
+SRC_URI="
+ https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
+ test? (
+ https://github.com/biojppm/c4fs/archive/${C4FS_COMMIT}.tar.gz -> ${C4FS_P}.tar.gz
+ https://github.com/biojppm/c4log/archive/${C4LOG_COMMIT}.tar.gz -> ${C4LOG_P}.tar.gz
+ https://github.com/yaml/yaml-test-suite/archive/${YAMLTS_COMMIT}.tar.gz -> ${YAMLTS_P}.tar.gz
+ )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="MIT Boost-1.0 BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.0-libdir.patch
+ "${FILESDIR}"/${PN}-0.3.0-system-gtest.patch
+ "${FILESDIR}"/${PN}-0.4.0-no-download.patch
+)
+
+DOCS=( README.md ROADMAP.md changelog )
+
+src_prepare() {
+ if use test; then
+ mv ../${C4FS_P} ext/c4fs &&
+ rmdir ext/c4fs/ext/c4core &&
+ ln -s ../../c4core ext/c4fs/ext || die
+
+ mv ../${C4LOG_P} ext/c4log &&
+ rmdir ext/c4log/ext/c4core &&
+ ln -s ../../c4core ext/c4log/ext || die
+
+ mv ../${YAMLTS_P} ext/yaml-test-suite || die
+
+ PATCHES+=( "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch )
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DRYML_BUILD_API=no # TODO if a python consumer needs it
+ -DRYML_BUILD_TESTS=$(usex test)
+ -DRYML_DBG=$(usex debug)
+ -D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build test
+}
+
+src_install() {
+ cmake_src_install
+
+ # remove shared private library that is statically linked
+ rm "${ED}"/usr/$(get_libdir)/libc4core.so* || die
+}
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index c20aed24881..721c9b323e7 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1 +1,2 @@
DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
+DIST robin-hood-hashing-3.11.5.tar.gz 177134 BLAKE2B b114c1d68ff2eae4cdb526e67def750a11056c2b5c400eab0870fda7c81dde5cf3bb168ea13ed3d34f2e57edffea5c58cb79ffb5328ecf839c723c71f54676d3 SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
new file mode 100644
index 00000000000..6eadea18b04
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
+SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
+HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+ local mycmakeargs=(
+ -DRH_STANDALONE_PROJECT=OFF
+ -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/share/"
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
new file mode 100644
index 00000000000..6e42350ec55
--- /dev/null
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
+HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+ local mycmakeargs=(
+ -DRH_STANDALONE_PROJECT=OFF
+ -DCMAKE_INSTALL_LIBDIR="${ESYSROOT}/usr/share/"
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/robin-map/robin-map-0.6.3.ebuild b/dev-cpp/robin-map/robin-map-0.6.3.ebuild
index 78a6b31dd3f..38e1f14137c 100644
--- a/dev-cpp/robin-map/robin-map-0.6.3.ebuild
+++ b/dev-cpp/robin-map/robin-map-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/Tessil/robin-map"
else
SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
new file mode 100644
index 00000000000..a60935fdd79
--- /dev/null
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -0,0 +1,4 @@
+DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
+DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
+DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch
new file mode 100644
index 00000000000..e6d3622ee11
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch
@@ -0,0 +1,58 @@
+From 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44 Mon Sep 17 00:00:00 2001
+From: Stanislav Angelovic <stanislav.angelovic@siemens.com>
+Date: Thu, 27 Jan 2022 13:38:19 +0100
+Subject: [PATCH] fix(tests): printer for std::chrono in googletest v1.11.0
+
+---
+ tests/CMakeLists.txt | 2 +-
+ tests/integrationtests/Defs.h | 22 ++++++++++------------
+ 2 files changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index fbf198c..ec42e55 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -19,7 +19,7 @@ if (NOT TARGET GTest::gmock)
+ if (NOT TARGET GTest::gmock)
+ include(FetchContent)
+
+- message("Fetching googletest...")
++ message("Fetching googletest v${GOOGLETEST_VERSION}...")
+ FetchContent_Declare(googletest
+ GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
+ GIT_TAG release-${GOOGLETEST_VERSION}
+diff --git a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h
+index 2f129a4..2bfc7c9 100644
+--- a/tests/integrationtests/Defs.h
++++ b/tests/integrationtests/Defs.h
+@@ -56,20 +56,18 @@ const bool DEFAULT_BLOCKING_VALUE{true};
+
+ constexpr const double DOUBLE_VALUE{3.24L};
+
+-/** Duration stream operator for human readable gtest value output.
+- *
+- * Note that the conversion to double is lossy if the input type has 64 or more bits.
+- * This is ok for our integration tests because they don't have very
+- * accurate timing requirements.
+- *
+- * @return human readable duration in seconds
+- */
++}}
++
++namespace testing::internal {
++
++// Printer for std::chrono::duration types.
++// This is a workaround, since it's not a good thing to add this to std namespace.
+ template< class Rep, class Period >
+-static std::ostream& operator<<(std::ostream& os, const std::chrono::duration<Rep, Period>& d)
+-{
++void PrintTo(const ::std::chrono::duration<Rep, Period>& d, ::std::ostream* os) {
+ auto seconds = std::chrono::duration_cast<std::chrono::duration<double>>(d);
+- return os << seconds.count() << " s";
++ *os << seconds.count() << "s";
++}
++
+ }
+-}}
+
+ #endif /* SDBUS_CPP_INTEGRATIONTESTS_DEFS_H_ */
diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch
new file mode 100644
index 00000000000..d6f018fda17
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch
@@ -0,0 +1,10 @@
+systemd does not include pkg-config dependencies for static linking.
+
+diff -Naur a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
+--- a/src/libsystemd/libsystemd.pc.in 2022-01-18 11:35:43.000000000 +0000
++++ b/src/libsystemd/libsystemd.pc.in 2022-03-05 21:24:47.139338880 +0000
+@@ -18,3 +18,4 @@
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -lsystemd
+ Cflags: -I${includedir}
++Requires: libcap
diff --git a/dev-cpp/sdbus-c++/metadata.xml b/dev-cpp/sdbus-c++/metadata.xml
new file mode 100644
index 00000000000..3bd4943a126
--- /dev/null
+++ b/dev-cpp/sdbus-c++/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+ <use>
+ <flag name="systemd">Use external libsystemd instead of statically-linked build</flag>
+ <flag name="tools">Install interface stub code generator</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
new file mode 100644
index 00000000000..c5d7db3dcb1
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 meson cmake
+
+SDP="systemd-stable-249.11"
+MUSL_PATCHSET="249.5-r1"
+
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ !systemd? (
+ https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
+ elibc_musl? (
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ )
+ )"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/0"
+KEYWORDS="~amd64"
+IUSE="doc systemd test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !systemd? ( sys-libs/libcap )
+ systemd? ( >=sys-apps/systemd-236:= )
+ tools? ( dev-libs/expat )
+"
+
+# util-linux is needed for libmount when building libsystemd, but sdbus-c++
+# doesn't need it when subsequently linking libsystemd statically.
+
+DEPEND="
+ ${RDEPEND}
+ !systemd? ( sys-apps/util-linux )
+ test? ( >=dev-cpp/gtest-1.10.0 )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+ !systemd? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ )
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+S="${WORKDIR}/sdbus-cpp-${PV}"
+SDS="${WORKDIR}/${SDP}"
+SDB="${WORKDIR}/systemd-build"
+
+pkg_setup() {
+ use systemd || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if ! use systemd; then
+ pushd "${SDS}" || die
+ use elibc_musl && eapply "${WORKDIR}"/musl-patches
+ eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
+ popd || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ if ! use systemd; then
+ EMESON_SOURCE=${SDS} \
+ BUILD_DIR=${SDB} \
+ meson_src_configure \
+ --prefix "${WORKDIR}" \
+ --includedir "${SDP}/src" \
+ -Drootlibdir="${SDB}" \
+ -Dselinux=false \
+ -Dstatic-libsystemd=pic \
+ -Dgshadow=false \
+ -Dsmack=false \
+ -Dutmp=false
+
+ # systemd doesn't generate the needed pkg-config file during configure.
+ BUILD_DIR=${SDB} \
+ meson_src_compile libsystemd.pc
+
+ # Need this present otherwise CMake generates the wrong linker args.
+ touch "${SDB}"/libsystemd.a || die
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_CODE_GEN=$(usex tools)
+ -DBUILD_DOC=yes
+ -DBUILD_DOXYGEN_DOC=$(usex doc)
+ -DBUILD_LIBSYSTEMD=no
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ PKG_CONFIG_PATH=${SDB}/src/libsystemd:${PKG_CONFIG_PATH} \
+ cmake_src_configure
+}
+
+src_compile() {
+ if ! use systemd; then
+ BUILD_DIR=${SDB} \
+ meson_src_compile version.h systemd:static_library
+ fi
+
+ cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+ if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+ ewarn "Not running the tests as a D-Bus configuration file has not been"
+ ewarn "installed yet or has changed since. The tests can be run after"
+ ewarn "the package has been merged."
+ return
+ elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+ ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+ return
+ fi
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+ if use test; then
+ # Delete installed test binaries.
+ rm -rv "${ED}"/opt || die
+ fi
+}
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
new file mode 100644
index 00000000000..17152a67a98
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 meson cmake
+
+SDP="systemd-stable-249.11"
+MUSL_PATCHSET="249.5-r1"
+
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ !systemd? (
+ https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
+ elibc_musl? (
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ )
+ )"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="doc systemd test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !systemd? ( sys-libs/libcap )
+ systemd? ( >=sys-apps/systemd-236:= )
+ tools? ( dev-libs/expat )
+"
+
+# util-linux is needed for libmount when building libsystemd, but sdbus-c++
+# doesn't need it when subsequently linking libsystemd statically.
+
+DEPEND="
+ ${RDEPEND}
+ !systemd? ( sys-apps/util-linux )
+ test? ( >=dev-cpp/gtest-1.10.0 )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+ !systemd? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ )
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+S="${WORKDIR}/sdbus-cpp-${PV}"
+SDS="${WORKDIR}/${SDP}"
+SDB="${WORKDIR}/systemd-build"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gtest-1.11.patch
+)
+
+pkg_setup() {
+ use systemd || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if ! use systemd; then
+ pushd "${SDS}" || die
+ use elibc_musl && eapply "${WORKDIR}"/musl-patches
+ eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
+ popd || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ if ! use systemd; then
+ EMESON_SOURCE=${SDS} \
+ BUILD_DIR=${SDB} \
+ meson_src_configure \
+ --prefix "${WORKDIR}" \
+ --includedir "${SDP}/src" \
+ -Drootlibdir="${SDB}" \
+ -Dselinux=false \
+ -Dstatic-libsystemd=pic \
+ -Dgshadow=false \
+ -Dsmack=false \
+ -Dutmp=false
+
+ # systemd doesn't generate the needed pkg-config file during configure.
+ BUILD_DIR=${SDB} \
+ meson_src_compile libsystemd.pc
+
+ # Need this present otherwise CMake generates the wrong linker args.
+ touch "${SDB}"/libsystemd.a || die
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_CODE_GEN=$(usex tools)
+ -DBUILD_DOC=yes
+ -DBUILD_DOXYGEN_DOC=$(usex doc)
+ -DBUILD_LIBSYSTEMD=no
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ PKG_CONFIG_PATH=${SDB}/src/libsystemd:${PKG_CONFIG_PATH} \
+ cmake_src_configure
+}
+
+src_compile() {
+ if ! use systemd; then
+ BUILD_DIR=${SDB} \
+ meson_src_compile version.h systemd:static_library
+ fi
+
+ cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+ if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+ ewarn "Not running the tests as a D-Bus configuration file has not been"
+ ewarn "installed yet or has changed since. The tests can be run after"
+ ewarn "the package has been merged."
+ return
+ elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+ ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+ return
+ fi
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+ if use test; then
+ # Delete installed test binaries.
+ rm -rv "${ED}"/opt || die
+ fi
+}
diff --git a/dev-cpp/string-theory/Manifest b/dev-cpp/string-theory/Manifest
index 4d9fac23ce4..7b0df9584b2 100644
--- a/dev-cpp/string-theory/Manifest
+++ b/dev-cpp/string-theory/Manifest
@@ -1,2 +1,3 @@
DIST string-theory-3.3.tar.gz 588360 BLAKE2B ad87857e6d5e3cad1346b759457b434de7612b97e1b19016b1dfc987ac67f0cab318745b14fe1f432cc921ffb1d33b875a2a62f0bc56d815dd35b405a9f08560 SHA512 86209333dce341078c3b973084bd9f3b8ff2ccac0e07a5e6acf5973bd1cfa420897b531b2d1bd6aba9f5ccc8927f85d91f06796ac0e62ec8a735564a0387d2f4
DIST string-theory-3.4.tar.gz 588522 BLAKE2B 207c490293401829d28590291166bcbeefde4ecb3b70d1cc2751d7582c53cf234b7e01579d3bfbe55681708e4d3e22cedbd6fe96b2fdad1c3ef158bb7a080593 SHA512 36ad82c6da276b7cb66d350ceb4bed2a66f768a6604b2981331ceec6a96d03cc3a7e7e5f733de88ec15e0ea41f99f8657b959a51149c540f530d06268c5657ff
+DIST string-theory-3.5.tar.gz 589905 BLAKE2B c2bc926b8568efc1fbe27861619bd8249ad788297dd537cff393d212b3bb12a529847b740fc8ba82dc28501fb05800eb8debf3e4832cf145b5c13882ac45e900 SHA512 30300155e64ace8197ed531baffe4e835c269ac10d6857ac9f29501e0a1f69965994d6f2fa2e64544e7d441de635e2d370be24efcf00a0d24066730d19f022a6
diff --git a/dev-cpp/string-theory/string-theory-3.5.ebuild b/dev-cpp/string-theory/string-theory-3.5.ebuild
new file mode 100644
index 00000000000..0ad4291f948
--- /dev/null
+++ b/dev-cpp/string-theory/string-theory-3.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~arm64 ~x86"
+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
+}
diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest
new file mode 100644
index 00000000000..37d6816e483
--- /dev/null
+++ b/dev-cpp/taskflow/Manifest
@@ -0,0 +1 @@
+DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5
diff --git a/dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch b/dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch
new file mode 100644
index 00000000000..c5da4fd96eb
--- /dev/null
+++ b/dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch
@@ -0,0 +1,377 @@
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index cf881d4..ff6618a 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ enable_testing()
+
+-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake)
++find_package(doctest REQUIRED)
++include(doctest)
+
+ list(APPEND TF_UNITTESTS
+ utility
+@@ -22,8 +23,7 @@ list(APPEND TF_UNITTESTS
+
+ foreach(unittest IN LISTS TF_UNITTESTS)
+ add_executable(${unittest} ${unittest}.cpp)
+- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
++ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
+ doctest_discover_tests(${unittest})
+ endforeach()
+
+diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp
+index 5ae7ac6..efffdd9 100644
+--- a/unittests/algorithms.cpp
++++ b/unittests/algorithms.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp
+index cd6985c..4e7b80f 100644
+--- a/unittests/asyncs.cpp
++++ b/unittests/asyncs.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/basics.cpp b/unittests/basics.cpp
+index 2784fa4..ac1ab20 100644
+--- a/unittests/basics.cpp
++++ b/unittests/basics.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp
+index 3273af3..ff17ad4 100644
+--- a/unittests/cancellation.cpp
++++ b/unittests/cancellation.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // EmptyFuture
+diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp
+index 0d330ae..e2784a5 100644
+--- a/unittests/compositions.cpp
++++ b/unittests/compositions.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp
+index 086a8a9..f2da83e 100644
+--- a/unittests/control_flow.cpp
++++ b/unittests/control_flow.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt
+index 7c76523..be2757c 100644
+--- a/unittests/cuda/CMakeLists.txt
++++ b/unittests/cuda/CMakeLists.txt
+@@ -12,15 +12,14 @@ list(APPEND TF_CUDA_UNITTESTS
+
+ foreach(cudatest IN LISTS TF_CUDA_UNITTESTS)
+ add_executable(${cudatest} ${cudatest}.cu)
+- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
++
+ # avoid cmake 3.18+ warning
+ # we let nvcc to decide the flag if the architecture is not given
+ if(NOT CUDA_ARCHITECTURES)
+ set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF)
+ endif()
+-
++
+ doctest_discover_tests(${cudatest})
+ endforeach()
+
+diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu
+index d97289e..5185cd9 100644
+--- a/unittests/cuda/cuda_algorithms.cu
++++ b/unittests/cuda/cuda_algorithms.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu
+index 8e0fdff..f97c782 100644
+--- a/unittests/cuda/cuda_basics.cu
++++ b/unittests/cuda/cuda_basics.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu
+index 86fcfb7..7cbcf0a 100644
+--- a/unittests/cuda/cuda_capturer_optimizer.cu
++++ b/unittests/cuda/cuda_capturer_optimizer.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu
+index b3d316d..241cc93 100644
+--- a/unittests/cuda/cuda_device.cu
++++ b/unittests/cuda/cuda_device.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu
+index 91495b5..c14d250 100644
+--- a/unittests/cuda/cuda_kmeans.cu
++++ b/unittests/cuda/cuda_kmeans.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu
+index 8e9f242..ec5386f 100644
+--- a/unittests/cuda/cuda_matrix.cu
++++ b/unittests/cuda/cuda_matrix.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu
+index eb9218f..92798df 100644
+--- a/unittests/cuda/cuda_rebinds.cu
++++ b/unittests/cuda/cuda_rebinds.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu
+index bdda539..d8b52dc 100644
+--- a/unittests/cuda/cuda_updates.cu
++++ b/unittests/cuda/cuda_updates.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/movable.cpp b/unittests/movable.cpp
+index 58be4fc..c4b3f1a 100644
+--- a/unittests/movable.cpp
++++ b/unittests/movable.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // increments a counter only on destruction
+diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp
+index 6527b34..c925e67 100644
+--- a/unittests/pipelines.cpp
++++ b/unittests/pipelines.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/pipeline.hpp>
+diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp
+index d4713f8..c537702 100644
+--- a/unittests/semaphores.cpp
++++ b/unittests/semaphores.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp
+index 20edef3..5b9870f 100644
+--- a/unittests/serializer.cpp
++++ b/unittests/serializer.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/utility/serializer.hpp>
+ #include <random>
+
+diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp
+index 00a616c..005eaf2 100644
+--- a/unittests/sorting.cpp
++++ b/unittests/sorting.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+
+diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp
+index b1de5d1..11fd97a 100644
+--- a/unittests/subflows.cpp
++++ b/unittests/subflows.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt
+index 492c941..3ef1dd7 100644
+--- a/unittests/sycl/CMakeLists.txt
++++ b/unittests/sycl/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-list(APPEND TF_SYCL_TESTS
++list(APPEND TF_SYCL_TESTS
+ sycl_basics
+ sycl_algorithms
+ sycl_rebinds
+@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS)
+ target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_libraries(${sycl_test}
+- ${PROJECT_NAME} Threads::Threads tf::default_settings
++ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest
+ )
+- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++
+ doctest_discover_tests(${sycl_test})
+ endforeach()
+diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp
+index cde9666..93973dc 100644
+--- a/unittests/sycl/sycl_algorithms.cpp
++++ b/unittests/sycl/sycl_algorithms.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ constexpr float eps = 0.0001f;
+diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp
+index 7ed5e16..274b9ce 100644
+--- a/unittests/sycl/sycl_basics.cpp
++++ b/unittests/sycl/sycl_basics.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ // task creation
+diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp
+index 5a00bf8..8854ef9 100644
+--- a/unittests/sycl/sycl_rebinds.cpp
++++ b/unittests/sycl/sycl_rebinds.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ // ----------------------------------------------------------------------------
+diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp
+index b7cac8a..474df49 100644
+--- a/unittests/traversals.cpp
++++ b/unittests/traversals.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+
+diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp
+index 097f96d..d3c5f99 100644
+--- a/unittests/tsq.cpp
++++ b/unittests/tsq.cpp
+@@ -49,7 +49,7 @@
+
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // ============================================================================
+diff --git a/unittests/utility.cpp b/unittests/utility.cpp
+index 9822cfe..95a253d 100644
+--- a/unittests/utility.cpp
++++ b/unittests/utility.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/utility/traits.hpp>
+ #include <taskflow/utility/object_pool.hpp>
diff --git a/dev-cpp/taskflow/files/taskflow-9999-fix_doctest.patch b/dev-cpp/taskflow/files/taskflow-9999-fix_doctest.patch
new file mode 100644
index 00000000000..323d17e7f53
--- /dev/null
+++ b/dev-cpp/taskflow/files/taskflow-9999-fix_doctest.patch
@@ -0,0 +1,377 @@
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index 3397d798..1256e8e6 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ enable_testing()
+
+-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake)
++find_package(doctest REQUIRED)
++include(doctest)
+
+ list(APPEND TF_UNITTESTS
+ utility
+@@ -23,8 +24,7 @@ list(APPEND TF_UNITTESTS
+
+ foreach(unittest IN LISTS TF_UNITTESTS)
+ add_executable(${unittest} ${unittest}.cpp)
+- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
++ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
+ doctest_discover_tests(${unittest})
+ endforeach()
+
+diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp
+index a250713a..09ae9ba5 100644
+--- a/unittests/algorithms.cpp
++++ b/unittests/algorithms.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp
+index 28eeaa8c..466687a2 100644
+--- a/unittests/asyncs.cpp
++++ b/unittests/asyncs.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/basics.cpp b/unittests/basics.cpp
+index f5b9e3dd..e93c3fd3 100644
+--- a/unittests/basics.cpp
++++ b/unittests/basics.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp
+index 3ce1cb8c..6543ee52 100644
+--- a/unittests/cancellation.cpp
++++ b/unittests/cancellation.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // EmptyFuture
+diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp
+index 4fd621b5..e3c91e4c 100644
+--- a/unittests/compositions.cpp
++++ b/unittests/compositions.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp
+index 024ace84..11206384 100644
+--- a/unittests/control_flow.cpp
++++ b/unittests/control_flow.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt
+index d0ccc8e9..ccb46721 100644
+--- a/unittests/cuda/CMakeLists.txt
++++ b/unittests/cuda/CMakeLists.txt
+@@ -13,15 +13,14 @@ list(APPEND TF_CUDA_UNITTESTS
+
+ foreach(cudatest IN LISTS TF_CUDA_UNITTESTS)
+ add_executable(${cudatest} ${cudatest}.cu)
+- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings)
+- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest)
++
+ # avoid cmake 3.18+ warning
+ # we let nvcc to decide the flag if the architecture is not given
+ if(NOT CUDA_ARCHITECTURES)
+ set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF)
+ endif()
+-
++
+ doctest_discover_tests(${cudatest})
+ endforeach()
+
+diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu
+index cccc04b4..47645273 100644
+--- a/unittests/cuda/cuda_algorithms.cu
++++ b/unittests/cuda/cuda_algorithms.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu
+index 8e0fdffd..f97c7822 100644
+--- a/unittests/cuda/cuda_basics.cu
++++ b/unittests/cuda/cuda_basics.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu
+index 86fcfb72..7cbcf0a5 100644
+--- a/unittests/cuda/cuda_capturer_optimizer.cu
++++ b/unittests/cuda/cuda_capturer_optimizer.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu
+index 49df36aa..fb68b29a 100644
+--- a/unittests/cuda/cuda_device.cu
++++ b/unittests/cuda/cuda_device.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu
+index 91495b59..c14d250f 100644
+--- a/unittests/cuda/cuda_kmeans.cu
++++ b/unittests/cuda/cuda_kmeans.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+ #include <taskflow/cuda/algorithm/for_each.hpp>
+diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu
+index 8e9f2421..ec5386f4 100644
+--- a/unittests/cuda/cuda_matrix.cu
++++ b/unittests/cuda/cuda_matrix.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+
+diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu
+index eb9218fa..92798dfd 100644
+--- a/unittests/cuda/cuda_rebinds.cu
++++ b/unittests/cuda/cuda_rebinds.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu
+index bdda539a..d8b52dcf 100644
+--- a/unittests/cuda/cuda_updates.cu
++++ b/unittests/cuda/cuda_updates.cu
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/cuda/cudaflow.hpp>
+diff --git a/unittests/movable.cpp b/unittests/movable.cpp
+index 96ce9da3..d5e64b47 100644
+--- a/unittests/movable.cpp
++++ b/unittests/movable.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // increments a counter only on destruction
+diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp
+index 94d8f394..701365c0 100644
+--- a/unittests/pipelines.cpp
++++ b/unittests/pipelines.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/pipeline.hpp>
+diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp
+index 616191b5..64b8a587 100644
+--- a/unittests/semaphores.cpp
++++ b/unittests/semaphores.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // --------------------------------------------------------
+diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp
+index 92c3ec70..c6a715e6 100644
+--- a/unittests/serializer.cpp
++++ b/unittests/serializer.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/utility/serializer.hpp>
+ #include <random>
+
+diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp
+index 8146324a..ff732fb0 100644
+--- a/unittests/sorting.cpp
++++ b/unittests/sorting.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/sort.hpp>
+
+diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp
+index 9db430de..e669a2c8 100644
+--- a/unittests/subflows.cpp
++++ b/unittests/subflows.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+ #include <taskflow/algorithm/reduce.hpp>
+
+diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt
+index c6481996..3b014d0e 100644
+--- a/unittests/sycl/CMakeLists.txt
++++ b/unittests/sycl/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-list(APPEND TF_SYCL_TESTS
++list(APPEND TF_SYCL_TESTS
+ sycl_basics
+ #sycl_algorithms
+ #sycl_rebinds
+@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS)
+ target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS})
+ target_link_libraries(${sycl_test}
+- ${PROJECT_NAME} Threads::Threads tf::default_settings
++ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest
+ )
+- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+-
++
+ doctest_discover_tests(${sycl_test})
+ endforeach()
+diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp
+index e029b2ef..7b44ca78 100644
+--- a/unittests/sycl/sycl_algorithms.cpp
++++ b/unittests/sycl/sycl_algorithms.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ constexpr float eps = 0.0001f;
+diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp
+index 0ff76969..eac52906 100644
+--- a/unittests/sycl/sycl_basics.cpp
++++ b/unittests/sycl/sycl_basics.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/sycl/syclflow.hpp>
+
+ // task creation
+diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp
+index 71b2f9de..1b5949fd 100644
+--- a/unittests/sycl/sycl_rebinds.cpp
++++ b/unittests/sycl/sycl_rebinds.cpp
+@@ -1,5 +1,5 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/syclflow.hpp>
+
+ // ----------------------------------------------------------------------------
+diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp
+index 71aef04b..683915b4 100644
+--- a/unittests/traversals.cpp
++++ b/unittests/traversals.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/taskflow.hpp>
+
+diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp
+index 51a137a7..8e9cac56 100644
+--- a/unittests/tsq.cpp
++++ b/unittests/tsq.cpp
+@@ -49,7 +49,7 @@
+
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+ #include <taskflow/taskflow.hpp>
+
+ // ============================================================================
+diff --git a/unittests/utility.cpp b/unittests/utility.cpp
+index 63c49708..01ee81a3 100644
+--- a/unittests/utility.cpp
++++ b/unittests/utility.cpp
+@@ -1,6 +1,6 @@
+ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+-#include <doctest.h>
++#include <doctest/doctest.h>
+
+ #include <taskflow/utility/traits.hpp>
+ #include <taskflow/utility/object_pool.hpp>
diff --git a/dev-cpp/cpp-taskflow/metadata.xml b/dev-cpp/taskflow/metadata.xml
index 5b4c8bac454..059a58ff11c 100644
--- a/dev-cpp/cpp-taskflow/metadata.xml
+++ b/dev-cpp/taskflow/metadata.xml
@@ -10,11 +10,11 @@
<name>Gentoo Science Project</name>
</maintainer>
<longdescription>
- Cpp-Taskflow is faster, more expressive, and easier for drop-in
+ Taskflow is faster, more expressive, and easier for drop-in
integration than many of existing task programming frameworks in
handling complex parallel workloads.
</longdescription>
<upstream>
- <remote-id type="github">cpp-taskflow/cpp-taskflow</remote-id>
+ <remote-id type="github">taskflow/taskflow</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
index 9b146d9dc54..c131483350c 100644
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,11 +6,11 @@ EAPI=8
inherit cmake
DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
+HOMEPAGE="https://taskflow.github.io"
if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git"
+ EGIT_REPO_URI="https://github.com/taskflow/${PN}.git"
inherit git-r3
- S="${WORKDIR}/cpp-taskflow-${PV}"
+ S="${WORKDIR}/taskflow-${PV}"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -26,9 +26,12 @@ DEPEND="test? ( dev-cpp/doctest )"
HTML_DOCS=( docs/. )
+PATCHES=(
+ "${FILESDIR}"/taskflow-3.3.0-fix_doctest.patch
+)
+
src_prepare() {
rm -r "${S}/3rd-party" || die "rm failed"
- default
cmake_src_prepare
}
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild b/dev-cpp/taskflow/taskflow-9999.ebuild
index 9b146d9dc54..67272062e50 100644
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-9999.ebuild
+++ b/dev-cpp/taskflow/taskflow-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,11 +6,11 @@ EAPI=8
inherit cmake
DESCRIPTION="Modern C++ Parallel Task Programming"
-HOMEPAGE="https://cpp-taskflow.github.io"
+HOMEPAGE="https://taskflow.github.io"
if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/cpp-taskflow/${PN}.git"
+ EGIT_REPO_URI="https://github.com/taskflow/${PN}.git"
inherit git-r3
- S="${WORKDIR}/cpp-taskflow-${PV}"
+ S="${WORKDIR}/taskflow-${PV}"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -26,9 +26,12 @@ DEPEND="test? ( dev-cpp/doctest )"
HTML_DOCS=( docs/. )
+PATCHES=(
+ "${FILESDIR}"/taskflow-9999-fix_doctest.patch
+)
+
src_prepare() {
rm -r "${S}/3rd-party" || die "rm failed"
- default
cmake_src_prepare
}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index fee2e0bbf7f..b048b94c211 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,2 +1,3 @@
DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
+DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
index 5be97b90605..1c970557600 100644
--- a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
@@ -1,3 +1,5 @@
+https://github.com/oneapi-src/oneTBB/pull/608
+
From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001
From: Ivan Kochin <kochin.ivan@intel.com>
Date: Wed, 27 Oct 2021 17:23:32 +0300
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
new file mode 100644
index 00000000000..091cad5821e
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
@@ -0,0 +1,23 @@
+https://github.com/oneapi-src/oneTBB/issues/186
+https://github.com/oneapi-src/oneTBB/pull/550
+https://bugs.gentoo.org/827883
+
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Thu, 7 Oct 2021 14:16:16 +0800
+Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550)
+
+Upstream-Status: Merged in commit later than 2021.5.0
+
+--- a/src/tbb/tools_api/ittnotify_config.h
++++ b/src/tbb/tools_api/ittnotify_config.h
+@@ -147,6 +147,10 @@
+ # define ITT_ARCH_IA32E 2
+ #endif /* ITT_ARCH_IA32E */
+
++#ifndef ITT_ARCH_IA64
++# define ITT_ARCH_IA64 3
++#endif /* ITT_ARCH_IA64 */
++
+ #ifndef ITT_ARCH_ARM
+ # define ITT_ARCH_ARM 4
+ #endif /* ITT_ARCH_ARM */
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
new file mode 100644
index 00000000000..4252ea44642
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
@@ -0,0 +1,27 @@
+https://github.com/oneapi-src/oneTBB/pull/716
+
+From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt <github@sicherha.de>
+Date: Wed, 5 Jan 2022 15:13:32 +0100
+Subject: [PATCH] Fix overeager stripping of compile flag
+
+The existing regex strips all occurrences of the given string from
+`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
+flag. For instance, `-Werror=format-security` gets truncated to
+`=format-security`.
+
+The new regex makes sure that only whole words get replaced.
+
+Signed-off-by: Christoph Erhardt <github@sicherha.de>
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
+ unset(_tbb_compile_options)
+ if (CMAKE_CXX_FLAGS)
+- string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++ string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ endif()
+ endmacro()
+
+
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
new file mode 100644
index 00000000000..014a3863f45
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
@@ -0,0 +1,25 @@
+https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38
+https://bugs.gentoo.org/830698
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 15 Dec 2021 08:08:07 -0800
+Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684)
+
+Exclude non-glibc linux systems along with android
+Fixes
+src/tbb/dynamic_link.cpp:417:29: error: use
+ of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND;
+| ^
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+ int flags = RTLD_NOW;
+ if (local_binding) {
+ flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+ flags = flags | RTLD_DEEPBIND;
+ #endif
+ } else {
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
new file mode 100644
index 00000000000..e46c16f42f5
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
@@ -0,0 +1,32 @@
+https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
+https://github.com/oneapi-src/oneTBB/pull/203
+https://bugs.gentoo.org/828704
+
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Wed, 7 Apr 2021 11:14:13 +0800
+Subject: [PATCH] mallinfo() is glibc specific API mark it so
+
+Helps compiling with musl
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/
+ return 1;
+ }
+
++#ifdef __GLIBC__
+ struct mallinfo mallinfo() __THROW
+ {
+ struct mallinfo m;
+@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW
+
+ return m;
+ }
++#endif
+
+ #if __ANDROID__
+ // Android doesn't have malloc_usable_size, provide it to be compatible
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
new file mode 100644
index 00000000000..111bbf123d9
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/832700
+https://github.com/oneapi-src/oneTBB/commit/6a15b64093c51ddc00bdf4a6b49d4bbec1574a12
+
+From: Rui Ueyama <rui314@gmail.com>
+Date: Fri, 4 Feb 2022 19:32:11 +0900
+Subject: [PATCH] Make tbb compile with musl libc (#748)
+
+TBB resumable tasks are implemented using getcontext() and setcontext()
+on Unix-like systems. These functions are deprecated in the recent
+versions of POSIX and may not exist. musl libc does not provide these
+functions.
+
+There's unfortunately no way to detect musl (musl intentionally do not
+define macros like `__MUSL__`), so __TBB_RESUMABLE_TASKS is defined if
+`__GLIBC__`. glibc-compatible libc's such as uClibc defines `__GLIBC__`,
+so it should work as a catch-all condition.
+
+Signed-off-by: Rui Ueyama <ruiu@cs.stanford.edu>
+--- a/include/oneapi/tbb/detail/_config.h
++++ b/include/oneapi/tbb/detail/_config.h
+@@ -268,7 +268,7 @@
+ #define __TBB_CPP20_COMPARISONS_PRESENT __TBB_CPP20_PRESENT
+ #endif
+
+-#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__)
++#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__))
+
+ /* This macro marks incomplete code or comments describing ideas which are considered for the future.
+ * See also for plain comment with TODO and FIXME marks for small improvement opportunities.
+
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
new file mode 100644
index 00000000000..83f119a9acd
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
@@ -0,0 +1,43 @@
+https://github.com/oneapi-src/oneTBB/pull/609
+https://github.com/oneapi-src/oneTBB/issues/370
+https://bugs.gentoo.org/842762
+
+From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
+From: Ilya Isaev <ilya.isaev@intel.com>
+Date: Fri, 8 Oct 2021 10:18:16 +0300
+Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
+
+Signed-off-by: Ilya Isaev <ilya.isaev@intel.com>
+--- a/cmake/compilers/Clang.cmake
++++ b/cmake/compilers/Clang.cmake
+@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+ endif()
+
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
+ endif()
+
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
+ endif()
+
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
+ endif()
+
+--- a/cmake/compilers/MSVC.cmake
++++ b/cmake/compilers/MSVC.cmake
+@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
+ endif()
+
+ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
+- if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
+ endif()
+ set(TBB_OPENMP_NO_LINK_FLAG TRUE)
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index c654a5fad29..3cdf62035bb 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -142,10 +142,9 @@ multilib_src_install_all() {
einstalldocs
if use examples ; then
- insinto /usr/share/doc/${PF}/examples/build
- doins build/*.inc
- insinto /usr/share/doc/${PF}/examples
- doins -r examples
- docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
+ docinto examples/build
+ dodoc build/*.inc
+ docompress -x /usr/share/doc/${PF}/examples
fi
}
diff --git a/dev-cpp/tbb/tbb-2021.4.0.ebuild b/dev-cpp/tbb/tbb-2021.4.0.ebuild
index 9a99edb24ae..ff94b74527c 100644
--- a/dev-cpp/tbb/tbb-2021.4.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit cmake-multilib flag-o-matic toolchain-funcs
+inherit cmake-multilib
DESCRIPTION="High level abstract threading library"
HOMEPAGE="https://www.threadingbuildingblocks.org"
@@ -24,6 +24,8 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-lto.patch
+ # bug 827883
+ "${FILESDIR}"/${P}-missing-TBB_machine_fetchadd4.patch
)
src_configure() {
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
new file mode 100644
index 00000000000..cbe0ea27769
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oneTBB-${PV}"
+
+LICENSE="Apache-2.0"
+# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
+# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
+SLOT="0/12.5-2.5-3.5"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/hwloc:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ # should be in.. 2022?
+ "${FILESDIR}"/${PN}-2021.4.0-lto.patch
+ "${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch
+ # bug 827883
+ "${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch
+ # need to verify this is in master
+ "${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
+ # musl again, should be in.. 2022?
+ "${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
+ # should be in.. 2022?
+ "${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch
+
+ "${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DTBB_TEST=$(usex test)
+ -DTBB_ENABLE_IPO=OFF
+ -DTBB_STRICT=OFF
+ )
+
+ cmake-multilib_src_configure
+}
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index a38364264aa..22a9096c51c 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1 +1 @@
-DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
+DIST tclap-1.2.5.tar.gz 4140723 BLAKE2B e3b48dc602ddd64887ca7764008e2ac406866fd7c17bd5b6f31e248b43f18ed6b1c8415fc29a505b3035befcb9716b3259680c7e53a51ad9df107e1cbad92eea SHA512 3b5b3d76e8ff21133001f5f9589fa6ec143729909bf0b9cc9934377bce178360c161fb5c1f4c4d9e9c74b09cff3d65f1d5100e61d4a732283524a78b6f236b10
diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.5.ebuild
index 7a86a74f833..b25e71c2dc4 100644
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2007-2021 Gentoo Authors
+# Copyright 2007-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Simple templatized C++ library for parsing command line arguments"
HOMEPAGE="http://tclap.sourceforge.net"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux"
IUSE="doc"
BDEPEND="doc? ( app-doc/doxygen )"
@@ -23,5 +23,5 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+ emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF}/html install
}
diff --git a/dev-cpp/termcolor/Manifest b/dev-cpp/termcolor/Manifest
new file mode 100644
index 00000000000..a52fc8290f2
--- /dev/null
+++ b/dev-cpp/termcolor/Manifest
@@ -0,0 +1,2 @@
+DIST termcolor-2.0.0.tar.gz 88582 BLAKE2B 3e7a4a99af3586fff103d0de0601e019881745e2921b4750dbf476439138a71120b6513a287c5fe26fd96a9c6115cb82295810d9bea11d0992f48fcd5d0a8d18 SHA512 72dead77fb9f3ff79432b1659b57c3d961a57b46305937acd0c221f5abb016f609dfaf7a9bf508bd7a073338ee604cf55f9915c8e8a76ddfaf6c68bc031e37f9
+DIST termcolor-2.1.0.tar.gz 89041 BLAKE2B 1b3681dcd7dde394737bdc02e8a8ae10c61adfddbb1506e7254c27636a9045bc17ebe45801ecf813c3fc6b3a4bb3ea90bc6246e651105fab2e42b0807fa74339 SHA512 668853a93e1208a08a4ea9ac8db2d9c615cefd0325c35402b767e0b1bf373589507b8eb7685babd5801c1e4f2533db6f4eabfedde365737a4c7c069f00f536d8
diff --git a/dev-cpp/termcolor/metadata.xml b/dev-cpp/termcolor/metadata.xml
new file mode 100644
index 00000000000..d8347ef2cc4
--- /dev/null
+++ b/dev-cpp/termcolor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ikalnytskyi/termcolor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/termcolor/termcolor-2.0.0.ebuild b/dev-cpp/termcolor/termcolor-2.0.0.ebuild
new file mode 100644
index 00000000000..34e39e78886
--- /dev/null
+++ b/dev-cpp/termcolor/termcolor-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A header-only C++ library for printing colored messages to the terminal"
+HOMEPAGE="https://github.com/ikalnytskyi/termcolor https://termcolor.readthedocs.io"
+SRC_URI="https://github.com/ikalnytskyi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+# It's just a visual test, nothing automated / no way to detect failure in an ebuild.
+RESTRICT="!test? ( test ) test"
+
+src_configure() {
+ local mycmakeargs=(
+ -DTERMCOLOR_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}"/test_termcolor || die
+}
diff --git a/dev-cpp/termcolor/termcolor-2.1.0.ebuild b/dev-cpp/termcolor/termcolor-2.1.0.ebuild
new file mode 100644
index 00000000000..62b3a757273
--- /dev/null
+++ b/dev-cpp/termcolor/termcolor-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A header-only C++ library for printing colored messages to the terminal"
+HOMEPAGE="https://github.com/ikalnytskyi/termcolor https://termcolor.readthedocs.io"
+SRC_URI="https://github.com/ikalnytskyi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+# It's just a visual test, nothing automated / no way to detect failure in an ebuild.
+RESTRICT="!test? ( test ) test"
+
+src_configure() {
+ local mycmakeargs=(
+ -DTERMCOLOR_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}"/test_termcolor || die
+}
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 7663d46aab0..2a51ade355b 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1 +1,4 @@
+DIST waylandpp-0.2.10.tar.gz 187273 BLAKE2B bc6dd4503665d7fd04ac78e6db26aefe1ce1974bfa33ed751fe3714a3838af90340cef77c53cef95d519c423c639d93c2e15e1fc602301b254d56ca029e021be SHA512 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99
DIST waylandpp-0.2.8.tar.gz 181950 BLAKE2B 186515308d2e17e39e61f953fcf43df6bcff45a965d6425ffb71f0314fc091d241a975d0e7a61e988091ae7491cab56e163b6bccc0a2584b79b5bd5a7f8573fd SHA512 bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
+DIST waylandpp-0.2.9.tar.gz 187141 BLAKE2B 0bf1bf62ccc792444d21941f15b675c9584822485c9869b66c40bcddbaac5716dcc25bf98e6110fc549f5f10c1197c9e5188c72b10cb878ba8e133a0e55b2db8 SHA512 abe683c236f3b082fb1bd64ce9cc93e4362040f41b31a42971a280fadc8a7ef06a47c6a02cb5201a3f4f864ccdc8a113a8d9a855ca99b42bf1fc322e2593648f
+DIST waylandpp-1.0.0.tar.gz 203510 BLAKE2B 939262f61051fb242e779fa4817b262af2de6acef50b53a55e8565e6305e84fbf297adad02d27342a39e2a1be920443cc6dd50711e2c584b3322fa1e90a7051c SHA512 64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.10.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.10.ebuild
new file mode 100644
index 00000000000..ed2592fab36
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-0.2.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+ >=dev-libs/wayland-1.11.0
+ media-libs/mesa[wayland]
+ >=dev-libs/pugixml-1.9-r1
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ "
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.9.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.9.ebuild
new file mode 100644
index 00000000000..ebd06ba3c06
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-0.2.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+ >=dev-libs/wayland-1.11.0
+ media-libs/mesa[wayland]
+ >=dev-libs/pugixml-1.9-r1
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ "
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
new file mode 100644
index 00000000000..ed2592fab36
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+ >=dev-libs/wayland-1.11.0
+ media-libs/mesa[wayland]
+ >=dev-libs/pugixml-1.9-r1
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ "
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index 6fda559666c..ed2592fab36 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
RDEPEND="
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index a8ffad9db28..059355f8922 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,2 +1 @@
-DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch
deleted file mode 100644
index 40ae155307d..00000000000
--- a/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001
-From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
-Date: Tue, 16 Apr 2019 08:38:01 +0200
-Subject: [PATCH 1/2] Replace make_shared with new in some cases
-
-Replace make_shared for asio types that take a lib::ref as a parameter.
-This should fix the ASIO change (boostorg/asio@59066d8) for 1.70,
-while keeping it backwards compatible to older boost versions.
----
- websocketpp/transport/asio/connection.hpp | 7 ++++---
- websocketpp/transport/asio/endpoint.hpp | 3 +--
- websocketpp/transport/asio/security/none.hpp | 3 +--
- websocketpp/transport/asio/security/tls.hpp | 3 +--
- 4 files changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
-index 60f88a79..1ccda8f3 100644
---- a/websocketpp/transport/asio/connection.hpp
-+++ b/websocketpp/transport/asio/connection.hpp
-@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type {
- * needed.
- */
- timer_ptr set_timer(long duration, timer_handler callback) {
-- timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-- lib::ref(*m_io_service),
-- lib::asio::milliseconds(duration)
-+ timer_ptr new_timer(
-+ new lib::asio::steady_timer(
-+ *m_io_service,
-+ lib::asio::milliseconds(duration))
- );
-
- if (config::enable_multithreading) {
-diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
-index ddab2c74..4b719a97 100644
---- a/websocketpp/transport/asio/endpoint.hpp
-+++ b/websocketpp/transport/asio/endpoint.hpp
-@@ -195,8 +195,7 @@ class endpoint : public config::socket_type {
-
- m_io_service = ptr;
- m_external_io_service = true;
-- m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
-- lib::ref(*m_io_service));
-+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
-
- m_state = READY;
- ec = lib::error_code();
-diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp
-index 5c8293db..6c7d3524 100644
---- a/websocketpp/transport/asio/security/none.hpp
-+++ b/websocketpp/transport/asio/security/none.hpp
-@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
- return socket::make_error_code(socket::error::invalid_state);
- }
-
-- m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
-- lib::ref(*service));
-+ m_socket.reset(new lib::asio::ip::tcp::socket(*service));
-
- if (m_socket_init_handler) {
- m_socket_init_handler(m_hdl, *m_socket);
-diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
-index c76fd9aa..04ac3790 100644
---- a/websocketpp/transport/asio/security/tls.hpp
-+++ b/websocketpp/transport/asio/security/tls.hpp
-@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
- if (!m_context) {
- return socket::make_error_code(socket::error::invalid_tls_context);
- }
-- m_socket = lib::make_shared<socket_type>(
-- _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
-+ m_socket.reset(new socket_type(*service, *m_context));
-
- if (m_socket_init_handler) {
- m_socket_init_handler(m_hdl, get_socket());
-
-From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001
-From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
-Date: Wed, 17 Apr 2019 10:06:18 +0000
-Subject: [PATCH 2/2] Fix missed entries; fix testing
-
----
- CMakeLists.txt | 2 +-
- websocketpp/transport/asio/connection.hpp | 3 +--
- websocketpp/transport/asio/endpoint.hpp | 7 ++-----
- 3 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2786aba9..951de975 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
- endif ()
-
- if (NOT Boost_USE_STATIC_LIBS)
-- add_definitions (/DBOOST_TEST_DYN_LINK)
-+ add_definitions (-DBOOST_TEST_DYN_LINK)
- endif ()
-
- set (Boost_FIND_REQUIRED TRUE)
-diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
-index 1ccda8f3..57dda74a 100644
---- a/websocketpp/transport/asio/connection.hpp
-+++ b/websocketpp/transport/asio/connection.hpp
-@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {
- m_io_service = io_service;
-
- if (config::enable_multithreading) {
-- m_strand = lib::make_shared<lib::asio::io_service::strand>(
-- lib::ref(*io_service));
-+ m_strand.reset(new lib::asio::io_service::strand(*io_service));
- }
-
- lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
-diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
-index 4b719a97..94509adb 100644
---- a/websocketpp/transport/asio/endpoint.hpp
-+++ b/websocketpp/transport/asio/endpoint.hpp
-@@ -687,9 +687,7 @@ class endpoint : public config::socket_type {
- * @since 0.3.0
- */
- void start_perpetual() {
-- m_work = lib::make_shared<lib::asio::io_service::work>(
-- lib::ref(*m_io_service)
-- );
-+ m_work.reset(new lib::asio::io_service::work(*m_io_service));
- }
-
- /// Clears the endpoint's perpetual flag, allowing it to exit when empty
-@@ -853,8 +851,7 @@ class endpoint : public config::socket_type {
-
- // Create a resolver
- if (!m_resolver) {
-- m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
-- lib::ref(*m_io_service));
-+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
- }
-
- tcon->set_uri(u);
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
deleted file mode 100644
index d7b8d0935b9..00000000000
--- a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++/Boost Asio based websocket client/server library"
-HOMEPAGE="https://www.zaphoyd.com/websocketpp"
-SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-RDEPEND="dev-libs/boost"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.0-cmake-install.patch
- "${FILESDIR}"/${PN}-0.8.1-boost-1.70.patch
- # disable tests that are timing sensitive
- # https://bugzilla.redhat.com/show_bug.cgi?id=1461069
- "${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
- # https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
- "${FILESDIR}"/${PN}-0.8.2-fix-boost_find_component.patch
- # https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
- "${FILESDIR}"/${PN}-0.8.2-fix-clang.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_CPP11=ON
- -DBUILD_TESTS="$(usex test)"
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
index e7142f79cd0..f9e11a9d8c9 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="examples test"
RESTRICT="!test? ( test )"