From 9aefcbd35905e4a6e03febff481b126c2c5ab218 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 2 Aug 2024 16:45:53 +0200 Subject: [PATCH] dev-cpp/gflags: Sync with Gentoo It's from Gentoo commit a19f7a6950cac188d1aa9840f0088037442085fd. --- .../portage-stable/dev-cpp/gflags/Manifest | 1 - ...2.2.1-r1.ebuild => gflags-2.2.2-r1.ebuild} | 13 ++++--- .../dev-cpp/gflags/gflags-2.2.2.ebuild | 37 ------------------- .../dev-cpp/gflags/gflags-9999.ebuild | 13 ++++--- 4 files changed, 14 insertions(+), 50 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-cpp/gflags/{gflags-2.2.1-r1.ebuild => gflags-2.2.2-r1.ebuild} (76%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/Manifest index fe205d2550..b945767f9e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/Manifest @@ -1,2 +1 @@ -DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9 DIST gflags-2.2.2.tar.gz 98704 BLAKE2B 54cbf3b0a422d662e89c1921614ae9f20a4a383524d374d1e7ce1473eff0a6e121c1a2255df0b9d27ae9866c8e63094b908534c5fd2173737033cc0f184a5e4f SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2-r1.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2-r1.ebuild index bed6548a3d..a841f16304 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2-r1.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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-multilib flag-o-matic -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gflags/gflags" else SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Google's C++ argument parsing library" @@ -26,6 +25,8 @@ RESTRICT="!test? ( test )" DOCS=( ChangeLog.txt README.md ) multilib_src_configure() { + append-lfs-flags + local mycmakeargs=( -DBUILD_STATIC_LIBS=$(usex static-libs) -DBUILD_TESTING=$(usex test) diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild deleted file mode 100644 index 6f3c37e496..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 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 - inherit git-r3 - EGIT_REPO_URI="https://github.com/gflags/gflags" -else - SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Google's C++ argument parsing library" -HOMEPAGE="https://gflags.github.io/gflags/" - -LICENSE="BSD" -SLOT="0/2.2" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -# AUTHORS.txt only links the google group -DOCS=( ChangeLog.txt README.md ) - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTING=$(usex test) - # avoid installing .cmake/packages, e.g.: - # >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9 - -DREGISTER_INSTALL_PREFIX=OFF - ) - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-9999.ebuild index 6aa92ecf5e..a6c7626265 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-9999.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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-multilib flag-o-matic -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gflags/gflags" else SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Google's C++ argument parsing library" @@ -26,6 +25,8 @@ RESTRICT="!test? ( test )" DOCS=( ChangeLog.txt README.md ) multilib_src_configure() { + append-lfs-flags + local mycmakeargs=( -DBUILD_STATIC_LIBS=$(usex static-libs) -DBUILD_TESTING=$(usex test)