From 53bb853b51f0ccdacba1714a9405e23fbdd96ce2 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 13 Jun 2024 02:53:21 +0100
Subject: dev-cpp/abseil-cpp: unconditionally install test helper libraries

dev-libs/protobuf needs it at least and depending on USE=test for
it is considered odd.

Bug: https://bugs.gentoo.org/915902
Bug: https://bugs.gentoo.org/934062
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild | 66 ---------------------
 dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild | 67 ++++++++++++++++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild | 64 +++++++++++++++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild    | 63 --------------------
 dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild | 61 ++++++++++++++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild    | 60 -------------------
 6 files changed, 192 insertions(+), 189 deletions(-)
 delete mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild
 create mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild
 create mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild
 delete mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
 create mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild
 delete mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild

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

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild
deleted file mode 100644
index 3ab7ae818f50..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io/"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		>=dev-cpp/gtest-1.13.0
-		sys-libs/timezone-data
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# un-hardcode abseil compiler flags
-	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
-		absl/copts/copts.py || die
-
-	# now generate cmake files
-	python_fix_shebang absl/copts/generate_copts.py
-	absl/copts/generate_copts.py || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		# We use -std=c++14 here so that abseil-cpp's string_view is used
-		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
-		-DCMAKE_CXX_STANDARD=14
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
-		-DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF)
-		-DABSL_BUILD_TESTING=$(usex test ON OFF)
-		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild
new file mode 100644
index 000000000000..a1f813ccd43b
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		>=dev-cpp/gtest-1.13.0
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TESTING=$(usex test ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild
new file mode 100644
index 000000000000..812cf4bb324a
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		>=dev-cpp/gtest-1.13.0
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TESTING=$(usex test ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
deleted file mode 100644
index 8efabfde0a90..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io/"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		>=dev-cpp/gtest-1.13.0
-		sys-libs/timezone-data
-	)
-"
-
-RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# un-hardcode abseil compiler flags
-	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
-		absl/copts/copts.py || die
-
-	# now generate cmake files
-	python_fix_shebang absl/copts/generate_copts.py
-	absl/copts/generate_copts.py || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		# We use -std=c++14 here so that abseil-cpp's string_view is used
-		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
-		-DCMAKE_CXX_STANDARD=14
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
-		-DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF)
-		-DABSL_BUILD_TESTING=$(usex test ON OFF)
-		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild
new file mode 100644
index 000000000000..6241785276e6
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		>=dev-cpp/gtest-1.13.0
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TESTING=$(usex test ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild
deleted file mode 100644
index ae4c74260b71..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io/"
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		>=dev-cpp/gtest-1.13.0
-		sys-libs/timezone-data
-	)
-"
-
-RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# un-hardcode abseil compiler flags
-	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
-		absl/copts/copts.py || die
-
-	# now generate cmake files
-	python_fix_shebang absl/copts/generate_copts.py
-	absl/copts/generate_copts.py || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		# We use -std=c++14 here so that abseil-cpp's string_view is used
-		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
-		-DCMAKE_CXX_STANDARD=14
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
-		-DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF)
-		-DABSL_BUILD_TESTING=$(usex test ON OFF)
-		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
-	)
-
-	cmake_src_configure
-}
-- 
cgit v1.2.3