summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild4
-rw-r--r--dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch24
-rw-r--r--dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch18
-rw-r--r--dev-cpp/aixlog/aixlog-1.5.0.ebuild2
-rw-r--r--dev-cpp/amqp-cpp/Manifest3
-rw-r--r--dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild (renamed from dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild)16
-rw-r--r--dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild36
-rw-r--r--dev-cpp/argparse/Manifest1
-rw-r--r--dev-cpp/argparse/argparse-2.1-r1.ebuild (renamed from dev-cpp/argparse/argparse-2.1.ebuild)8
-rw-r--r--dev-cpp/argparse/argparse-2.6.ebuild29
-rw-r--r--dev-cpp/asio/asio-1.22.2.ebuild2
-rw-r--r--dev-cpp/atkmm/Manifest1
-rw-r--r--dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild (renamed from dev-cpp/atkmm/atkmm-2.28.2.ebuild)10
-rw-r--r--dev-cpp/atkmm/atkmm-2.28.3.ebuild38
-rw-r--r--dev-cpp/atkmm/atkmm-2.36.2-r1.ebuild (renamed from dev-cpp/atkmm/atkmm-2.36.2.ebuild)12
-rw-r--r--dev-cpp/benchmark/Manifest1
-rw-r--r--dev-cpp/benchmark/benchmark-1.6.1.ebuild36
-rw-r--r--dev-cpp/benchmark/benchmark-1.7.0.ebuild2
-rw-r--r--dev-cpp/cairomm/Manifest2
-rw-r--r--dev-cpp/cairomm/cairomm-1.14.3-r1.ebuild (renamed from dev-cpp/cairomm/cairomm-1.14.3.ebuild)10
-rw-r--r--dev-cpp/cairomm/cairomm-1.14.4.ebuild50
-rw-r--r--dev-cpp/cairomm/cairomm-1.16.1-r1.ebuild (renamed from dev-cpp/cairomm/cairomm-1.16.1.ebuild)10
-rw-r--r--dev-cpp/cairomm/cairomm-1.16.2.ebuild50
-rw-r--r--dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild2
-rw-r--r--dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild2
-rw-r--r--dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild4
-rw-r--r--dev-cpp/doctest/Manifest2
-rw-r--r--dev-cpp/doctest/doctest-2.4.6.ebuild25
-rw-r--r--dev-cpp/doctest/doctest-2.4.8-r1.ebuild27
-rw-r--r--dev-cpp/doctest/doctest-2.4.9.ebuild2
-rw-r--r--dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch23
-rw-r--r--dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch56
-rw-r--r--dev-cpp/edencommon/Manifest2
-rw-r--r--dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild41
-rw-r--r--dev-cpp/edencommon/edencommon-2022.09.12.00.ebuild41
-rw-r--r--dev-cpp/edencommon/metadata.xml11
-rw-r--r--dev-cpp/folly/Manifest4
-rw-r--r--dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch36
-rw-r--r--dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch62
-rw-r--r--dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch102
-rw-r--r--dev-cpp/folly/folly-2022.03.28.00-r1.ebuild2
-rw-r--r--dev-cpp/folly/folly-2022.08.29.00.ebuild (renamed from dev-cpp/folly/folly-2022.07.04.00.ebuild)22
-rw-r--r--dev-cpp/folly/folly-2022.09.12.00.ebuild (renamed from dev-cpp/folly/folly-2022.04.11.00-r1.ebuild)40
-rw-r--r--dev-cpp/gflags/gflags-2.2.1-r1.ebuild1
-rw-r--r--dev-cpp/gflags/gflags-2.2.2.ebuild1
-rw-r--r--dev-cpp/gflags/gflags-9999.ebuild3
-rw-r--r--dev-cpp/glibmm/Manifest2
-rw-r--r--dev-cpp/glibmm/glibmm-2.66.4-r1.ebuild (renamed from dev-cpp/glibmm/glibmm-2.66.4.ebuild)6
-rw-r--r--dev-cpp/glibmm/glibmm-2.66.5.ebuild54
-rw-r--r--dev-cpp/glibmm/glibmm-2.72.1-r1.ebuild (renamed from dev-cpp/glibmm/glibmm-2.72.1.ebuild)8
-rw-r--r--dev-cpp/glibmm/glibmm-2.74.0.ebuild52
-rw-r--r--dev-cpp/gtest/gtest-1.11.0.ebuild1
-rw-r--r--dev-cpp/gtest/gtest-9999.ebuild3
-rw-r--r--dev-cpp/gtkmm/Manifest2
-rw-r--r--dev-cpp/gtkmm/gtkmm-3.24.6-r1.ebuild (renamed from dev-cpp/gtkmm/gtkmm-3.24.6.ebuild)18
-rw-r--r--dev-cpp/gtkmm/gtkmm-3.24.7.ebuild53
-rw-r--r--dev-cpp/gtkmm/gtkmm-4.6.1-r1.ebuild (renamed from dev-cpp/gtkmm/gtkmm-4.6.1.ebuild)14
-rw-r--r--dev-cpp/gtkmm/gtkmm-4.8.0-r1.ebuild52
-rw-r--r--dev-cpp/highway/Manifest2
-rw-r--r--dev-cpp/highway/highway-0.16.0-r1.ebuild1
-rw-r--r--dev-cpp/highway/highway-0.17.0.ebuild1
-rw-r--r--dev-cpp/highway/highway-1.0.1.ebuild (renamed from dev-cpp/highway/highway-1.0.0.ebuild)1
-rw-r--r--dev-cpp/highway/highway-9999.ebuild1
-rw-r--r--dev-cpp/htmlcxx/htmlcxx-0.87.ebuild4
-rw-r--r--dev-cpp/jarowinkler-cpp/Manifest1
-rw-r--r--dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild32
-rw-r--r--dev-cpp/jarowinkler-cpp/metadata.xml11
-rw-r--r--dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild4
-rw-r--r--dev-cpp/libcmis/libcmis-9999.ebuild4
-rw-r--r--dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch34
-rw-r--r--dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild46
-rw-r--r--dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild2
-rw-r--r--dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild4
-rw-r--r--dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild4
-rw-r--r--dev-cpp/mm-common/mm-common-1.0.4.ebuild2
-rw-r--r--dev-cpp/nlohmann_json/Manifest2
-rw-r--r--dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild65
-rw-r--r--dev-cpp/notcurses/notcurses-3.0.5-r1.ebuild (renamed from dev-cpp/notcurses/notcurses-3.0.5.ebuild)18
-rw-r--r--dev-cpp/opentelemetry-cpp/Manifest1
-rw-r--r--dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.5.0-tests.patch67
-rw-r--r--dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch15
-rw-r--r--dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild52
-rw-r--r--dev-cpp/pangomm/Manifest2
-rw-r--r--dev-cpp/pangomm/pangomm-2.46.2-r1.ebuild (renamed from dev-cpp/pangomm/pangomm-2.46.2.ebuild)12
-rw-r--r--dev-cpp/pangomm/pangomm-2.46.3.ebuild40
-rw-r--r--dev-cpp/pangomm/pangomm-2.50.0-r1.ebuild (renamed from dev-cpp/pangomm/pangomm-2.50.0.ebuild)12
-rw-r--r--dev-cpp/pangomm/pangomm-2.50.1.ebuild40
-rw-r--r--dev-cpp/popl/popl-1.2.0.ebuild2
-rw-r--r--dev-cpp/prometheus-cpp/Manifest1
-rw-r--r--dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild41
-rw-r--r--dev-cpp/range-v3/range-v3-0.12.0.ebuild2
-rw-r--r--dev-cpp/rapidfuzz-cpp/Manifest1
-rw-r--r--dev-cpp/rapidfuzz-cpp/metadata.xml11
-rw-r--r--dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild42
-rw-r--r--dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild1
-rw-r--r--dev-cpp/sdbus-c++/Manifest6
-rw-r--r--dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch58
-rw-r--r--dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch29
-rw-r--r--dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild (renamed from dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild)8
-rw-r--r--dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild (renamed from dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild)6
-rw-r--r--dev-cpp/tbb/Manifest1
-rw-r--r--dev-cpp/tbb/tbb-2021.6.0.ebuild45
-rw-r--r--dev-cpp/valijson/Manifest1
-rw-r--r--dev-cpp/valijson/metadata.xml15
-rw-r--r--dev-cpp/valijson/valijson-0.7.ebuild44
-rw-r--r--dev-cpp/waylandpp/waylandpp-1.0.0.ebuild2
-rw-r--r--dev-cpp/yaml-cpp/Manifest1
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch44
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch57
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch149
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch44
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch101
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch17
-rw-r--r--dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch25
-rw-r--r--dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild49
-rw-r--r--dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild3
-rw-r--r--dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild (renamed from dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild)23
117 files changed, 1670 insertions, 780 deletions
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
index a987d852dee..1cc8c9c3537 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
@@ -22,7 +22,7 @@ LICENSE="
test? ( BSD )
"
SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="test"
DEPEND=""
@@ -38,6 +38,8 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch"
"${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.patch"
+ "${FILESDIR}/${PN}-20211102.0-r2-loong.patch"
+ "${FILESDIR}/${PN}-20211102.0-r2-gcc-13.patch"
)
src_prepare() {
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch
new file mode 100644
index 00000000000..2a847be09e9
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch
@@ -0,0 +1,24 @@
+https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c
+
+From 36a4b073f1e7e02ed7d1ac140767e36f82f09b7c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 27 May 2022 22:27:58 +0100
+Subject: [PATCH] absl/strings/internal/str_format/extension.h: add missing
+ <stdint.h> include
+
+Without the change absl-cpp build fails on this week's gcc-13 snapshot as:
+
+ /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::'
+ 34 | enum class FormatConversionChar : uint8_t;
+ | ^
+ | ::
+--- a/absl/strings/internal/str_format/extension.h
++++ b/absl/strings/internal/str_format/extension.h
+@@ -17,6 +17,7 @@
+ #define ABSL_STRINGS_INTERNAL_STR_FORMAT_EXTENSION_H_
+
+ #include <limits.h>
++#include <stdint.h>
+
+ #include <cstddef>
+ #include <cstring>
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch
new file mode 100644
index 00000000000..2031f9f33d8
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch
@@ -0,0 +1,18 @@
+https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1
+
+From 808bc202fc13e85a7948db0d7fb58f0f051200b1 Mon Sep 17 00:00:00 2001
+From: imaiguo <maaiguo@uniontech.com>
+Date: Wed, 23 Feb 2022 22:56:32 +0800
+Subject: [PATCH] Add support of loongarch64 (#1110)
+
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -82,6 +82,8 @@ void* GetProgramCounter(void* vuc) {
+ return reinterpret_cast<void*>(context->uc_mcontext.gregs[16]);
+ #elif defined(__e2k__)
+ return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi);
++#elif defined(__loongarch__)
++ return reinterpret_cast<void*>(context->uc_mcontext.__pc);
+ #else
+ #error "Undefined Architecture."
+ #endif
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
index 72420dcc99f..0fa1c949ccc 100644
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -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 ~arm ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/amqp-cpp/Manifest b/dev-cpp/amqp-cpp/Manifest
index aa933bf7514..33d46fd79d0 100644
--- a/dev-cpp/amqp-cpp/Manifest
+++ b/dev-cpp/amqp-cpp/Manifest
@@ -1 +1,2 @@
-DIST AMQP-CPP-4.3.10.tar.gz 156600 BLAKE2B 0453259e8d84b223fc8d36d4747b267a84d7db9daef55d13ff31d4c8cf1e5dd8efb87d9f83f7ff7554aa70c5000d6da45187ce03db09ff4c542bd5409d81ada8 SHA512 ef9a20cd066bbefc243d8d58dbded728e0c88f5c47134f835c50dfa01178b53200970333f0d56330c206f74aa7d7691556c3e4693d5276adb7e3bf4e66bcd057
+DIST AMQP-CPP-4.3.16.tar.gz 158954 BLAKE2B 175c5c22a88e20ca5d123fbf808a354a0b3048a0127ba75170b61e8c8822ba8d8b78cb4247cb26cfeebff92c0ca74213d6fb254afbc74e9f92a88751137e8c97 SHA512 bdce6a93f3b88a0ab26dae66e289f98194d0f1a3e2eb03e0c858111275a02ebec042dfe9d757989a1c0cbe1b15652346f86008bf4248e366d1896c4750d9194f
+DIST AMQP-CPP-4.3.17.tar.gz 160729 BLAKE2B 963b32e4736627da3eece481168565136ad6fd387e71a04de9d08664b6877a38e084e27f482c2c24886bff5c78dcdf266fab88189dc2eef85f3b50d15d020565 SHA512 763e9a3d6565584753a5bcd8f4e8b174327f206e01f001ae8b4b7d1728ccebf195cd2d4463a8b65badc1a91010978360f6f5c25fd3acf70116b5ff7eba2db7f6
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
index b3e938e0414..33a052a82f5 100644
--- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
@@ -1,10 +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
+EAPI=8
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
+inherit cmake
MY_PN=${PN^^}
MY_P=${MY_PN}-${PV}
@@ -12,21 +11,19 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
src_prepare() {
sed \
-e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
-e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \
-i CMakeLists.txt || die
+
cmake_src_prepare
- default
}
src_configure() {
@@ -34,5 +31,6 @@ src_configure() {
-DAMQP-CPP_BUILD_SHARED=ON
-DAMQP-CPP_LINUX_TCP=ON
)
- cmake-multilib_src_configure
+
+ cmake_src_configure
}
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
new file mode 100644
index 00000000000..33a052a82f5
--- /dev/null
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=${PN^^}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
+HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
+SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+src_prepare() {
+ sed \
+ -e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
+ -e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \
+ -i CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DAMQP-CPP_BUILD_SHARED=ON
+ -DAMQP-CPP_LINUX_TCP=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
index adac49660b3..ba65ae60a21 100644
--- a/dev-cpp/argparse/Manifest
+++ b/dev-cpp/argparse/Manifest
@@ -1 +1,2 @@
DIST argparse-2.1.tar.gz 72452 BLAKE2B eece3f1cf6a2e58f5bec99f0223b31ba92147964053d98122099dd806a0ab62c6039ee8741281d1eca28b9d0e3aa02d7d076e8bcc64bbd5dd03c777f8e460531 SHA512 35746e0b526bd4406c954ab315f191abc57b08b48a047f108ddacc7baace406d3ddddb1af23d41caff565afecfeb41dfedd27a08cdba8d11b59dbe7c78b7e9b0
+DIST argparse-2.6.tar.gz 93865 BLAKE2B 5ab49a1e9d85e1252b4066fb3278b6c34c0e813f6b49063196cb294544a3adaf45930295834786d41ebbe483b4704be45e90e3a1d53e5085529e78e0b07fad0d SHA512 778e405b7790906794506a2175279465c7d7efa905d0848807fcbddf5ff827e9556a3f2660ee0207a70195a8e9e652ba37ba4df2a038d8646339525cec0f1784
diff --git a/dev-cpp/argparse/argparse-2.1.ebuild b/dev-cpp/argparse/argparse-2.1-r1.ebuild
index e816482a83f..67e32ea4d3d 100644
--- a/dev-cpp/argparse/argparse-2.1.ebuild
+++ b/dev-cpp/argparse/argparse-2.1-r1.ebuild
@@ -1,11 +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
-CMAKE_ECLASS="cmake"
-
-inherit cmake-multilib
+inherit cmake
DESCRIPTION="Argument Parser for Modern C++"
HOMEPAGE="https://github.com/p-ranav/argparse"
diff --git a/dev-cpp/argparse/argparse-2.6.ebuild b/dev-cpp/argparse/argparse-2.6.ebuild
new file mode 100644
index 00000000000..e273fd49b50
--- /dev/null
+++ b/dev-cpp/argparse/argparse-2.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Argument Parser for Modern C++"
+HOMEPAGE="https://github.com/p-ranav/argparse"
+SRC_URI="https://github.com/p-ranav/argparse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DARGPARSE_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/test || die
+ ./tests || die
+}
diff --git a/dev-cpp/asio/asio-1.22.2.ebuild b/dev-cpp/asio/asio-1.22.2.ebuild
index 1447c0696d7..198901e907c 100644
--- a/dev-cpp/asio/asio-1.22.2.ebuild
+++ b/dev-cpp/asio/asio-1.22.2.ebuild
@@ -11,7 +11,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/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 15ed31d04a9..c47693c7c7f 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,2 +1,3 @@
DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
+DIST atkmm-2.28.3.tar.xz 691164 BLAKE2B 07468f4bdf2b790873517907c4564ccd513bb28500c14b1db50bcfed0c51ca8401a95989c0c61460c905125e6d0c71560f59190c5fa38abdc2d133991d519f45 SHA512 ebc25e9de4b9de6df7097ab485fb0675d8c83113d99a444eec91df0908073362bfdaa9b03fc4c3e91766109d9b94b88df041851176ecde578cf932b526ef678e
DIST atkmm-2.36.2.tar.xz 744596 BLAKE2B 2eee35605eee2e569eca1053f0c50449ce2a1cf44c5d29c17d00685da702f252e0eb9cd7d06ceceb0cb93dbe6848f4ea952aae621e5290aa69870a7ca2961766 SHA512 ad8ba4cb83a71c2998a600e015d1639d7d2ad39b450148ddb40ed750f3321e6932e81986cb1591ad3bcf914bcc50409c24300580b898f16408acc57a0ce2d914
diff --git a/dev-cpp/atkmm/atkmm-2.28.2.ebuild b/dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild
index 1554c916b9c..feac60ef15c 100644
--- a/dev-cpp/atkmm/atkmm-2.28.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild
@@ -12,17 +12,17 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
+IUSE="gtk-doc"
DEPEND="
- >=dev-cpp/glibmm-2.46.2:2[doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.46.2:2[gtk-doc?,${MULTILIB_USEDEP}]
>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
- >=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.3.2:2[gtk-doc?,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -32,7 +32,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
)
meson_src_configure
}
diff --git a/dev-cpp/atkmm/atkmm-2.28.3.ebuild b/dev-cpp/atkmm/atkmm-2.28.3.ebuild
new file mode 100644
index 00000000000..b55cabb5aff
--- /dev/null
+++ b/dev-cpp/atkmm/atkmm-2.28.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for the ATK library"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/atkmm"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="gtk-doc"
+
+DEPEND="
+ >=dev-cpp/glibmm-2.46.2:2[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.3.2:2[gtk-doc?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? (
+ >=dev-cpp/mm-common-1.0.4
+ app-doc/doxygen[dot]
+ dev-libs/libxslt
+ )
+ ${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_native_use_bool gtk-doc build-documentation)
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/atkmm/atkmm-2.36.2.ebuild b/dev-cpp/atkmm/atkmm-2.36.2-r1.ebuild
index b6f33641bd5..e366556c21a 100644
--- a/dev-cpp/atkmm/atkmm-2.36.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.2-r1.ebuild
@@ -11,18 +11,18 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="gtk-doc"
DEPEND="
- >=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?,${MULTILIB_USEDEP}]
>=dev-libs/atk-2.33.3[${MULTILIB_USEDEP}]
- dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -32,7 +32,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
)
meson_src_configure
}
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 494eb1fba57..238f776138d 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,2 +1 @@
-DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
DIST benchmark-1.7.0.tar.gz 194165 BLAKE2B 2a5ae10fb1fd1d05da60287591a5ba16d9bf8f7c77d1f332a6482cba32841a00b1350bf83238d52e051bcf2f628ed8ffc9e1899c75337b8cd12d9fb1800fd5b0 SHA512 25f81930ce210e298d9cc67c965cc8937f66c53427b18a672338b86424eef32df877ec6b7a7106417464b29c5048b014fcc82cfa773168ed701aa47d01f39f82
diff --git a/dev-cpp/benchmark/benchmark-1.6.1.ebuild b/dev-cpp/benchmark/benchmark-1.6.1.ebuild
deleted file mode 100644
index e80684fba3f..00000000000
--- a/dev-cpp/benchmark/benchmark-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-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 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="debug doc lto test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-doc/doxygen )
- test? ( >=dev-cpp/gtest-1.11.0 )"
-
-src_configure() {
- local mycmakeargs=(
- -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
-
- cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.7.0.ebuild b/dev-cpp/benchmark/benchmark-1.7.0.ebuild
index fdf73017860..e80684fba3f 100644
--- a/dev-cpp/benchmark/benchmark-1.7.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.7.0.ebuild
@@ -11,7 +11,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
IUSE="debug doc lto test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 6825b9f92f2..c97b9eca30f 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,2 +1,4 @@
DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
+DIST cairomm-1.14.4.tar.xz 618548 BLAKE2B 611e05b66e731d470c6d9a64c2eb4aee68aa73be5c05cb7e741e9a851ef15609cfc9fc27177531880b16517e62cf5c3f7669d4f7e7c5c78b9bc7d829e27f4d25 SHA512 9e2692837f55a2e66cd7e9d0a8033a35524df1c3186a53a9be75d71e899240dbc8959c914471e61e311812dabaf815e732142686b42fbdc75a71c05b41013d33
DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
+DIST cairomm-1.16.2.tar.xz 593504 BLAKE2B 6682604f5907f16e40dd497f07eaaca5a4dc8a0b90771a0631406817ec397c42eb1784a6cbf15094ea6d61591acf04818e1b4d64ede3383b6859668d3b445a76 SHA512 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62
diff --git a/dev-cpp/cairomm/cairomm-1.14.3.ebuild b/dev-cpp/cairomm/cairomm-1.14.3-r1.ebuild
index 48acef87e7a..a01304aa8cd 100644
--- a/dev-cpp/cairomm/cairomm-1.14.3.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.3-r1.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
+IUSE="gtk-doc test X"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-libs/libsigc++-2.6.0:2[doc?,${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.0[${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.6.0:2[gtk-doc?,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.0[X=,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
test? (
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -36,7 +36,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
-Dbuild-examples=false
$(meson_use test build-tests)
-Dboost-shared=true
diff --git a/dev-cpp/cairomm/cairomm-1.14.4.ebuild b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
new file mode 100644
index 00000000000..37aa33fc61f
--- /dev/null
+++ b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="C++ bindings for the Cairo vector graphics library"
+HOMEPAGE="https://cairographics.org/cairomm/ https://gitlab.freedesktop.org/cairo/cairomm"
+SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="gtk-doc test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libsigc++-2.6.0:2[gtk-doc?,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.0[X=,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/boost[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? (
+ ${PYTHON_DEPS}
+ >=dev-cpp/mm-common-1.0.4
+ app-doc/doxygen[dot]
+ dev-libs/libxslt
+ )
+"
+
+pkg_setup() {
+ use gtk-doc && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_native_use_bool gtk-doc build-documentation)
+ -Dbuild-examples=false
+ $(meson_use test build-tests)
+ -Dboost-shared=true
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/cairomm/cairomm-1.16.1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1-r1.ebuild
index 715ca5acea4..1bde629f1fe 100644
--- a/dev-cpp/cairomm/cairomm-1.16.1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.1-r1.ebuild
@@ -12,12 +12,12 @@ 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
+IUSE="gtk-doc test X"
RESTRICT="!test? ( test )"
RDEPEND="
- dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.10[${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.10[X=,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
test? (
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -36,7 +36,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
-Dbuild-examples=false
$(meson_use test build-tests)
-Dboost-shared=true
diff --git a/dev-cpp/cairomm/cairomm-1.16.2.ebuild b/dev-cpp/cairomm/cairomm-1.16.2.ebuild
new file mode 100644
index 00000000000..c6c78fb95d9
--- /dev/null
+++ b/dev-cpp/cairomm/cairomm-1.16.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="C++ bindings for the Cairo vector graphics library"
+HOMEPAGE="https://cairographics.org/cairomm/ https://gitlab.freedesktop.org/cairo/cairomm"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="gtk-doc test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.10[X=,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/boost[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? (
+ ${PYTHON_DEPS}
+ >=dev-cpp/mm-common-1.0.4
+ app-doc/doxygen[dot]
+ dev-libs/libxslt
+ )
+"
+
+pkg_setup() {
+ use gtk-doc && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_native_use_bool gtk-doc build-documentation)
+ -Dbuild-examples=false
+ $(meson_use test build-tests)
+ -Dboost-shared=true
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
index 6c22b70622b..a76cc351402 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug doc static-libs"
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
index f8f3b60de63..2596fe23d19 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="debug test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-libs/boost-1.54:=[nls]
+ dev-libs/boost:=[nls]
>=dev-libs/leatherman-0.9.3:=
"
DEPEND="${DEPEND}
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
index 015fa6c96c7..21e8c7108ca 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.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
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="debug"
DEPEND="
- >=dev-libs/boost-1.54:=[nls]
+ dev-libs/boost:=[nls]
>=dev-libs/leatherman-0.9.3:=
"
RDEPEND="${DEPEND}"
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index b71ab3292ac..cd05ef97c45 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,3 +1 @@
-DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
-DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c
DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild
deleted file mode 100644
index c8d01f2279f..00000000000
--- a/dev-cpp/doctest/doctest-2.4.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-PATCHES=( "${FILESDIR}/${P}-remove-unused-bla2.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DDOCTEST_WITH_TESTS=$(usex test)
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/doctest/doctest-2.4.8-r1.ebuild b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
deleted file mode 100644
index e611f524f5f..00000000000
--- a/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-move-only-types-fix.patch" # bug 830624
-)
-
-src_configure() {
- local mycmakeargs=(
- -DDOCTEST_WITH_TESTS=$(usex test)
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/doctest/doctest-2.4.9.ebuild b/dev-cpp/doctest/doctest-2.4.9.ebuild
index 6fc8f620eee..58f7f99e07b 100644
--- a/dev-cpp/doctest/doctest-2.4.9.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.9.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch b/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch
deleted file mode 100644
index 69efd40e6a4..00000000000
--- a/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This patch follows proposed fixes to upstream.
-
-PR-1: https://github.com/onqtam/doctest/pull/505
-PR-2: https://github.com/onqtam/doctest/pull/520
-
-
-diff --git a/examples/all_features/stringification.cpp b/examples/all_features/stringification.cpp
-index a8b5d5b..492e1ec 100644
---- a/examples/all_features/stringification.cpp
-+++ b/examples/all_features/stringification.cpp
-@@ -103,9 +103,6 @@ TEST_CASE("all asserts should fail and show how the objects get stringified") {
- MyTypeInherited<int> bla1;
- bla1.one = 5;
- bla1.two = 4u;
-- MyTypeInherited<int> bla2;
-- bla2.one = 5;
-- bla2.two = 6u;
-
- Bar::Foo f1;
- Bar::Foo f2;
---
-2.32.0
-
diff --git a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch
deleted file mode 100644
index 1a034328268..00000000000
--- a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-This patch is derived from upstream commit ce13bc44b99c ("Fix move-only
-types failing to decompose correctly (#634)").
-
-Upstream-PR: https://github.com/doctest/doctest/pull/634
-
-diff --git a/doctest/doctest.h b/doctest/doctest.h
-index d25f526..31096ff 100644
---- a/doctest/doctest.h
-+++ b/doctest/doctest.h
-@@ -1320,7 +1320,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
- assertType::Enum m_at;
-
- explicit Expression_lhs(L&& in, assertType::Enum at)
-- : lhs(doctest::detail::forward<L>(in))
-+ : lhs(static_cast<L&&>(in))
- , m_at(at) {}
-
- DOCTEST_NOINLINE operator Result() {
-@@ -1394,8 +1394,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
- // https://github.com/catchorg/Catch2/issues/870
- // https://github.com/catchorg/Catch2/issues/565
- template <typename L>
-- Expression_lhs<const L> operator<<(const L &&operand) {
-- return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at);
-+ Expression_lhs<L> operator<<(L&& operand) {
-+ return Expression_lhs<L>(static_cast<L&&>(operand), m_at);
- }
-
- template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr>
-diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h
-index b0d786f..ff9fed0 100644
---- a/doctest/parts/doctest_fwd.h
-+++ b/doctest/parts/doctest_fwd.h
-@@ -1317,7 +1317,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
- assertType::Enum m_at;
-
- explicit Expression_lhs(L&& in, assertType::Enum at)
-- : lhs(doctest::detail::forward<L>(in))
-+ : lhs(static_cast<L&&>(in))
- , m_at(at) {}
-
- DOCTEST_NOINLINE operator Result() {
-@@ -1391,8 +1391,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
- // https://github.com/catchorg/Catch2/issues/870
- // https://github.com/catchorg/Catch2/issues/565
- template <typename L>
-- Expression_lhs<const L> operator<<(const L &&operand) {
-- return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at);
-+ Expression_lhs<L> operator<<(L&& operand) {
-+ return Expression_lhs<L>(static_cast<L&&>(operand), m_at);
- }
-
- template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr>
---
-2.35.1
-
diff --git a/dev-cpp/edencommon/Manifest b/dev-cpp/edencommon/Manifest
new file mode 100644
index 00000000000..3ac044c5786
--- /dev/null
+++ b/dev-cpp/edencommon/Manifest
@@ -0,0 +1,2 @@
+DIST edencommon-2022.08.29.00.gh.tar.gz 143430 BLAKE2B a66bae35413097140b24c9313b12d55d52cbd98396ff1afacc751eb9752d4116ab19aeb9320dead5500189d74b4d91fdc09d9648fc6b5fbb55a706328488e7ef SHA512 6622c5de2dbff96717a345c82aaf9335745ed57262bb55c7a6704a68259ce81376ff0a2e9f3818ed1c1f08434da704f31fd4e3d8c48dd13646f0202e7564b2c7
+DIST edencommon-2022.09.12.00.gh.tar.gz 143483 BLAKE2B 414060f4d43e16e92f654a0d5d74fede2621bf7f39b880588e3c172dca6cffc59c88de15ece3ce42e1860c351bdef16b1f4daa6ba4fa203aef91d714e43b63ea SHA512 3c6da5425228ada48510208978facfd9fd233e607be076f05c3f431a473098329b23a81609ac8c4766ecf16d8e887aa8667d76c4e48219f0ab61074dbe207333
diff --git a/dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild b/dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild
new file mode 100644
index 00000000000..5c158b46823
--- /dev/null
+++ b/dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+inherit cmake
+
+DESCRIPTION="Shared library for Watchman and Eden projects"
+HOMEPAGE="https://github.com/facebookexperimental/edencommon"
+SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind"
+
+RDEPEND="
+ dev-cpp/gflags:=
+ dev-cpp/glog:=[gflags]
+ dev-cpp/folly:=
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/gtest
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/edencommon/edencommon-2022.09.12.00.ebuild b/dev-cpp/edencommon/edencommon-2022.09.12.00.ebuild
new file mode 100644
index 00000000000..5c158b46823
--- /dev/null
+++ b/dev-cpp/edencommon/edencommon-2022.09.12.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+inherit cmake
+
+DESCRIPTION="Shared library for Watchman and Eden projects"
+HOMEPAGE="https://github.com/facebookexperimental/edencommon"
+SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind"
+
+RDEPEND="
+ dev-cpp/gflags:=
+ dev-cpp/glog:=[gflags]
+ dev-cpp/folly:=
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/gtest
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/edencommon/metadata.xml b/dev-cpp/edencommon/metadata.xml
new file mode 100644
index 00000000000..ee7565d560c
--- /dev/null
+++ b/dev-cpp/edencommon/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">facebookexperimental/edencommon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 672efed2879..22a3f7d9762 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,3 +1,3 @@
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
-DIST folly-v2022.07.04.00.tar.gz 3647988 BLAKE2B ab8916ff4be1468d44dc0892126448682554ea95ce879166f457b621c3157cb22d0292fe2c58744494efe0fbabbf77732184335cd22244724c740910cf3a8303 SHA512 11fc32768539d8d42c7396eeac522238450617c8dde302b45c64bb93fd6ceaef7bb193b897802962782e8211c3931d31bf8df68e06741ce855d9725510677d7a
+DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790
+DIST folly-v2022.09.12.00.tar.gz 3710760 BLAKE2B af59580ebee3229a6564c4b29e1d24bc405f4ae3b79751af315245c87472293f97c2d78348c92620d3196d1d41a7b55af9627cd42d23f74cbf6f00d129b3b77c SHA512 f9d0ca44f6f0c343d16e8ee5408808830b30155d42a257c48e627f9a82bb4a57568a7feeba01cf73704db68af1eee7424971540635d5dfe1728fc2ae73953940
diff --git a/dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch b/dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch
new file mode 100644
index 00000000000..001af39625c
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2022.07.04.00-musl-fix.patch
@@ -0,0 +1,36 @@
+# Elf.cpp expects __ELF_NATIVE_CLASS to be defined at least for platforms
+# besides FreeBSD-based ones, and so it defines FOLLY_ELF_NATIVE_CLASS with it.
+# Without __ELF_NATIVE_CLASS (and apparently musl does not define it),
+# FOLLY_ELF_NATIVE_CLASS is also not defined so what was supposed to be
+# expanded to ELFCLASS32 or ELFCLASS64 ends up being
+# ELFCLASSFOLLY_ELF_NATIVE_CLASS.
+#
+# Please refer: https://github.com/facebook/folly/issues/1478
+#
+# Closes: https://bugs.gentoo.org/835744
+--- a/folly/experimental/symbolizer/Elf.cpp
++++ b/folly/experimental/symbolizer/Elf.cpp
+@@ -39,12 +39,10 @@
+
+ #if defined(__ELF_NATIVE_CLASS)
+ #define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS
+-#elif defined(__FreeBSD__)
+-#if defined(__LP64__)
++#elif defined(__LP64__)
+ #define FOLLY_ELF_NATIVE_CLASS 64
+ #else
+ #define FOLLY_ELF_NATIVE_CLASS 32
+-#endif
+ #endif // __ELF_NATIVE_CLASS
+
+ namespace folly {
+--- a/folly/experimental/symbolizer/Elf.h
++++ b/folly/experimental/symbolizer/Elf.h
+@@ -24,6 +24,7 @@
+ #include <initializer_list>
+ #include <stdexcept>
+ #include <system_error>
++#include <sys/types.h>
+
+ #include <folly/Conv.h>
+ #include <folly/Likely.h>
diff --git a/dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch b/dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch
new file mode 100644
index 00000000000..1a21386b1e8
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2022.08.08.00-undefined-reference-fix.patch
@@ -0,0 +1,62 @@
+https://github.com/facebook/folly/commit/10fc2e449038d9ffda5cd53999edb9875c4cb151
+
+From 10fc2e449038d9ffda5cd53999edb9875c4cb151 Mon Sep 17 00:00:00 2001
+From: Simon Marlow <smarlow@fb.com>
+Date: Fri, 12 Aug 2022 08:26:40 -0700
+Subject: [PATCH] Fix bugs in Cmake setup
+
+Summary:
+Please see https://github.com/facebook/folly/issues/1823 and
+https://github.com/facebook/folly/issues/1478
+
+* CMAKE_LIBRARY_ARCHITECTURE is not always defined
+* This doesn't work: `set(IS_X86_64_ARCH NOT(IS_X86_64_ARCH STREQUAL "-1"))`
+* Two conditionals for `IS_X86_64_ARCH` were reversed
+
+Reviewed By: bochko
+
+Differential Revision: D38653631
+
+fbshipit-source-id: c4b6f2820a2280356a7eb69bf0e9253434b5e750
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,8 +27,19 @@ if(POLICY CMP0075)
+ cmake_policy(SET CMP0075 NEW)
+ endif()
+
+-string(FIND "${CMAKE_LIBRARY_ARCHITECTURE}" "x86_64" IS_X86_64_ARCH)
+-set(IS_X86_64_ARCH NOT(IS_X86_64_ARCH STREQUAL "-1"))
++if("${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "")
++ # CMAKE_LIBRARY_ARCHITECTURE is not always set, so we have to assume
++ # arch might be x86_64
++ message(WARNING "CMAKE_LIBRARY_ARCHITECTURE not set, assuming x86_64")
++ set(IS_X86_64_ARCH ON)
++else()
++ string(FIND "${CMAKE_LIBRARY_ARCHITECTURE}" "x86_64" IS_X86_64_ARCH)
++ if(IS_X86_64_ARCH STREQUAL "-1")
++ set(IS_X86_64_ARCH OFF)
++ else()
++ set(IS_X86_64_ARCH ON)
++ endif()
++endif()
+
+ # includes
+ set(CMAKE_MODULE_PATH
+@@ -230,7 +241,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ endif()
+
+ # base64 SIMD files compilation
+-if (${IS_X86_64_ARCH})
++if (NOT(${IS_X86_64_ARCH}))
+ message(
+ STATUS
+ "arch ${CMAKE_LIBRARY_ARCHITECTURE} does not match x86_64, "
+@@ -256,7 +267,7 @@ else()
+ endif()
+
+ if (${LIBSODIUM_FOUND})
+- if (${IS_X86_64_ARCH})
++ if (NOT(${IS_X86_64_ARCH}))
+ message(
+ STATUS
+ "arch ${CMAKE_LIBRARY_ARCHITECTURE} does not match x86_64, "
diff --git a/dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch b/dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch
new file mode 100644
index 00000000000..f485ee2175f
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2022.08.15.00-liburing-headers.patch
@@ -0,0 +1,102 @@
+Fix build w/ older kernel headers.
+
+https://github.com/facebook/folly/commit/ae20efa9fa8cea81079df519d93dcbd1523c8dc3
+
+From ae20efa9fa8cea81079df519d93dcbd1523c8dc3 Mon Sep 17 00:00:00 2001
+From: Dylan Yudaken <dylany@fb.com>
+Date: Mon, 15 Aug 2022 08:32:53 -0700
+Subject: [PATCH] io_uring: support older versions of liburing
+
+Summary: Some #if to support older versions of liburing as reported here; https://github.com/facebook/folly/issues/1832
+
+Reviewed By: Orvid
+
+Differential Revision: D38650359
+
+fbshipit-source-id: eb78a7607eaaf151dc394cef72df3826c83fdfbc
+--- a/folly/experimental/io/IoUringBackend.cpp
++++ b/folly/experimental/io/IoUringBackend.cpp
+@@ -40,6 +40,16 @@ extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_pre_hook(uint64_t* call_time);
+ extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_post_hook(
+ uint64_t call_time, int ret);
+
++// there is no builtin macro we can use in liburing to tell what version we are
++// on or if features are supported. We will try and get this into the next
++// release but for now in the latest release there was also added multishot
++// accept - and so we can use it's pressence to suggest that we can safely use
++// newer features
++#if defined(IORING_ACCEPT_MULTISHOT)
++#define FOLLY_IO_URING_UP_TO_DATE 1
++#else
++#define FOLLY_IO_URING_UP_TO_DATE 0
++#endif
+ namespace folly {
+
+ namespace {
+@@ -296,11 +306,7 @@ std::chrono::time_point<std::chrono::steady_clock> getTimerExpireTime(
+ return now + us;
+ }
+
+-// there is no builtin macro we can use in liburing to tell if buffer rings are
+-// supported. However in the release that added them, there was also added
+-// multishot accept - and so we can use it's pressence to suggest that we can
+-// safely use provided buffer rings
+-#if defined(IORING_ACCEPT_MULTISHOT)
++#if FOLLY_IO_URING_UP_TO_DATE
+
+ class ProvidedBuffersBuffer {
+ public:
+@@ -738,7 +744,11 @@ IoUringBackend::IoUringBackend(Options options)
+ params_.flags |= IORING_SETUP_CQSIZE;
+ params_.cq_entries = options.capacity;
+ if (options_.taskRunCoop) {
++#if FOLLY_IO_URING_UP_TO_DATE
+ params_.flags |= IORING_SETUP_COOP_TASKRUN;
++#else
++ // this has no functional change so just leave it
++#endif
+ }
+
+ // poll SQ options
+@@ -1237,9 +1247,12 @@ int IoUringBackend::eb_event_base_loop(int flags) {
+ }
+
+ if (options_.registerRingFd) {
++ // registering just has some perf impact, so no need to fall back
++#if FOLLY_IO_URING_UP_TO_DATE
+ if (io_uring_register_ring_fd(&ioRing_) < 0) {
+ LOG(ERROR) << "unable to register io_uring ring fd";
+ }
++#endif
+ }
+ }
+
+@@ -1496,9 +1509,11 @@ void IoUringBackend::cancel(IoSqeBase* ioSqe) {
+ auto* sqe = get_sqe();
+ io_uring_prep_cancel64(sqe, (uint64_t)ioSqe, 0);
+ io_uring_sqe_set_data(sqe, (void*)&ioSqeNop); // just need something unique
++#if FOLLY_IO_URING_UP_TO_DATE
+ if (params_.features & IORING_FEAT_CQE_SKIP) {
+ sqe->flags |= IOSQE_CQE_SKIP_SUCCESS;
+ }
++#endif
+ }
+
+ int IoUringBackend::cancelOne(IoSqe* ioSqe) {
+@@ -1848,9 +1863,15 @@ void IoUringBackend::processFileOp(IoSqe* sqe, int64_t res) noexcept {
+ }
+
+ bool IoUringBackend::kernelHasNonBlockWriteFixes() const {
++#if FOLLY_IO_URING_UP_TO_DATE
+ // this was fixed in 5.18, which introduced linked file
+ // fixed in "io_uring: only wake when the correct events are set"
+ return params_.features & IORING_FEAT_LINKED_FILE;
++#else
++ // this indicates that sockets have to manually remove O_NONBLOCK
++ // which is a bit slower but shouldnt cause any functional changes
++ return false;
++#endif
+ }
+
+ namespace {
+
diff --git a/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild b/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild
index 8bffe87201b..1798d1d2a05 100644
--- a/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild
+++ b/dev-cpp/folly/folly-2022.03.28.00-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2
app-arch/zstd:=
dev-cpp/gflags:=
dev-cpp/glog:=[gflags]
- dev-libs/boost:=[context,threads(+)]
+ dev-libs/boost:=[context]
dev-libs/double-conversion:=
dev-libs/libaio
dev-libs/libevent:=
diff --git a/dev-cpp/folly/folly-2022.07.04.00.ebuild b/dev-cpp/folly/folly-2022.08.29.00.ebuild
index e4b9470d848..fcc47d18f6a 100644
--- a/dev-cpp/folly/folly-2022.07.04.00.ebuild
+++ b/dev-cpp/folly/folly-2022.08.29.00.ebuild
@@ -3,6 +3,11 @@
EAPI=8
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
inherit cmake toolchain-funcs
DESCRIPTION="An open-source C++ library developed and used at Facebook"
@@ -23,24 +28,29 @@ RDEPEND="app-arch/bzip2
app-arch/zstd:=
dev-cpp/gflags:=
dev-cpp/glog:=[gflags]
- dev-libs/boost:=[context,threads(+)]
+ dev-libs/boost:=[context]
dev-libs/double-conversion:=
dev-libs/libaio
dev-libs/libevent:=
dev-libs/libfmt:=
dev-libs/libsodium:=
dev-libs/openssl:=
- sys-libs/liburing:=
+ >=sys-libs/liburing-2.2:=
sys-libs/zlib
llvm-libunwind? ( sys-libs/llvm-libunwind:= )
!llvm-libunwind? ( sys-libs/libunwind:= )"
# libiberty is linked statically
DEPEND="${RDEPEND}
- sys-libs/binutils-libs"
+ sys-libs/binutils-libs
+ test? ( dev-cpp/gtest )"
BDEPEND="test? ( sys-devel/clang )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
+)
+
pkg_setup() {
- [[ ${BUILD_TYPE} == "binary" ]] && return
+ [[ ${BUILD_TYPE} == binary ]] && return
if use test && ! tc-is-clang ; then
# Always build w/ Clang for now to avoid gcc ICE
@@ -63,8 +73,10 @@ pkg_setup() {
}
src_configure() {
- # TODO: liburing could in theory be optional but fails to link
+ # Fragile when changing compilers
+ export CCACHE_DISABLE=1
+ # TODO: liburing could in theory be optional but fails to link
local mycmakeargs=(
-DLIB_INSTALL_DIR="$(get_libdir)"
diff --git a/dev-cpp/folly/folly-2022.04.11.00-r1.ebuild b/dev-cpp/folly/folly-2022.09.12.00.ebuild
index 3984f479ebe..fcc47d18f6a 100644
--- a/dev-cpp/folly/folly-2022.04.11.00-r1.ebuild
+++ b/dev-cpp/folly/folly-2022.09.12.00.ebuild
@@ -3,11 +3,17 @@
EAPI=8
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
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"
+SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
@@ -22,26 +28,44 @@ RDEPEND="app-arch/bzip2
app-arch/zstd:=
dev-cpp/gflags:=
dev-cpp/glog:=[gflags]
- dev-libs/boost:=[context,threads(+)]
+ dev-libs/boost:=[context]
dev-libs/double-conversion:=
dev-libs/libaio
dev-libs/libevent:=
dev-libs/libfmt:=
dev-libs/libsodium:=
dev-libs/openssl:=
- sys-libs/liburing:=
+ >=sys-libs/liburing-2.2:=
sys-libs/zlib
llvm-libunwind? ( sys-libs/llvm-libunwind:= )
!llvm-libunwind? ( sys-libs/libunwind:= )"
# libiberty is linked statically
DEPEND="${RDEPEND}
- sys-libs/binutils-libs"
+ sys-libs/binutils-libs
+ test? ( dev-cpp/gtest )"
BDEPEND="test? ( sys-devel/clang )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
+)
+
pkg_setup() {
- if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+ [[ ${BUILD_TYPE} == binary ]] && return
+
+ if use test && ! tc-is-clang ; then
+ # Always build w/ Clang for now to avoid gcc ICE
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230
+ #if [[ $(gcc-major-version) -eq 12 ]] ; then
+ # return
+ #fi
+
+ ## Only older GCC 11 is broken
+ #if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then
+ # return
+ #fi
+
ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
- ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+ #ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
export CC=${CHOST}-clang
export CXX=${CHOST}-clang++
@@ -49,8 +73,10 @@ pkg_setup() {
}
src_configure() {
- # TODO: liburing could in theory be optional but fails to link
+ # Fragile when changing compilers
+ export CCACHE_DISABLE=1
+ # TODO: liburing could in theory be optional but fails to link
local mycmakeargs=(
-DLIB_INSTALL_DIR="$(get_libdir)"
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index bccf0d7e2b6..423e936e4bf 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]]; then
diff --git a/dev-cpp/gflags/gflags-2.2.2.ebuild b/dev-cpp/gflags/gflags-2.2.2.ebuild
index bccf0d7e2b6..423e936e4bf 100644
--- a/dev-cpp/gflags/gflags-2.2.2.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]]; then
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 6aa92ecf5e5..15ed6ab2c36 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,9 +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
-CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]]; then
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index c11867d0d51..97755e119f6 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,2 +1,4 @@
DIST glibmm-2.66.4.tar.xz 7606108 BLAKE2B 5ff069110701d315c5d639e5efd824eb136b73fa29dc6e3fe5aead675e87b335bb2cbbbad2d9187285ce7086014aa316c07b672d88c5ba5fdaa3b8888e13af0a SHA512 9b1e0c09a11182384313ea4a7ba484ebab894528e08169a610387f207b5a7f8db9338466cd3e9eb3fa55e1c12817351ea27c39d6503208af67ba619f9d249c75
+DIST glibmm-2.66.5.tar.xz 7610516 BLAKE2B 766939ad6a5cd94bc642da7e9801ccb4f693d652ad4afcfc15b6e12a646b0d5d9c203a04328d13727f4e6c35730e7e9cc431f448618c75df305874dacaf0d7aa SHA512 3c1f91a1d91c23c5975254f5bf499f6752b6e3f1b056511133722cdfc853ffd2a94c375c0441dbb3f0933e7a257449ca4e365355ed580bd72d88c08d99a76684
DIST glibmm-2.72.1.tar.xz 7921260 BLAKE2B 4078c2a6a12257a84844d3fa70c8b6a1a28b7c184f7bfbbf2adc882806099f7211378d6f7a23b1bbd18514ced9ada56642eb4ff877ee23cd70b4ee6b1a270510 SHA512 aa52c7b73e8f3437c2da9e8da74f84b9f07c7aa40a5fa232a7418b4af19575cbde01f6cbe9fb3fc3227bd9281a9439156a51d10a0c2c1a1beca226c7c93fe660
+DIST glibmm-2.74.0.tar.xz 7938292 BLAKE2B c089826f6a33c02d525d40bcb375249fd0aa1d238a2cce44b421389812345b57e41d93c8e6a5f37a8fa6f7800bdcc0d4da531ad0f3b3bf69b6f91ef7f9f496a8 SHA512 29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9
diff --git a/dev-cpp/glibmm/glibmm-2.66.4.ebuild b/dev-cpp/glibmm/glibmm-2.66.4-r1.ebuild
index a050135482f..499f1f67901 100644
--- a/dev-cpp/glibmm/glibmm-2.66.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.4-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
LICENSE="LGPL-2.1+"
SLOT="2"
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"
+IUSE="gtk-doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-perl/XML-Parser
@@ -46,7 +46,7 @@ multilib_src_configure() {
local emesonargs=(
-Dwarnings=min
-Dbuild-deprecated-api=true
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
$(meson_use debug debug-refcounting)
-Dbuild-examples=false
)
diff --git a/dev-cpp/glibmm/glibmm-2.66.5.ebuild b/dev-cpp/glibmm/glibmm-2.66.5.ebuild
new file mode 100644
index 00000000000..f730efed459
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.66.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+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="gtk-doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ gtk-doc? (
+ app-doc/doxygen[dot]
+ dev-lang/perl
+ dev-perl/XML-Parser
+ dev-libs/libxslt
+ media-gfx/graphviz
+ )
+"
+
+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 gtk-doc build-documentation)
+ $(meson_use debug debug-refcounting)
+ -Dbuild-examples=false
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/glibmm/glibmm-2.72.1.ebuild b/dev-cpp/glibmm/glibmm-2.72.1-r1.ebuild
index 48fcc427c23..69e4f1c99dc 100644
--- a/dev-cpp/glibmm/glibmm-2.72.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.72.1-r1.ebuild
@@ -11,18 +11,18 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.68"
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"
+IUSE="gtk-doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.71.2:2[${MULTILIB_USEDEP}]
- dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -44,7 +44,7 @@ multilib_src_configure() {
local emesonargs=(
-Dwarnings=min
-Dbuild-deprecated-api=true
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
$(meson_use debug debug-refcounting)
-Dbuild-examples=false
)
diff --git a/dev-cpp/glibmm/glibmm-2.74.0.ebuild b/dev-cpp/glibmm/glibmm-2.74.0.ebuild
new file mode 100644
index 00000000000..19289ca156f
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.74.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..11} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.68"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="gtk-doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.73.2:2[${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ gtk-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 gtk-doc build-documentation)
+ $(meson_use debug debug-refcounting)
+ -Dbuild-examples=false
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.11.0.ebuild
index b2c3ebbb46e..78623e8917a 100644
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.11.0.ebuild
@@ -6,7 +6,6 @@ EAPI=8
# Python is required for tests and some build tasks.
PYTHON_COMPAT=( python3_{8..10} )
-CMAKE_ECLASS=cmake
inherit cmake-multilib python-any-r1
if [[ ${PV} == "9999" ]]; then
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 89518bffd1d..06d6fbc8dd5 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-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,7 +6,6 @@ EAPI=8
# Python is required for tests and some build tasks.
PYTHON_COMPAT=( python3_{8..10} )
-CMAKE_ECLASS=cmake
inherit cmake-multilib python-any-r1
if [[ ${PV} == "9999" ]]; then
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 4d617000f6e..1f02cad0b5c 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.6.tar.xz 13530384 BLAKE2B 74fdf054a69a483a25234d30cc8cb920a3c1c8609601802d92bf7c57fcdc468d29bedf32b34997fbcaa5f72a07e467bc68a0c87a481b071d95a3a068e9fcaac7 SHA512 d6fc2d0689baca2b968820d1af86cc0b175b6f38f720d315bc50663d30bd0a841da57ac4336abec236542fb2893b28b2de84087419b73aba58b41f07568d4d93
+DIST gtkmm-3.24.7.tar.xz 14813100 BLAKE2B a02d54fd8a9ace49acc503538f4d0df8cc12e57753c1463dfd9fb470b24c0db49733239fe4a51c3362953ceb98c546c29a302ba411cbaf060b3561a262faa081 SHA512 2ede6d77df5cbaa6ea3ee347d8b949e38512db7f5e9b36cb6f531eb259d5986f84ebfc6bb0cdaac1be4dc97e9d611515995184d245e2c0fab2cd8ebcae933a98
DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f14152488703c77c5a5d8532b1caa074954af875559bea8739022e4ca2cda49ed6a424946362bf39c0acd94a3a69c SHA512 87867deb2b4b0e50841e42d5957f9030c31c4ec1178b71a884a84c3c3aca178100ceb011729559f8f8f761dbe241c3cf4d420cc16c5b5aedcdd1d78f582d006d
+DIST gtkmm-4.8.0.tar.xz 15898612 BLAKE2B 8263eca4df519cbf2de2da2505872b6ceec24b05b2f0d145e3980afa2a9e45fe864e7445a646d7027a6362c11355a817de0f783f5539c68ec07afd03981dc942 SHA512 9cc769ad7d0fdfd675306a441697c63164d4b5221ab895bf06800a7e47b48d2e28b09cce057bcca8e95d1b20112a809d313ae485d349f5450cf11bb4eab361a6
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.6-r1.ebuild
index 2f956a85337..78ea992f159 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.6-r1.ebuild
@@ -12,24 +12,24 @@ LICENSE="LGPL-2.1+"
SLOT="3.0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aqua doc test wayland X"
+IUSE="aqua gtk-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}]
+ >=dev-cpp/atkmm-2.24.2:0[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/cairomm-1.12.0:0[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.54.0:2[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/pangomm-2.38.2:1.4[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.3.2:2[gtk-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}]
+ >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X=,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -41,7 +41,7 @@ multilib_src_configure() {
local emesonargs=(
-Dbuild-atkmm-api=true
-Dbuild-demos=false
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
$(meson_use test build-tests)
$(meson_use X build-x11-api)
)
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.7.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.7.ebuild
new file mode 100644
index 00000000000..436404bdc16
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.24.7.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..11} )
+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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE="aqua gtk-doc test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-cpp/atkmm-2.24.2:0[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/cairomm-1.12.0:0[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.54.0:2[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/pangomm-2.38.2:1.4[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.3.2:2[gtk-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
+ gtk-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 gtk-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.6.1.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.1-r1.ebuild
index e4887e7be83..020dcf1b410 100644
--- a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.6.1-r1.ebuild
@@ -12,25 +12,25 @@ 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"
+IUSE="gtk-doc test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-cpp/glibmm-2.68.0:2.68[doc?]
+ >=dev-cpp/glibmm-2.68.0:2.68[gtk-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?]
+ >=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
+ >=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
>=x11-libs/gdk-pixbuf-2.35.5:2
>=media-libs/libepoxy-1.2
"
DEPEND="
${RDEPEND}
- doc? ( dev-libs/libsigc++:3 )
+ gtk-doc? ( dev-libs/libsigc++:3 )
"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -41,7 +41,7 @@ BDEPEND="
src_configure() {
local emesonargs=(
-Dbuild-demos=false
- $(meson_use doc build-documentation)
+ $(meson_use gtk-doc build-documentation)
$(meson_use test build-tests)
)
meson_src_configure
diff --git a/dev-cpp/gtkmm/gtkmm-4.8.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.8.0-r1.ebuild
new file mode 100644
index 00000000000..2e6b691a22a
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-4.8.0-r1.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..11} )
+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="gtk-doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?]
+ >=gui-libs/gtk-4.7.2:4
+ >=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
+ >=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
+ >=x11-libs/gdk-pixbuf-2.35.5:2
+ >=media-libs/libepoxy-1.2
+"
+DEPEND="
+ ${RDEPEND}
+ gtk-doc? ( dev-libs/libsigc++:3 )
+"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? (
+ app-doc/doxygen[dot]
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+ ${PYTHON_DEPS}
+"
+
+src_configure() {
+ local emesonargs=(
+ -Dbuild-demos=false
+ $(meson_use gtk-doc build-documentation)
+ $(meson_use test build-tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 8bfc6efcdbd..6fe0975460e 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,3 +1,3 @@
DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
DIST highway-0.17.0.tar.gz 1694290 BLAKE2B 23ab48e11e8a79eb0469bb4fef7f32148ef6d2a266779a151345fc072213521f46828c2efcb4ab75823f977c619c7727fb064f05d6b3e0aa341698074e6b0e6a SHA512 7e55724c844a09a07cb981a7d8e913dcc5491e07d14ff3e7783a69060b0c470e7d5adc4f5dbeea526b3e109eea8cc9e80605d6b8d2da1b794382e56fd534ba06
-DIST highway-1.0.0.tar.gz 1723558 BLAKE2B f6580ca846aa659c80548e61daec0560dce335cd9c6c449df148398c97c0bafdf86e656a592903494d30de5ced8dcdf4be570b6009a2a5a5457b07f62e770e75 SHA512 19371a4771f4fcba82a125ed09544e2bbbd0d32af103881c8cfa41908a4fb4d6d5c536e1dcfb82628434622f31113a650259582c543275b704b45703805dc101
+DIST highway-1.0.1.tar.gz 1730746 BLAKE2B 1c6185af91afe32fbb35285d49101d381ade7ded262cbcd3b0a8bf28b1924a76ac5a11423a1613068f3435fbbdd2ab0119aa8a1aafe2c3467e0aff1987f40aad SHA512 35b6287579b6248966b0d36fda1522fd6338523934b079e94e857f9de08354f20b99739c99d53249a3a6c583519da0e0ac5e06dfbe6e3a89262f627c75b59dd8
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
index 7d9849c329d..12542df4d1c 100644
--- a/dev-cpp/highway/highway-0.16.0-r1.ebuild
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
diff --git a/dev-cpp/highway/highway-0.17.0.ebuild b/dev-cpp/highway/highway-0.17.0.ebuild
index 0eaed47ff32..f3a07ff5166 100644
--- a/dev-cpp/highway/highway-0.17.0.ebuild
+++ b/dev-cpp/highway/highway-0.17.0.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
diff --git a/dev-cpp/highway/highway-1.0.0.ebuild b/dev-cpp/highway/highway-1.0.1.ebuild
index 89b07a85a58..b9e18db6095 100644
--- a/dev-cpp/highway/highway-1.0.0.ebuild
+++ b/dev-cpp/highway/highway-1.0.1.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
index 89b07a85a58..b9e18db6095 100644
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
diff --git a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
index 3ac9069308c..2fabe282f52 100644
--- a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
+++ b/dev-cpp/htmlcxx/htmlcxx-0.87.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://htmlcxx.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~loong ~x86"
IUSE="static-libs"
PATCHES=(
diff --git a/dev-cpp/jarowinkler-cpp/Manifest b/dev-cpp/jarowinkler-cpp/Manifest
new file mode 100644
index 00000000000..fa8637d3954
--- /dev/null
+++ b/dev-cpp/jarowinkler-cpp/Manifest
@@ -0,0 +1 @@
+DIST jarowinkler-cpp-1.0.2.gh.tar.gz 10375 BLAKE2B e55f6e72ea66e553c047bfd2df8d4337430292391138595cd148686bc79a326e195cd55d81fe3b46aa41e7a852c0ea8bfb5891e6207ed3af538eea7597accd5a SHA512 8eeae55ff64dcc434dd8f8d33c03c9b9c828f54cd6a6a028e376763036e445fa6db81b5a9a19d84d023c6bf3968223c3f9a9e4220feb6f537e9c1b2c4f21cb11
diff --git a/dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild b/dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild
new file mode 100644
index 00000000000..43f5ed39f11
--- /dev/null
+++ b/dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fast Jaro and Jaro Winkler distance"
+HOMEPAGE="https://github.com/maxbachmann/jarowinkler-cpp/"
+SRC_URI="
+ https://github.com/maxbachmann/jarowinkler-cpp/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ >=dev-cpp/catch-3
+ )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DJARO_WINKLER_BUILD_TESTING=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/jarowinkler-cpp/metadata.xml b/dev-cpp/jarowinkler-cpp/metadata.xml
new file mode 100644
index 00000000000..8006795ac5b
--- /dev/null
+++ b/dev-cpp/jarowinkler-cpp/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>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">maxbachmann/jarowinkler-cpp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
index 6fcf5cd2b07..7bb0d2a1f92 100644
--- a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86 ~amd64-linux ~x86-linux"
fi
inherit autotools flag-o-matic
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index a060dbb78ee..2cccc1fd0ee 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
fi
inherit autotools flag-o-matic
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch
new file mode 100644
index 00000000000..e7bb77d6cf4
--- /dev/null
+++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch
@@ -0,0 +1,34 @@
+https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch?id=6721430ca97aa98208cc1c450e4e8c4c274ca840
+
+From c1e9f2f3d086e0df3c10a2468fd7b37fd0c5038c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 7 Sep 2022 00:02:08 -0700
+Subject: [PATCH] configure: Fix checks for system headers
+
+Define _DEFAULT_SOURCE in system.c so unistd.h can expose readlink API
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,7 +152,7 @@ fi
+
+ dnl Checks for header files.
+
+-AC_CHECK_HEADERS( [unistd.h, stdint.h, inttypes.h])
++AC_CHECK_HEADERS( [unistd.h stdint.h inttypes.h])
+
+ dnl Checks for typedefs, and compiler characteristics.
+
+--- a/src/system.c
++++ b/src/system.c
+@@ -36,6 +36,8 @@
+ * 1. specify the constants in "configed.H" or "noconfig.H",
+ * 2. append the system-dependent routines in this file.
+ */
++
++#define _DEFAULT_SOURCE
+ #if PREPROCESSED
+ #include "mcpp.H"
+ #else
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
new file mode 100644
index 00000000000..beab5412fb9
--- /dev/null
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN/lib/}
+MY_P=$(ver_cut 1-4 ${MY_PN}-${PV})
+
+DESCRIPTION="A portable C++ preprocessor"
+HOMEPAGE="http://mcpp.sourceforge.net"
+SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
+SRC_URI+=" mirror://debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos"
+
+PATCHES=(
+ # bug #718808
+ "${WORKDIR}"/debian/patches/
+
+ "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
+ "${FILESDIR}"/${PN}-2.7.2-fix-configure-checks.patch
+)
+
+src_prepare() {
+ default
+
+ # bug #778461
+ sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --enable-mcpplib
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
index 787ddd47f5c..e8b4036ccf3 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1-r2.ebuild
@@ -28,7 +28,7 @@ multilib_src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable doc documentation)
+ $(multilib_native_use_enable doc documentation)
}
multilib_src_install() {
diff --git a/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild
index 2c3656a4295..9a5f860e89a 100644
--- a/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-3.0.1-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=6
@@ -28,7 +28,7 @@ multilib_src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable doc documentation)
+ $(multilib_native_use_enable doc documentation)
}
multilib_src_install() {
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
index 4084b877157..c6ee8f7aa87 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7-r3.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://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.
LICENSE="|| ( LGPL-3 Apache-2.0 )"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~loong ppc ppc64 sparc x86"
IUSE="debug"
DEPEND="dev-libs/boost:=[zlib]"
diff --git a/dev-cpp/mm-common/mm-common-1.0.4.ebuild b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
index 7eb43d535b2..8f3b8c291be 100644
--- a/dev-cpp/mm-common/mm-common-1.0.4.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
BDEPEND="${PYTHON_DEPS}"
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 35ece5669df..84ce2923e94 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,2 +1,4 @@
DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
+DIST nlohmann_json-3.11.2.tar.gz 8097673 BLAKE2B ebb67966739a330e0cfb8495a6eb58e87732655856a6d4e843072ed5e485cafbb8a75d8803859d0365b814deda7429448ecc473de414de4b23d3a3c455dc2511 SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0
DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
+DIST nlohmann_json-testdata-3.1.0.tar.gz 115036393 BLAKE2B 809be0728a0b9d007fcc752911bdf6f7e548d6e3ec59871ea2b16d87d8248ca4dd2f681a1d0f82c618463294188ad41d6d965b8bdc39c70fdcf4b939d4121e9c SHA512 db6c411b37f2154f5dd1ed90f4e8fa0907f4a736cd0ff79943bcacf9da422285ff142bb6a7dc6022b236090083166ac1ab197be3f480d8dc50b26a91a9477821
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
new file mode 100644
index 00000000000..3bac320e3a0
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+TEST_VERSION="3.1.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="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_prepare() {
+ if use test ; then
+ ln -s "${WORKDIR}"/json_test_data-${TEST_VERSION} "${S}"/json_test_data || die
+ fi
+
+ cmake_src_prepare
+}
+
+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_test() {
+ cd "${BUILD_DIR}"/tests || die
+
+ # git_required:
+ # Skip certain tests needing git per upstream
+ # https://github.com/nlohmann/json/issues/2189
+ #
+ # cmake_fetch_content_configure, cmake_fetch_content2_configure:
+ # Needs network (bug #865027, bug #865105)
+ local myctestargs=(
+ -E "(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure|cmake_fetch_content_build|cmake_fetch_content2_build)"
+ )
+
+ cmake_src_test
+}
diff --git a/dev-cpp/notcurses/notcurses-3.0.5.ebuild b/dev-cpp/notcurses/notcurses-3.0.5-r1.ebuild
index 5ec6a07f778..53d4a8c6d2f 100644
--- a/dev-cpp/notcurses/notcurses-3.0.5.ebuild
+++ b/dev-cpp/notcurses/notcurses-3.0.5-r1.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
+inherit cmake
DESCRIPTION="Blingful TUIs and character graphics"
HOMEPAGE="https://notcurses.com"
@@ -30,21 +29,18 @@ src_configure() {
-DUSE_QRCODEGEN=OFF
-DUSE_STATIC=OFF
)
- cmake-multilib_src_configure
+ cmake_src_configure
}
-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() {
- cmake-multilib_src_test
+ ewarn "Tests will fail if you don't have a UTF8 locale available,"
+ ewarn "or if you're missing the proper terminfo database for your TERM."
+
+ cmake_src_test
}
src_install() {
- cmake-multilib_src_install
+ cmake_src_install
# we use this tortured form lest we try, every time we release a
# x.y.1 or x.y.3, to install the source dir as a man page.
diff --git a/dev-cpp/opentelemetry-cpp/Manifest b/dev-cpp/opentelemetry-cpp/Manifest
index 6433b1022ab..766567b2ffa 100644
--- a/dev-cpp/opentelemetry-cpp/Manifest
+++ b/dev-cpp/opentelemetry-cpp/Manifest
@@ -1,2 +1,3 @@
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
+DIST opentelemetry-cpp-1.6.0.tar.gz 790774 BLAKE2B 9512c092bfe49c9da82eff3950204c1f2eb654df2ed428e58ceb8877d15d80d9978fa6da37f7780352538c74de04bac69660528b255dfbce743f89b9d4020dd2 SHA512 ae0777451a3d2d676afd9f3142ab78c7afb08474f6038bd810ff0ee30fee6695e10100c901e7ffadf3faf16c7d19622acdea414cd720be8572f7720f2d528628
diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.5.0-tests.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.5.0-tests.patch
new file mode 100644
index 00000000000..1ef8821f55d
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.5.0-tests.patch
@@ -0,0 +1,67 @@
+diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
+index 3059faaa..55657809 100644
+--- a/ext/test/http/curl_http_test.cc
++++ b/ext/test/http/curl_http_test.cc
+@@ -229,7 +229,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
+ ASSERT_EQ(count, 4);
+ }
+
+-TEST_F(BasicCurlHttpTests, SendGetRequest)
++TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequest)
+ {
+ received_requests_.clear();
+ auto session_manager = http_client::HttpClientFactory::Create();
+@@ -246,7 +246,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
+ ASSERT_TRUE(handler->got_response_);
+ }
+
+-TEST_F(BasicCurlHttpTests, SendPostRequest)
++TEST_F(BasicCurlHttpTests, DISABLED_SendPostRequest)
+ {
+ received_requests_.clear();
+ auto session_manager = http_client::HttpClientFactory::Create();
+@@ -312,7 +312,7 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations)
+ delete handler;
+ }
+
+-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
++TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestSync)
+ {
+ received_requests_.clear();
+ curl::HttpClientSync http_client;
+@@ -337,7 +337,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+ result.GetSessionState() == http_client::SessionState::SendFailed);
+ }
+
+-TEST_F(BasicCurlHttpTests, SendPostRequestSync)
++TEST_F(BasicCurlHttpTests, DISABLED_SendPostRequestSync)
+ {
+ received_requests_.clear();
+ curl::HttpClientSync http_client;
+@@ -365,7 +365,7 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)
+ "http://127.0.0.1:31339/");
+ }
+
+-TEST_F(BasicCurlHttpTests, SendGetRequestAsync)
++TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestAsync)
+ {
+ curl::HttpClient http_client;
+
+@@ -439,7 +439,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
+ }
+ }
+
+-TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
++TEST_F(BasicCurlHttpTests, DISABLED_SendPostRequestAsync)
+ {
+ curl::HttpClient http_client;
+
+@@ -478,7 +478,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
+ }
+ }
+
+-TEST_F(BasicCurlHttpTests, FinishInAsyncCallback)
++TEST_F(BasicCurlHttpTests, DISABLED_FinishInAsyncCallback)
+ {
+ curl::HttpClient http_client;
+
diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch
new file mode 100644
index 00000000000..f3d757f2c5f
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch
@@ -0,0 +1,15 @@
+diff --git a/ext/src/http/client/nosend/CMakeLists.txt b/ext/src/http/client/nosend/CMakeLists.txt
+index 497daeb3..949bfd36 100644
+--- a/ext/src/http/client/nosend/CMakeLists.txt
++++ b/ext/src/http/client/nosend/CMakeLists.txt
+@@ -27,10 +27,4 @@ if(${BUILD_TESTING})
+ target_link_libraries(http_client_nosend ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIB}
+ opentelemetry_ext)
+
+- install(
+- TARGETS http_client_nosend
+- EXPORT "${PROJECT_NAME}-target"
+- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
new file mode 100644
index 00000000000..d007ad4f641
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
@@ -0,0 +1,52 @@
+# 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.5.0-tests.patch"
+ # bug #865029
+ "${FILESDIR}/opentelemetry-cpp-1.6.0-dont-install-nosend.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 b62277b2d44..cf8ce199c6e 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,2 +1,4 @@
DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
+DIST pangomm-2.46.3.tar.xz 674428 BLAKE2B 241b902e65ebb2cc213f479832503f07daad736e168ad7e841f3a22e8640e0365167cb29122cd1bf7080bf7b283ddb92aa71aee9731ea878a1ef26f88c3796c6 SHA512 c0925f295b372bca7b5ede28476ed00e691911e041632969e5e4c30fcf338bac069ba031d4f48601877524b90af47f5238e444e2de7501f1ff25dcda9dd9a9c8
DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
+DIST pangomm-2.50.1.tar.xz 754608 BLAKE2B 3581db044e95fb78e2f8e67868735d6626d052099076c9b46668a255bb8df2cbc152dbaf730bfe2a3b47610a1a4e1903d83950d303d59913d9ff123a882db772 SHA512 bffc55eedc4f278480a74afcf119b79a295bf5775123f582746ba425e19e2690d627baa9a9813b70db9e063db7efe959f365567dd7bcbc1fc862212ba8225a98
diff --git a/dev-cpp/pangomm/pangomm-2.46.2.ebuild b/dev-cpp/pangomm/pangomm-2.46.2-r1.ebuild
index 8ca64e0c2bd..7c0fce12966 100644
--- a/dev-cpp/pangomm/pangomm-2.46.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.2-r1.ebuild
@@ -12,18 +12,18 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="1.4"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
+IUSE="gtk-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}]
+ >=dev-cpp/cairomm-1.2.2:0[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.48.0:2[gtk-doc?,${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:2[gtk-doc?,${MULTILIB_USEDEP}]
>=x11-libs/pango-1.45.1[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -34,7 +34,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
-Dmaintainer-mode=false
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
)
meson_src_configure
}
diff --git a/dev-cpp/pangomm/pangomm-2.46.3.ebuild b/dev-cpp/pangomm/pangomm-2.46.3.ebuild
new file mode 100644
index 00000000000..48219b3829a
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.46.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/pangomm"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="gtk-doc"
+
+RDEPEND="
+ >=dev-cpp/cairomm-1.2.2:0[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.48.0:2[gtk-doc?,${MULTILIB_USEDEP}]
+ dev-libs/libsigc++:2[gtk-doc?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.45.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? (
+ >=dev-cpp/mm-common-1.0.4
+ app-doc/doxygen[dot]
+ dev-libs/libxslt
+ )
+ ${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dmaintainer-mode=false
+ $(meson_native_use_bool gtk-doc build-documentation)
+ )
+ meson_src_configure
+}
diff --git a/dev-cpp/pangomm/pangomm-2.50.0.ebuild b/dev-cpp/pangomm/pangomm-2.50.0-r1.ebuild
index 759433faaf6..f2daed7fcb7 100644
--- a/dev-cpp/pangomm/pangomm-2.50.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.0-r1.ebuild
@@ -12,18 +12,18 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.48"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
+IUSE="gtk-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}]
+ >=dev-cpp/cairomm-1.16.0:1.16[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-3:3[gtk-doc?,${MULTILIB_USEDEP}]
>=x11-libs/pango-1.49.4[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -34,7 +34,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
-Dmaintainer-mode=false
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
)
meson_src_configure
}
diff --git a/dev-cpp/pangomm/pangomm-2.50.1.ebuild b/dev-cpp/pangomm/pangomm-2.50.1.ebuild
new file mode 100644
index 00000000000..b291b42d21d
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.50.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/pangomm"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="gtk-doc"
+
+RDEPEND="
+ >=dev-cpp/cairomm-1.16.0:1.16[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?,${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-3:3[gtk-doc?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.49.4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? (
+ >=dev-cpp/mm-common-1.0.4
+ app-doc/doxygen[dot]
+ dev-libs/libxslt
+ )
+ ${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dmaintainer-mode=false
+ $(meson_native_use_bool gtk-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 347449326a2..dd1abf126d2 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -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 ~arm ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
fi
LICENSE="MIT"
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index 699cad4a7e1..f91fbfd5bb6 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1,2 +1 @@
-DIST prometheus-cpp-1.0.0.tar.gz 56244 BLAKE2B 51ff199c0cd09367de873310a835b7a4a5893de11a6115b3de8ef142eb12b326ea7498a8adc155f3bbea6389da41eef91b5ef23cb0227ef1d1ceb64e4d7eac2e SHA512 baeb12725dd47b170e1ac94c23b2b18ba8aa11dedd95af7adee8fdf9ddebaddfca1ef75c30b1d65c94e1cfbcba2c41e0f4686f1a1de66beaba7dcd70ab190164
DIST prometheus-cpp-1.0.1.tar.gz 56673 BLAKE2B 2f2396de0c3c544e92ecdf9f973941f7b61784db690bf3811841a522d3c40cb885e273ce62e66721674f8911fea7b58dc6ae5f0dc10cfdca803054445ca18250 SHA512 eb81b92de986853401f8900d19dfc58d68227d49c74be294b408adc0374292fb462b1f7f7aee522fb03d6fc2ea56f3187fa6ec182aeea169b8bdce38054ee805
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild
deleted file mode 100644
index 07f8033472a..00000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Prometheus Client Library for Modern C++"
-HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
-SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test zlib"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-misc/curl
- sys-libs/zlib
- www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
- test? (
- dev-cpp/benchmark
- dev-cpp/gtest
- )"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_PULL=yes
- -DENABLE_PUSH=yes
- -DENABLE_COMPRESSION=$(usex zlib)
- -DENABLE_TESTING=$(usex test)
- -DUSE_THIRDPARTY_LIBRARIES=OFF
- -DGENERATE_PKGCONFIG=ON
- -DRUN_IWYU=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/range-v3/range-v3-0.12.0.ebuild b/dev-cpp/range-v3/range-v3-0.12.0.ebuild
index e3e0a4cc2ee..70c7b75d70a 100644
--- a/dev-cpp/range-v3/range-v3-0.12.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.12.0.ebuild
@@ -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 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
new file mode 100644
index 00000000000..598f34b8d8a
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -0,0 +1 @@
+DIST rapidfuzz-cpp-1.6.0.gh.tar.gz 250024 BLAKE2B 96d70680bb9b3c3e053b385845b543f69bb4215c6be92df6b7e61559cfa0f072833a13ceadf24f73531e848517864461cd696504584ea3a489d37e56c0a03c3b SHA512 ba319af67428a96df406b10b11eafa4c73762f0916d2ac4ac2860f1a25a97fc9e4e3a69c8633c8fed8ef76a0c4a8e073bc16048bde111782d0e8f00e396a4df9
diff --git a/dev-cpp/rapidfuzz-cpp/metadata.xml b/dev-cpp/rapidfuzz-cpp/metadata.xml
new file mode 100644
index 00000000000..b69c1750aa3
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/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>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">maxbachmann/rapidfuzz-cpp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild
new file mode 100644
index 00000000000..99e66055cc0
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
+SRC_URI="
+ https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ >=dev-cpp/catch-3
+ )
+"
+
+src_prepare() {
+ # apparently "C++ best practices" don't mind fetching random stuff
+ # at build time
+ sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
+ find -name 'CMakeLists.txt' -exec \
+ sed -i -e 's:project_warnings::' {} + || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
index 223e2c159ca..2ccb5362aec 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
@@ -60,6 +60,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DGIT=false # don't call git nor fail if missing, not a repo
-DRYML_BUILD_API=no # TODO if a python consumer needs it
-DRYML_BUILD_TESTS=$(usex test)
-DRYML_DBG=$(usex debug)
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 1a00744858e..4702d52ddcd 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,4 +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-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
-DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
+DIST sdbus-c++-1.2.0.tar.gz 205798 BLAKE2B da040acb49f5294665b09df97c171eac38f7c6ce5e86093b45b896c4b216afc9b45870395404ffb8e7c32ac8b98f6c795fb528691b344587545e5ae27d4423d6 SHA512 dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d
+DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
+DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
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
deleted file mode 100644
index e6d3622ee11..00000000000
--- a/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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++-pc-reqs.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch
new file mode 100644
index 00000000000..9730bda5bc6
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0733b41..fd613be 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,6 +210,11 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config.cmake
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
+ COMPONENT dev)
+
++if(BUILD_LIBSYSTEMD OR pkgcfg_lib_Systemd_systemd MATCHES "\.a$")
++ set(PKGCONFIG_REQS "")
++else()
++ set(PKGCONFIG_REQS "libsystemd")
++endif()
+ configure_file(pkgconfig/sdbus-c++.pc.in pkgconfig/sdbus-c++.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev)
+diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in
+index 21e0f0b..a6d6ec9 100644
+--- a/pkgconfig/sdbus-c++.pc.in
++++ b/pkgconfig/sdbus-c++.pc.in
+@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: @PROJECT_NAME@
+ Description: C++ library on top of sd-bus, a systemd D-Bus library
+-Requires: libsystemd
++Requires: @PKGCONFIG_REQS@
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild
index 29193a2602d..d65f5c3ead8 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild
@@ -6,8 +6,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-250.6"
-MUSL_PATCHSET="250.4"
+SDP="systemd-stable-251.4"
+MUSL_PATCHSET="251.2"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -58,6 +58,10 @@ S="${WORKDIR}/sdbus-cpp-${PV}"
SDS="${WORKDIR}/${SDP}"
SDB="${WORKDIR}/systemd-build"
+PATCHES=(
+ "${FILESDIR}"/${PN}-pc-reqs.patch
+)
+
pkg_setup() {
use systemd || python-any-r1_pkg_setup
}
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
index 29fe7c8f37f..e6de260d88b 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
@@ -6,8 +6,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-250.6"
-MUSL_PATCHSET="250.4"
+SDP="systemd-stable-251.4"
+MUSL_PATCHSET="251.2"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -59,7 +59,7 @@ SDS="${WORKDIR}/${SDP}"
SDB="${WORKDIR}/systemd-build"
PATCHES=(
- "${FILESDIR}"/${PN}-gtest-1.11.patch
+ "${FILESDIR}"/${PN}-pc-reqs.patch
)
pkg_setup() {
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index b048b94c211..544f110b44a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,3 +1,4 @@
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
+DIST tbb-2021.6.0.tar.gz 2566074 BLAKE2B ec5d98d2890828323cefabc75011658d508eab531c9b30030162f6ce367c54a8d70d6c6611c00d93ab3ef041ea1af35f8180768e114611847547447545f70c71 SHA512 c28bd4045e3269d0d9c24dbf360f849d26eaa15e34fa9dd3f5feae0f3440ff74ab1d05154b95549a135e7d9e97fd9a7ff4b4e468b13265e0477bb58f47e856b6
diff --git a/dev-cpp/tbb/tbb-2021.6.0.ebuild b/dev-cpp/tbb/tbb-2021.6.0.ebuild
new file mode 100644
index 00000000000..8314a6dcb3c
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+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 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ # 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
+ "${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
+)
+
+src_configure() {
+ # bug #872287
+ filter-flags -D_GLIBCXX_ASSERTIONS
+ append-cppflags -U_GLIBCXX_ASSERTIONS
+
+ local mycmakeargs=(
+ -DTBB_TEST=$(usex test)
+ -DTBB_ENABLE_IPO=OFF
+ -DTBB_STRICT=OFF
+ )
+
+ cmake-multilib_src_configure
+}
diff --git a/dev-cpp/valijson/Manifest b/dev-cpp/valijson/Manifest
new file mode 100644
index 00000000000..7c45f299853
--- /dev/null
+++ b/dev-cpp/valijson/Manifest
@@ -0,0 +1 @@
+DIST valijson-0.7.tar.gz 2060214 BLAKE2B d2e1c58e37213e44d7d6af173691cad3853e87648948c229ea683bfcba8b19256b0230852b0537c2dbdd7084fcf1ac068e320c5f59a69e446610390b82e76474 SHA512 662e53bf1cac4def19792392cda7cbfe2cbadf77b768eb69b2dec693b16f85f32fa2e9b97eae36569cfcc9ac45f1e6338967423cf415d6bcd90372bc49793a2d
diff --git a/dev-cpp/valijson/metadata.xml b/dev-cpp/valijson/metadata.xml
new file mode 100644
index 00000000000..fbe60ab1e51
--- /dev/null
+++ b/dev-cpp/valijson/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>holger@applied-asynchrony.com</email>
+ <name>Holger Hoffstätte</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tristanpenman/valijson</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/valijson/valijson-0.7.ebuild b/dev-cpp/valijson/valijson-0.7.ebuild
new file mode 100644
index 00000000000..52fc96a2bad
--- /dev/null
+++ b/dev-cpp/valijson/valijson-0.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only C++ library for JSON Schema validation"
+HOMEPAGE="https://github.com/tristanpenman/valijson"
+SRC_URI="https://github.com/tristanpenman/valijson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ local mycmakeargs=(
+ -Dvalijson_BUILD_TESTS=$(usex test)
+ )
+
+ if use test; then
+ # Fix relative paths to test data
+ sed -i -e "s:../tests/data/documents/:../${P}/tests/data/documents/:" tests/test_adapter_comparison.cpp || die
+ sed -i -e "s:../tests/data:../${P}/tests/data:" tests/test_validation_errors.cpp || die
+ sed -i -e "s:../thirdparty/:../${P}/thirdparty/:" -e "s:../doc/schema/:../${P}/doc/schema/:" tests/test_validator.cpp || die
+ fi
+
+ # -Werror is too aggressive due to false positives with gcc-12, see bug #866153
+ sed -i -e 's/-Werror//g' ../${P}/CMakeLists.txt || die
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./test_suite || die
+}
+
+src_install() {
+ # there is no target for installing headers, so do it manually
+ doheader -r include/*
+}
diff --git a/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
index ed2592fab36..b1107454dd2 100644
--- a/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
@@ -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 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
fi
RDEPEND="
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 88f602e7f4e..d18739367bd 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,2 +1 @@
-DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
deleted file mode 100644
index fd7a7198c1c..00000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c9460110e072df84b7dee3eb651f2ec5df75fb18 Mon Sep 17 00:00:00 2001
-From: Jesse Beder <jbeder@gmail.com>
-Date: Mon, 20 Jan 2020 18:05:15 -0600
-Subject: [PATCH] Fix reading empty token stack with a node with properties but
- no scalar.
-
-E.g. `!2`.
----
- src/singledocparser.cpp | 6 ++++++
- test/integration/load_node_test.cpp | 5 +++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
-index 52544dd6..47e9e047 100644
---- a/src/singledocparser.cpp
-+++ b/src/singledocparser.cpp
-@@ -79,6 +79,12 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
- if (!anchor_name.empty())
- eventHandler.OnAnchor(mark, anchor_name);
-
-+ // after parsing properties, an empty node is again a possibility
-+ if (m_scanner.empty()) {
-+ eventHandler.OnNull(mark, anchor);
-+ return;
-+ }
-+
- const Token& token = m_scanner.peek();
-
- if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) {
-diff --git a/test/integration/load_node_test.cpp b/test/integration/load_node_test.cpp
-index 4f4f28e8..0e0dd6bc 100644
---- a/test/integration/load_node_test.cpp
-+++ b/test/integration/load_node_test.cpp
-@@ -257,5 +257,10 @@ TEST(NodeTest, LoadTagWithParenthesis) {
- EXPECT_EQ(node.as<std::string>(), "foo");
- }
-
-+TEST(NodeTest, LoadTagWithNullScalar) {
-+ Node node = Load("!2");
-+ EXPECT_TRUE(node.IsNull());
-+}
-+
- } // namespace
- } // namespace YAML
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
deleted file mode 100644
index d9160856c47..00000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f5f288c7622d3547c29a8355b8ccda0155483b79
-Author: Till Hofmann <hofmann@kbsg.rwth-aachen.de>
-Date: Sun Nov 17 22:43:20 2019 +0100
-
- Revert "fix up static, so works as DLL (#559)"
-
- This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e.
-
-diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h
-index 82fb79a..50bcd74 100644
---- a/include/yaml-cpp/node/detail/node_data.h
-+++ b/include/yaml-cpp/node/detail/node_data.h
-@@ -81,7 +81,7 @@ class YAML_CPP_API node_data {
- shared_memory_holder pMemory);
-
- public:
-- static const std::string& empty_scalar();
-+ static std::string empty_scalar;
-
- private:
- void compute_seq_size() const;
-diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h
-index 7a3deac..b363f86 100644
---- a/include/yaml-cpp/node/impl.h
-+++ b/include/yaml-cpp/node/impl.h
-@@ -166,13 +166,13 @@ inline T Node::as(const S& fallback) const {
- inline const std::string& Node::Scalar() const {
- if (!m_isValid)
- throw InvalidNode(m_invalidKey);
-- return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
-+ return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
- }
-
- inline const std::string& Node::Tag() const {
- if (!m_isValid)
- throw InvalidNode(m_invalidKey);
-- return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar();
-+ return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar;
- }
-
- inline void Node::SetTag(const std::string& tag) {
-diff --git a/src/node_data.cpp b/src/node_data.cpp
-index 6cfedfc..eba1ae4 100644
---- a/src/node_data.cpp
-+++ b/src/node_data.cpp
-@@ -13,10 +13,7 @@
- namespace YAML {
- namespace detail {
-
--const std::string& node_data::empty_scalar() {
-- static const std::string svalue;
-- return svalue;
--}
-+std::string node_data::empty_scalar;
-
- node_data::node_data()
- : m_isDefined(false),
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch
deleted file mode 100644
index 4c5418db22d..00000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-fix-overflows.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-This patch comes from the upstream commit here[1], slightly modified to
-apply to 0.6.3. The pull request[2] mentions fixing CVE-2017-5950,
-CVE-2018-{20573,20574}, and CVE-2019-6285. Note that CVE-2019-6292 appears to
-be a duplicate of CVE-2019-6285 [3].
-
-[1] https://github.com/jbeder/yaml-cpp/commit/4edff1fa5dbfca16fc72d89870841bee89f8ef89
-[2] https://github.com/jbeder/yaml-cpp/pull/807
-[3] https://github.com/jbeder/yaml-cpp/issues/660
-
-diff --git a/include/yaml-cpp/depthguard.h b/include/yaml-cpp/depthguard.h
-new file mode 100644
-index 00000000..8ca61ac6
---- /dev/null
-+++ b/include/yaml-cpp/depthguard.h
-@@ -0,0 +1,77 @@
-+#ifndef DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-+#define DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-+
-+#if defined(_MSC_VER) || \
-+ (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
-+ (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-+#pragma once
-+#endif
-+
-+#include "exceptions.h"
-+
-+namespace YAML {
-+
-+/**
-+ * @brief The DeepRecursion class
-+ * An exception class which is thrown by DepthGuard. Ideally it should be
-+ * a member of DepthGuard. However, DepthGuard is a templated class which means
-+ * that any catch points would then need to know the template parameters. It is
-+ * simpler for clients to not have to know at the catch point what was the
-+ * maximum depth.
-+ */
-+class DeepRecursion : public ParserException {
-+public:
-+ virtual ~DeepRecursion() = default;
-+
-+ DeepRecursion(int depth, const Mark& mark_, const std::string& msg_);
-+
-+ // Returns the recursion depth when the exception was thrown
-+ int depth() const {
-+ return m_depth;
-+ }
-+
-+private:
-+ int m_depth = 0;
-+};
-+
-+/**
-+ * @brief The DepthGuard class
-+ * DepthGuard takes a reference to an integer. It increments the integer upon
-+ * construction of DepthGuard and decrements the integer upon destruction.
-+ *
-+ * If the integer would be incremented past max_depth, then an exception is
-+ * thrown. This is ideally geared toward guarding against deep recursion.
-+ *
-+ * @param max_depth
-+ * compile-time configurable maximum depth.
-+ */
-+template <int max_depth = 2000>
-+class DepthGuard final {
-+public:
-+ DepthGuard(int & depth_, const Mark& mark_, const std::string& msg_) : m_depth(depth_) {
-+ ++m_depth;
-+ if ( max_depth <= m_depth ) {
-+ throw DeepRecursion{m_depth, mark_, msg_};
-+ }
-+ }
-+
-+ DepthGuard(const DepthGuard & copy_ctor) = delete;
-+ DepthGuard(DepthGuard && move_ctor) = delete;
-+ DepthGuard & operator=(const DepthGuard & copy_assign) = delete;
-+ DepthGuard & operator=(DepthGuard && move_assign) = delete;
-+
-+ ~DepthGuard() {
-+ --m_depth;
-+ }
-+
-+ int current_depth() const {
-+ return m_depth;
-+ }
-+
-+private:
-+ int & m_depth;
-+};
-+
-+} // namespace YAML
-+
-+#endif // DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-diff --git a/src/depthguard.cpp b/src/depthguard.cpp
-new file mode 100644
-index 00000000..b88cd340
---- /dev/null
-+++ b/src/depthguard.cpp
-@@ -0,0 +1,10 @@
-+#include "yaml-cpp/depthguard.h"
-+
-+namespace YAML {
-+
-+DeepRecursion::DeepRecursion(int depth, const Mark& mark_, const std::string& msg_)
-+ : ParserException(mark_, msg_),
-+ m_depth(depth) {
-+}
-+
-+} // namespace YAML
-diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
-index 47e9e047..3e5638be 100644
---- a/src/singledocparser.cpp
-+++ b/src/singledocparser.cpp
-@@ -7,6 +7,7 @@
- #include "singledocparser.h"
- #include "tag.h"
- #include "token.h"
-+#include "yaml-cpp/depthguard.h"
- #include "yaml-cpp/emitterstyle.h"
- #include "yaml-cpp/eventhandler.h"
- #include "yaml-cpp/exceptions.h" // IWYU pragma: keep
-@@ -47,6 +48,8 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) {
- }
-
- void SingleDocParser::HandleNode(EventHandler& eventHandler) {
-+ DepthGuard<2000> depthguard(depth, m_scanner.mark(), ErrorMsg::BAD_FILE);
-+
- // an empty node *is* a possibility
- if (m_scanner.empty()) {
- eventHandler.OnNull(m_scanner.mark(), NullAnchor);
-diff --git a/src/singledocparser.h b/src/singledocparser.h
-index c8cfca9d..f484eb1f 100644
---- a/src/singledocparser.h
-+++ b/src/singledocparser.h
-@@ -15,6 +15,7 @@
-
- namespace YAML {
- class CollectionStack;
-+template <int> class DepthGuard; // depthguard.h
- class EventHandler;
- class Node;
- class Scanner;
-@@ -55,6 +56,7 @@ class SingleDocParser {
- anchor_t LookupAnchor(const Mark& mark, const std::string& name) const;
-
- private:
-+ int depth = 0;
- Scanner& m_scanner;
- const Directives& m_directives;
- std::unique_ptr<CollectionStack> m_pCollectionStack;
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch
deleted file mode 100644
index 51f2a7b563f..00000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 0a669d5..bc8bbdd 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -7,22 +7,7 @@ if(MSVC)
- set(CMAKE_STATIC_LIBRARY_PREFIX "")
- endif()
-
--ExternalProject_Add(
-- googletest_project
-- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0"
-- INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/prefix"
-- CMAKE_ARGS
-- -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-- -DBUILD_GMOCK=ON
-- -Dgtest_force_shared_crt=ON
--)
--
--add_library(gmock UNKNOWN IMPORTED)
--set_target_properties(gmock PROPERTIES
-- IMPORTED_LOCATION
-- ${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
--)
--
-+find_package(GTest REQUIRED CONFIG)
- find_package(Threads)
-
- include_directories(SYSTEM "${PROJECT_BINARY_DIR}/test/prefix/include")
-@@ -56,14 +41,12 @@ set_target_properties(run-tests PROPERTIES
- CXX_STANDARD_REQUIRED ON
- )
-
--add_dependencies(run-tests googletest_project)
--
- set_target_properties(run-tests PROPERTIES
- COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags} ${yaml_test_flags}"
- )
- target_link_libraries(run-tests
- yaml-cpp
-- gmock
-+ GTest::gmock
- ${CMAKE_THREAD_LIBS_INIT})
-
- add_test(yaml-test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/run-tests)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
new file mode 100644
index 00000000000..5ad9e46dbcb
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
@@ -0,0 +1,101 @@
+From d5d68286cdd983f99f88b6141a3c34d3bf633d98 Mon Sep 17 00:00:00 2001
+From: Felix Schwitzer <flx107809@gmail.com>
+Date: Fri, 1 Apr 2022 05:26:47 +0200
+Subject: [PATCH] Fix CMake export files (#1077)
+
+After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with
+empty variables. (see also the discussion in #774).
+
+Rework this file and the call to `configure_package_config_file` according the
+cmake documentation
+(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file)
+to overcome this issue and allow a simple `find_package` after install.
+
+As there was some discussion about the place where to install the
+`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into
+an extra variable to make it easier changing this location in the future.
+
+Also untabify CMakeLists.txt in some places to align with the other code parts in this file.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,10 +127,16 @@ set_target_properties(yaml-cpp PROPERTIES
+ PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
+ DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+
++# FIXME(felix2012): A more common place for the cmake export would be
++# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
++set(EXPORT_TARGETS yaml-cpp)
+ configure_package_config_file(
+ "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
+ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
++ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR)
++unset(EXPORT_TARGETS)
+
+ write_basic_package_version_file(
+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+@@ -139,30 +145,31 @@ write_basic_package_version_file(
+ configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
+
+ if (YAML_CPP_INSTALL)
+- install(TARGETS yaml-cpp
++ install(TARGETS yaml-cpp
+ EXPORT yaml-cpp-targets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+- FILES_MATCHING PATTERN "*.h")
++ FILES_MATCHING PATTERN "*.h")
+ install(EXPORT yaml-cpp-targets
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
+- install(FILES
+- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
++ DESTINATION "${CONFIG_EXPORT_DIR}")
++ install(FILES
++ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
++ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
++ DESTINATION "${CONFIG_EXPORT_DIR}")
+ install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
+ endif()
++unset(CONFIG_EXPORT_DIR)
+
+ if(YAML_CPP_BUILD_TESTS)
+- add_subdirectory(test)
++ add_subdirectory(test)
+ endif()
+
+ if(YAML_CPP_BUILD_TOOLS)
+- add_subdirectory(util)
++ add_subdirectory(util)
+ endif()
+
+ if (YAML_CPP_CLANG_FORMAT_EXE)
+--- a/yaml-cpp-config.cmake.in
++++ b/yaml-cpp-config.cmake.in
+@@ -3,12 +3,14 @@
+ # YAML_CPP_INCLUDE_DIR - include directory
+ # YAML_CPP_LIBRARIES - libraries to link against
+
+-# Compute paths
+-get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
++@PACKAGE_INIT@
++
++set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+
+ # Our library dependencies (contains definitions for IMPORTED targets)
+-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
++include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake)
+
+ # These are IMPORTED targets created by yaml-cpp-targets.cmake
+ set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")
++
++check_required_components(@EXPORT_TARGETS@)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
index 45eebb43ffe..bd05fccca37 100644
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
@@ -1,8 +1,11 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 5ebc1a6..f02c2bb 100644
+From 30fbefe6102da12e8d4d132aa4af2e24bfda9bfb Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sat, 17 Sep 2022 12:25:24 +0300
+Subject: [PATCH] Use external gtest dependency
+
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
-@@ -1,13 +1,10 @@
+@@ -1,15 +1,10 @@
find_package(Threads REQUIRED)
+find_package(GTest REQUIRED CONFIG)
@@ -14,10 +17,12 @@ index 5ebc1a6..f02c2bb 100644
- "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0"
- "${CMAKE_CURRENT_BINARY_DIR}/prefix")
-
- include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
-
+-include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
+-
set(test-new-api-pattern "new-api/*.cpp")
-@@ -38,7 +35,7 @@ target_link_libraries(yaml-cpp-tests
+ set(test-source-pattern "*.cpp" "integration/*.cpp" "node/*.cpp")
+ if (CMAKE_VERSION VERSION_GREATER 3.11)
+@@ -38,7 +33,7 @@ target_link_libraries(yaml-cpp-tests
PRIVATE
Threads::Threads
yaml-cpp
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch
new file mode 100644
index 00000000000..622c0d7f148
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-install-paths.patch
@@ -0,0 +1,25 @@
+From 4f5b5ba19ece906252cfc90b7cd51035e21c7118 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sat, 17 Sep 2022 12:07:46 +0300
+Subject: [PATCH] Fix pkg-config file install destination
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,7 +129,7 @@ set_target_properties(yaml-cpp PROPERTIES
+
+ # FIXME(felix2012): A more common place for the cmake export would be
+ # `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
+-set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
+ set(EXPORT_TARGETS yaml-cpp)
+ configure_package_config_file(
+ "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
+@@ -160,7 +160,7 @@ if (YAML_CPP_INSTALL)
+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+ DESTINATION "${CONFIG_EXPORT_DIR}")
+ install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+ unset(CONFIG_EXPORT_DIR)
+
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild
deleted file mode 100644
index 60efcffd321..00000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.6"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# test breaks build
-#RESTRICT="!test? ( test )"
-RESTRICT+="test"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-abi-breakage.patch"
- "${FILESDIR}/${P}-CVE-2017-11692.patch"
- "${FILESDIR}/${P}-fix-overflows.patch"
-)
-
-src_prepare() {
- sed -i \
- -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
- yaml-cpp.pc.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DYAML_BUILD_SHARED_LIBS=ON
- -DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
- -DYAML_CPP_BUILD_TESTS=$(usex test)
- )
-
- cmake-multilib_src_configure
-}
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
index 77f6bb3f5c1..1f26291823b 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
@@ -1,9 +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
-CMAKE_ECLASS="cmake"
inherit cmake-multilib
DESCRIPTION="YAML parser and emitter in C++"
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild
index 4992372c536..1ad533f2dae 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild
@@ -1,9 +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
+EAPI=8
-CMAKE_ECLASS="cmake"
inherit cmake-multilib
DESCRIPTION="YAML parser and emitter in C++"
@@ -12,29 +11,19 @@ SRC_URI="https://github.com/jbeder/yaml-cpp/archive/${P}.tar.gz"
S="${WORKDIR}/yaml-cpp-${P}"
LICENSE="MIT"
-SLOT="0/0.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
PATCHES=(
- "${FILESDIR}/${P}-abi-breakage.patch"
- "${FILESDIR}/${P}-CVE-2017-11692.patch"
- "${FILESDIR}/${P}-fix-overflows.patch"
"${FILESDIR}/${P}-gtest.patch"
+ "${FILESDIR}/${P}-cmake-paths.patch"
+ "${FILESDIR}/${P}-install-paths.patch"
)
-src_prepare() {
- sed -i \
- -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
- yaml-cpp.pc.cmake || die
- rm -r test/gtest-* || die
-
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DYAML_BUILD_SHARED_LIBS=ON