gentoo auto-resync : 05:10:2024 - 04:27:09

3 files changed, 12 insertions, 31 deletions

diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index fc42c4ce776c..223f1967d809 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,6 +1,6 @@
 AUX google-perftools-2.9.1-disable-generic-dynamic-tls.patch 1429 BLAKE2B 69dfc7f24fe7d765f4ad6e118ff4b78de070bd471a92ab19bf7349addfc8ce477e14513bada0168fce675aac75e413d26319a784f0ecd5fbfc7e4750b4b1a35e SHA512 a85a631761df4e5a0d38f2e1ce9cb48f3299bb83f7b73cefe872d31f2cf08ec0fffe2c5918dd6e769d83a726404bf94c72857a3870a8823d4dea12d686a4bbd8
-DIST gperftools-2.10.tar.gz 926512 BLAKE2B e92fb751f9e695d21edf5fce443f3d3641fcff15cbd6b5d868bc77fbe622594be824b75c8d45513c7f82b9e574c690133b8502d4574162948a77886d5166b92d SHA512 4400711723be9401f519d85b3b69c026e4715473cbed48ab0573df17abdf895fb971ee969875fe5127a2e8b9aba90d858285e50c8e012384c2c36d5a76b1f0c4
 DIST gperftools-2.15.tar.gz 888271 BLAKE2B 0fb627e36d6677d01081b1d566ad42eee8b87ab94a07cbbc4536a1671b539354bc0d27f6eab249e94317f0d57a9801551aa3b2cceae784231ac69528b61d4d6e SHA512 04551bdfac50812dd8305e0fe6f6ae5b8603f18a5f9cde56657daa634982bfb5eb5303721ea6a8e02f4177aa012535216f1c99b9eda4ce92f046982df41fbcd1
-EBUILD google-perftools-2.10-r1.ebuild 3007 BLAKE2B c57396db53c0ba2dacbe370a94255c355a154c68f8079ef039cb6ff4ef744c235523ddfb990ccb7017e330a3f6382c1be199c97b2cad556243dd0798c8e4c3b0 SHA512 1915920c4745fda89ae5c0097a8359a5f0c1bf626337448e734076b72bff197670c47034ef2d2d4c1ee6a07a21a28ddd1f20aafb427e66578a7c505db07d8de6
+DIST gperftools-2.16.tar.gz 1743259 BLAKE2B a1b1c8b04e7797121ca96d5527e6d862d84bf1df116d4bbd30fe3a572fcb76f32be8633a4711c908adf87e6b57eeb1558f7bde1dcdf393c6f6ccea17b90e0dc3 SHA512 a6eddee06cd6a9344c724522a5bb977082d6ee30eded1c6793d6bb508d4c8542a238dc0f62818c715f09312c858cc90cded0ee95ba2a3ea15fad8a0b78bcdaea
 EBUILD google-perftools-2.15.ebuild 3203 BLAKE2B 5434bc1e7a04eaa689da8d8a5405f2fac7ec5e24fc4b40c32694a0739661fe42cc17f14bb63665a47d40c8ec8c67a91e71d6c87af1bd3bab96ff1b5846336c42 SHA512 10eee62611abab0d95e2c05f8ac95a3c84c59568d7d1288e075d19bf196035de74c2d6309c0f658bdb0e2ed19d9763c0a1218ad70366bc4c6feda61d209184c4
-MISC metadata.xml 2014 BLAKE2B 23bf92b2a94e890320b073d4d27fab2e680d3fb3e5eb9e5fdb6519acb5df8543d4a75e704c908a112f2342d7b81f6f6c1803ad723870f87205cb045370770c01 SHA512 a4cf9f45a166a458c8a6dea731d32e4ef0da44f19138bcf14289d011540926f9aab2852ba50ef48177513dc4af61fe7809496937039bbd4c594635a81f7547be
+EBUILD google-perftools-2.16.ebuild 3002 BLAKE2B 674340dba0614c56c303770b29d4b35a346b1c68a924e561aa5fb5b478107529b541a23cbc68ef7017f088bd0cbd877d659bb68f17dabe1ff60e87e4b4bfee00 SHA512 089e0f0f9df60670652565e86492b91ebffd20ad282b8ed6df1ea2d01b4efc915c4b9b48de725dede0ad1e747eea632dc6df9f2b91b0e504e3f16669a588313c
+MISC metadata.xml 1668 BLAKE2B 57cbf34e9dfe4679b1d8c8f4a35eb7622dbf36f18e04dafb2507ce639154a7a5395a07a9a44df469c46bef7c7ac46c80bec13c1bf69b59c510955a9e18a7dfa7 SHA512 1592fa3483f82aaefa3158181619bf774a41710c5fd8508f5630799e6fb7f0de0ce7ae71d2b939a5f89e5d96b8734fdc82c54810581a7e00b088dd9bf7c755dc
diff --git a/dev-util/google-perftools/google-perftools-2.10-r1.ebuild b/dev-util/google-perftools/google-perftools-2.16.ebuild
index 4e8aef1bd3eb..1bceb84f6911 100644
--- a/dev-util/google-perftools/google-perftools-2.10-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.16.ebuild
@@ -9,6 +9,7 @@ inherit 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"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/4"
@@ -17,9 +18,10 @@ 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 llvm-libunwind minimal optimisememory test static-libs"
+IUSE="pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k +debug llvm-libunwind minimal optimisememory test static-libs"
+REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k )"
 
 RESTRICT="!test? ( test )"
 
@@ -29,14 +31,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Please keep this if possible on bumps, check Fedora if needs rebasing
-	# Allows correct functionality on e.g. arm64, bug #818871
-	"${FILESDIR}"/${PN}-2.9.1-disable-generic-dynamic-tls.patch
-)
-
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
 	# of them on both compile and install.
@@ -57,9 +51,12 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K
 	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
+	use pagesize-16k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=14
+	use pagesize-32k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=15
+	use pagesize-64k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=16
+	use pagesize-128k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=17
+	use pagesize-256k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=18
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	local myeconfargs=(
@@ -85,12 +82,6 @@ multilib_src_configure() {
 }
 
 src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Unable to run tests when sandbox is enabled."
-		ewarn "See https://bugs.gentoo.org/290249"
-		return 0
-	fi
-
 	multilib-minimal_src_test
 }
 
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 1e3420600a79..9b2cf6a3aeeb 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -6,16 +6,6 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<use>
-		<flag name="largepages">
-			Use (experimental) larger pages for tcmalloc, this increases
-			memory usage, but should speed up the allocation/free
-			operations.
-		</flag>
-		<flag name="largepages64k">
-			Use (experimental) 64K pages for tcmalloc, this increases
-			memory usage, but should speed up the allocation/free
-			operations.
-		</flag>
 		<flag name="pagesize-16k">
 			Use 16K page size for tcmalloc. Larger size makes tcmalloc faster,
 			at the cost of using more space (due to internal fragmentation)