commit: 9836d1184b764bf34d29ea7342246faa6dbe54af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 00:00:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 19:45:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9836d118
dev-cpp/abseil-cpp: drop 20210324.2, 20211102.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-cpp/abseil-cpp/Manifest | 1 -
dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild | 77 ----------------------
dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild | 72 --------------------
3 files changed, 150 deletions(-)
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index fe4280197957..67a82b68d035 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,5 +1,4 @@
DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B
66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5
SHA512
7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
-DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B
f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc
SHA512
7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B
a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a
SHA512
fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B
5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced
SHA512
ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2
DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B
c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d
SHA512
715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
deleted file mode 100644
index af0821bbd992..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-any-r1 toolchain-funcs
-
-# yes, it needs SOURCE, not just installed one
-GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
-GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
-
-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
- test? (
https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz ->
${GTEST_FILE} )"
-
-LICENSE="
- Apache-2.0
- test? ( BSD )
-"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- ${PYTHON_DEPS}
- test? ( sys-libs/timezone-data )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20200923-arm_no_crypto.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
-
- if use test; then
- sed -i 's/-Werror//g' \
-
"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake
|| die
- fi
-}
-
-src_configure() {
- if use arm || use arm64; then
- # bug #778926
- if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if
defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') !=
*HAVE_ARM_FEATURE_CRYPTO* ]]; then
- append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
- fi
- fi
-
- local mycmakeargs=(
- -DABSL_ENABLE_INSTALL=TRUE
-
-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
- -DCMAKE_CXX_STANDARD=17
- $(usex test -DBUILD_TESTING=ON '') #intentional usex
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
deleted file mode 100644
index 73bcffd05bbc..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..11} )
-
-inherit cmake python-any-r1
-
-# yes, it needs SOURCE, not just installed one
-# and no, 1.11.0 is not enough
-GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
-GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz"
-
-DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
-HOMEPAGE="https://abseil.io";
-SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz ->
${P}.tar.gz
- test? (
https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz ->
${GTEST_FILE} )"
-
-LICENSE="
- Apache-2.0
- test? ( BSD )
-"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- ${PYTHON_DEPS}
- test? ( sys-libs/timezone-data )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.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
-
- if use test; then
- sed -i 's/-Werror//g' \
-
"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake
|| die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DABSL_ENABLE_INSTALL=TRUE
-
-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
- -DCMAKE_CXX_STANDARD=17
- -DABSL_PROPAGATE_CXX_STD=TRUE
- $(usex test -DBUILD_TESTING=ON '') #intentional usex
- )
- cmake_src_configure
-}
