From ded8fc63a3f0e846eb85ffe89d1ad60266cc2fbc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 16:32:35 +0100 Subject: [PATCH] dev-cpp/gflags: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../portage-stable/dev-cpp/gflags/Manifest | 2 +- ...gflags-2.2.0.ebuild => gflags-2.2.1-r1.ebuild} | 15 ++++++++------- .../{gflags-2.2.1.ebuild => gflags-2.2.2.ebuild} | 13 +++++++------ .../dev-cpp/gflags/gflags-9999.ebuild | 13 +++++++------ .../portage-stable/dev-cpp/gflags/metadata.xml | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-cpp/gflags/{gflags-2.2.0.ebuild => gflags-2.2.1-r1.ebuild} (68%) rename sdk_container/src/third_party/portage-stable/dev-cpp/gflags/{gflags-2.2.1.ebuild => gflags-2.2.2.ebuild} (79%) 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 8613f55b43..fe205d2550 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,2 @@ -DIST gflags-2.2.0.tar.gz 96408 BLAKE2B 571f07dd0972cec201eae8ce66d5e0592abb6ddb81bcf3c539f38861f0cd379de2db20ba99eab885ba030235938816d7a61e589b74a61743de7cdb2710646854 SHA512 e2106ca70ff539024f888bca12487b3bf7f4f51928acf5ae3e1022f6bbd5e3b7882196ec50b609fd52f739e1f7b13eec7d4b3535d8216ec019a3577de6b4228d 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.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1-r1.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1-r1.ebuild index 7ec523ddfe..bed6548a3d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1-r1.ebuild @@ -1,36 +1,37 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/gflags/gflags.git" + 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 ~sh ~sparc x86 ~amd64-linux ~x86-linux" + 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="http://gflags.github.io/gflags/" +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_SHARED_LIBS=ON -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-utils_src_configure + cmake_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild similarity index 79% rename from sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild index 91f405e1e9..6f3c37e496 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/gflags-2.2.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]]; then @@ -10,27 +11,27 @@ if [[ ${PV} == 9999 ]]; then 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + 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="http://gflags.github.io/gflags/" +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_SHARED_LIBS=ON -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-utils_src_configure + 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 91f405e1e9..6aa92ecf5e 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,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]]; then @@ -10,27 +11,27 @@ if [[ ${PV} == 9999 ]]; then 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Google's C++ argument parsing library" -HOMEPAGE="http://gflags.github.io/gflags/" +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_SHARED_LIBS=ON -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-utils_src_configure + cmake_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/metadata.xml index 5b9d6abf02..1dc3a95963 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gflags/metadata.xml @@ -1,5 +1,5 @@ - + amynka@gentoo.org