From 553a1dc43f616730fc4891fdd72a0aeeff70bf9a Mon Sep 17 00:00:00 2001
From: Yiyang Wu <xgreenlandforwyy@gmail.com>
Date: Wed, 14 Aug 2024 21:01:09 +0800
Subject: dev-cpp/opentelemetry-cpp: thrift-0.18.1 cause build error

Closes: https://bugs.gentoo.org/900707
Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../opentelemetry-cpp-1.6.0-r1.ebuild              | 53 ++++++++++++++++++++++
 .../opentelemetry-cpp-1.6.0.ebuild                 | 52 ---------------------
 2 files changed, 53 insertions(+), 52 deletions(-)
 create mode 100644 dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r1.ebuild
 delete mode 100644 dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild

(limited to 'dev-cpp/opentelemetry-cpp')

diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r1.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..113545e2fe9b
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022-2024 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="+jaeger prometheus test"
+
+RDEPEND="
+	net-misc/curl:=
+	dev-libs/thrift:=
+	!=dev-libs/thrift-0.18*
+	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 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.6.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
deleted file mode 100644
index df41ba0935e1..000000000000
--- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2024 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="+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 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
-}
-- 
cgit v1.2.3