gentoo resync : 30.10.2021

5 files changed, 2 insertions, 158 deletions

diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 1dc955f9a6bc..06240fee46cc 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,8 +1,4 @@
-AUX 2.8-musl-tests.patch 1068 BLAKE2B 804671d01cba50821e63d60dd54154506be03fa8aa4a5ea5d3fccc1c7e1f7550e4f30f6792051f8ce7c47c8cedbbe54df0324060a9f0b306383a288c95667ed2 SHA512 f16c2fe9406c4865887ba1698eada2151e27b47a3cc73a6d3a8c3ca769102ca064f141e0137e168a8c2613dd4f663a5c7a3a7128d51d03fd9889835f0bc217a8
-AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832f7b95bfc66686751f9f2d8b9eef4ef6b7d73f7fe9296d5d04a154b0330f71000065f03412b440c010d44439e6 SHA512 d1a3f447037c4b7408fa20710989b262d37072c4e0552b74e3e25b673f3da4cb0280bbdccfe2e1c97eeb0b318b3923ad9a3d9afab17ba067e7b6755f33ad4f1d
 AUX google-perftools-2.9.1-disable-generic-dynamic-tls.patch 1429 BLAKE2B 69dfc7f24fe7d765f4ad6e118ff4b78de070bd471a92ab19bf7349addfc8ce477e14513bada0168fce675aac75e413d26319a784f0ecd5fbfc7e4750b4b1a35e SHA512 a85a631761df4e5a0d38f2e1ce9cb48f3299bb83f7b73cefe872d31f2cf08ec0fffe2c5918dd6e769d83a726404bf94c72857a3870a8823d4dea12d686a4bbd8
-DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
 DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab
-EBUILD google-perftools-2.7-r1.ebuild 2410 BLAKE2B 24f3d8e35ac243ed10d1be42498845a4c462158b56faa4a6c8ae3e18cf4d4ae4c326561d2407e702f9777d39e03b1b889efbf960c3ca64acf0cc118d735f5775 SHA512 fbb6a745414d0fc606a560cd86a9acb60f3b504a3c19128c26e96c8fab67b9ddd6b7138edbfd680f46d8e25662c7eb0c89cc07079a09f2bec1a2f0ae4feef11a
-EBUILD google-perftools-2.9.1-r2.ebuild 3144 BLAKE2B 6bf0cfe293302e4acd2ef907fc681889e31a601b9a510ade4758b1763cc28f612dab47c5d3fd34bdbb88a171d893aa3a642c8856c6587657c5eba4859c6d943c SHA512 97ed14e881a30f9234f7e90bbcbe11b14fdde5e3a2f81dfff95b0d4714362966866c232ba62764121121510b78cf2825f165d3baa8e2339170b169fac284d049
+EBUILD google-perftools-2.9.1-r2.ebuild 3138 BLAKE2B ce4ec06f068b4b4b3ed05000e4f6549c33b94dd0f204e94a22289d7c4b3b2c38270978905a7a26036a912b8665ae6cccf47dddd894287206919deec5d2d88d6c SHA512 2c0ef217d45aa7a31b427637ac32d3959ab5cb838a6bbccc9978a9bab2d263f487a3ba49a50e96658a9b3a64511d52589dafadf4435160d351161779f992d1c3
 MISC metadata.xml 1129 BLAKE2B 441935f9605b2c11fb02f4698375b87cdf7a30596f36c5d069ef3bec2599181bc91321b0bbea21f0841d2abdcca58aa1a4732d486bc5719b90f4eb6558fc2404 SHA512 624d8b8fcf555aa62b57c32443eef40fa350ffe346f84dadb33bcb8c8dc192749deee2ca01e121ac82d4e349bcc179af0f897a4b6b696741aefe01ce79abe916
diff --git a/dev-util/google-perftools/files/2.8-musl-tests.patch b/dev-util/google-perftools/files/2.8-musl-tests.patch
deleted file mode 100644
index 660099a6a88b..000000000000
--- a/dev-util/google-perftools/files/2.8-musl-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1d9b8bb59d5610f2c3e9faad6bbd91ceca17fb93 Mon Sep 17 00:00:00 2001
-From: Aliaksey Kandratsenka <alkondratenko@gmail.com>
-Date: Sat, 11 Jul 2020 20:33:40 -0700
-Subject: [PATCH] don't test sbrk hook if we're on linux and don't have __sbrk
-
-"mmap" hooks code for linux only hooks sbrk when __sbrk is
-defined. But musl doesn't offer this function (reasonably so), so
-sbrk hooking doesn't work there. Not big loss, but lets make sure
-tests don't fail.
-
-Lets reference this to issue #1198
----
- src/tests/tcmalloc_unittest.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/tcmalloc_unittest.cc b/src/tests/tcmalloc_unittest.cc
-index d06c5a86..9d303433 100644
---- a/src/tests/tcmalloc_unittest.cc
-+++ b/src/tests/tcmalloc_unittest.cc
-@@ -1503,7 +1503,7 @@ static int RunAllTests(int argc, char** argv) {
- 
-     // Test sbrk
-     SetSbrkHook();
--#if defined(HAVE_SBRK) && defined(__linux) && \
-+#if defined(HAVE___SBRK) && defined(__linux) && \
-        (defined(__i386__) || defined(__x86_64__))
-     p1 = sbrk(8192);
-     CHECK(p1 != NULL);
diff --git a/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch b/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch
deleted file mode 100644
index 84f28e1eefe8..000000000000
--- a/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: ucontext constants in ptrace.h on ppc64el
- Needs to include the mentioned header for ucontext.
-Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Bug-Debian: https://bugs.debian.org/894749
-Forwarded: no
-Last-Update: 2018-05-06
-
----
-
---- google-perftools-2.7.orig/m4/pc_from_ucontext.m4
-+++ google-perftools-2.7/m4/pc_from_ucontext.m4
-@@ -55,7 +55,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
-                         pc_field_found=true)
-        elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then
-          AC_TRY_COMPILE([#define _GNU_SOURCE 1
--                         #include <sys/ucontext.h>],
-+                         #include <sys/ucontext.h>,
-+                         #include <asm/ptrace.h>],
-                         [ucontext_t u; return u.$pc_field == 0;],
-                         AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field,
-                                            How to access the PC from a struct ucontext)
---- google-perftools-2.7.orig/src/getpc.h
-+++ google-perftools-2.7/src/getpc.h
-@@ -58,6 +58,7 @@
- #include <string.h>         // for memcmp
- #if defined(HAVE_SYS_UCONTEXT_H)
- #include <sys/ucontext.h>
-+#include <asm/ptrace.h>
- #elif defined(HAVE_UCONTEXT_H)
- #include <ucontext.h>       // for ucontext_t (and also mcontext_t)
- #elif defined(HAVE_CYGWIN_SIGNAL_H)
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
deleted file mode 100644
index 76dc02a2af33..000000000000
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P="gperftools-${PV}"
-
-inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="largepages +debug minimal optimisememory test static-libs"
-RESTRICT="!test? ( test )"
-
-DEPEND="!ppc64? ( sys-libs/libunwind )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/fix_ppc64el_FTBFS.patch
-	"${FILESDIR}/2.8-musl-tests.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use static-libs || find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild b/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild
index 0ac7aaf851de..4d38c0c6b9c4 100644
--- a/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux amd64/arm/arm64/ppc/ppc64/riscv/x86
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 IUSE="largepages largepages64k +debug minimal optimisememory test static-libs"