commit: 1c759f98119b78056d9c50208b9452f462300e73 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Fri Sep 19 02:09:29 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 20 22:24:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c759f98
dev-cpp/opentelemetry-cpp: drop 1.3.0-r2, 1.4.0, 1.16.1 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43853 Closes: https://github.com/gentoo/gentoo/pull/43853 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/opentelemetry-cpp/Manifest | 3 - ...entelemetry-cpp-1.16.1-fix-clang-template.patch | 43 ---------- .../files/opentelemetry-cpp-1.3.0-tests.patch | 92 ---------------------- .../opentelemetry-cpp-1.16.1.ebuild | 53 ------------- .../opentelemetry-cpp-1.3.0-r2.ebuild | 53 ------------- .../opentelemetry-cpp-1.4.0.ebuild | 53 ------------- 6 files changed, 297 deletions(-) diff --git a/dev-cpp/opentelemetry-cpp/Manifest b/dev-cpp/opentelemetry-cpp/Manifest index bb0a26952a6d..48252ebb0981 100644 --- a/dev-cpp/opentelemetry-cpp/Manifest +++ b/dev-cpp/opentelemetry-cpp/Manifest @@ -1,7 +1,4 @@ -DIST opentelemetry-cpp-1.16.1.tar.gz 904173 BLAKE2B 7f63ddd1b4305d6c98ad4a8c52ad12bbdbd8a2b125f2143978873dff4a94675bf644bcba609bc7de65868a34b530a0930be5a836e4ff05f476d5643ae3294b90 SHA512 c93005c9b24b358a9998141f6c7fd9675778731775dacaad18f0e81117fd00aaabff371c04cf96688a9c86117727181052a141d961d4db28fc457b454351c570 DIST opentelemetry-cpp-1.20.0.tar.gz 1115605 BLAKE2B 938fb90e203613e1beb193b28b0232423cbd111b6d9490fd12d706836619eb7fa01d9a625dd1b56fd91a355d49f916b4ccda58d76a862408505467dd2e33a2da SHA512 db9745be96907431c32a69230b29a5bddba0654f3f379f6cd0827f44895ef39c9612381303ec239d6ad98920bcc4006a90e25b715ade9ddf30aff843d1931416 DIST opentelemetry-cpp-1.22.0.tar.gz 1125051 BLAKE2B 40c9824b348a2d72d591aac3f5640cc7a0af77b8b4046acf39d1ced6fcfebb666dae40eb3f4e5f1d739e0b4105e54ca0eaeefc7ef443cd1935e3b1bcb6f32e63 SHA512 a85869d2858f350e4a3b85e5d68e669a5fff42a2222ba7782bba92f5fe6856a110b3ddc9744a6c3e68c1ddfdc7bdb2b570bbeff78275a4e98cea889a8fda0120 -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 DIST opentelemetry-proto-1.7.0.tar.gz 127009 BLAKE2B c0d5d5a24104cb62537abe8922e1b165fd58670efe549d82fe3295f9017de71077e77a173eca42ef1a339f92960f172f449dc2ba82d75fe5b8dc1ee88996c188 SHA512 488ebeab036c4d202ff40a3c21fdbb6f0ab58338e680240d47ae439d5975da3ff31114325a10c8ca18d3034ed15b1b86454d853405c460891c202e3b4b8c000e diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.16.1-fix-clang-template.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.16.1-fix-clang-template.patch deleted file mode 100644 index 85d013227a32..000000000000 --- a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.16.1-fix-clang-template.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix clang-19 error: a template argument list is expected after a name prefixed by the template keyword -Upstream PR: https://github.com/open-telemetry/opentelemetry-cpp/pull/3133 ---- a/api/include/opentelemetry/logs/event_logger.h -+++ b/api/include/opentelemetry/logs/event_logger.h -@@ -65,9 +65,8 @@ class EventLogger - } - nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord(); - -- IgnoreTraitResult( -- detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( -- log_record.get(), std::forward<ArgumentType>(args))...); -+ IgnoreTraitResult(detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set( -+ log_record.get(), std::forward<ArgumentType>(args))...); - - EmitEvent(event_name, std::move(log_record)); - } ---- a/api/include/opentelemetry/logs/logger.h -+++ b/api/include/opentelemetry/logs/logger.h -@@ -72,9 +72,8 @@ class Logger - return; - } - -- IgnoreTraitResult( -- detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( -- log_record.get(), std::forward<ArgumentType>(args))...); -+ IgnoreTraitResult(detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set( -+ log_record.get(), std::forward<ArgumentType>(args))...); - - EmitLogRecord(std::move(log_record)); - } ---- a/api/include/opentelemetry/logs/logger_type_traits.h -+++ b/api/include/opentelemetry/logs/logger_type_traits.h -@@ -166,8 +166,8 @@ struct LogRecordSetterTrait - * = nullptr> - inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept - { -- return LogRecordSetterTrait<common::KeyValueIterable>::template Set( -- log_record, std::forward<ArgumentType>(arg)); -+ return LogRecordSetterTrait<common::KeyValueIterable>::Set(log_record, -+ std::forward<ArgumentType>(arg)); - } - - template <class ArgumentType, diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch deleted file mode 100644 index a1ef0ff1d3cd..000000000000 --- a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc -index f8d248b..9a5be49 100644 ---- a/ext/test/http/curl_http_test.cc -+++ b/ext/test/http/curl_http_test.cc -@@ -187,50 +187,6 @@ TEST_F(BasicCurlHttpTests, HttpResponse) - ASSERT_EQ(count, 4); - } - --TEST_F(BasicCurlHttpTests, SendGetRequest) --{ -- received_requests_.clear(); -- auto session_manager = http_client::HttpClientFactory::Create(); -- EXPECT_TRUE(session_manager != nullptr); -- -- auto session = session_manager->CreateSession("http://127.0.0.1:19000";); -- auto request = session->CreateRequest(); -- request->SetUri("get/"); -- GetEventHandler *handler = new GetEventHandler(); -- session->SendRequest(*handler); -- ASSERT_TRUE(waitForRequests(30, 1)); -- session->FinishSession(); -- ASSERT_TRUE(handler->is_called_); -- delete handler; --} -- --TEST_F(BasicCurlHttpTests, SendPostRequest) --{ -- received_requests_.clear(); -- auto session_manager = http_client::HttpClientFactory::Create(); -- EXPECT_TRUE(session_manager != nullptr); -- -- auto session = session_manager->CreateSession("http://127.0.0.1:19000";); -- auto request = session->CreateRequest(); -- request->SetUri("post/"); -- request->SetMethod(http_client::Method::Post); -- -- const char *b = "test-data"; -- http_client::Body body = {b, b + strlen(b)}; -- request->SetBody(body); -- request->AddHeader("Content-Type", "text/plain"); -- PostEventHandler *handler = new PostEventHandler(); -- session->SendRequest(*handler); -- ASSERT_TRUE(waitForRequests(30, 1)); -- session->FinishSession(); -- ASSERT_TRUE(handler->is_called_); -- -- session_manager->CancelAllSessions(); -- session_manager->FinishAllSessions(); -- -- delete handler; --} -- - TEST_F(BasicCurlHttpTests, RequestTimeout) - { - received_requests_.clear(); -@@ -271,17 +227,6 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations) - delete handler; - } - --TEST_F(BasicCurlHttpTests, SendGetRequestSync) --{ -- received_requests_.clear(); -- curl::HttpClientSync http_client; -- -- http_client::Headers m1 = {}; -- auto result = http_client.Get("http://127.0.0.1:19000/get/";, m1); -- EXPECT_EQ(result, true); -- EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response); --} -- - TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout) - { - received_requests_.clear(); -@@ -296,18 +241,6 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout) - result.GetSessionState() == http_client::SessionState::SendFailed); - } - --TEST_F(BasicCurlHttpTests, SendPostRequestSync) --{ -- received_requests_.clear(); -- curl::HttpClientSync http_client; -- -- http_client::Headers m1 = {}; -- http_client::Body body = {}; -- auto result = http_client.Post("http://127.0.0.1:19000/post/";, body, m1); -- EXPECT_EQ(result, true); -- EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response); --} -- - TEST_F(BasicCurlHttpTests, GetBaseUri) - { - curl::HttpClient session_manager; diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.16.1.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.16.1.ebuild deleted file mode 100644 index 77c626523688..000000000000 --- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.16.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022-2025 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 ~ppc64" -IUSE="prometheus test" - -RDEPEND=" - net-misc/curl:= - dev-libs/boost:= -" -DEPEND=" - ${RDEPEND} - prometheus? ( - dev-cpp/prometheus-cpp - ) - test? ( - dev-cpp/gtest - dev-cpp/benchmark - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # remove tests the need network - "${FILESDIR}/${PN}-1.5.0-tests.patch" - "${FILESDIR}/${PN}-1.16.1-cstdint.patch" - "${FILESDIR}/${PN}-1.16.1-fix-clang-template.patch" -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON - -DBUILD_SHARED_LIBS:BOOL=ON - -DBUILD_TESTING:BOOL=$(usex test) - -DWITH_PROMETHEUS:BOOL=$(usex prometheus) - ) - - cmake_src_configure -} diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild deleted file mode 100644 index 0b67b346b6ed..000000000000 --- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022-2025 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} - prometheus? ( - dev-cpp/prometheus-cpp - ) - test? ( - dev-cpp/gtest - dev-cpp/benchmark - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # remove tests the need network - "${FILESDIR}/opentelemetry-cpp-1.3.0-tests.patch" -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON - -DBUILD_SHARED_LIBS:BOOL=ON - -DBUILD_TESTING:BOOL=$(usex test) - -DWITH_JAEGER:BOOL=$(usex jaeger) - -DWITH_PROMETHEUS:BOOL=$(usex prometheus) - ) - - cmake_src_configure -} diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild deleted file mode 100644 index 0b67b346b6ed..000000000000 --- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022-2025 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} - prometheus? ( - dev-cpp/prometheus-cpp - ) - test? ( - dev-cpp/gtest - dev-cpp/benchmark - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # remove tests the need network - "${FILESDIR}/opentelemetry-cpp-1.3.0-tests.patch" -) - -src_configure() { - local 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 -}
