gentoo resync : 04.01.2022

4 files changed, 2 insertions, 70 deletions

diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 89b2f0d6335d..2950f9495505 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,8 +1,5 @@
-AUX mimalloc-1.7.2-GNUInstallDirs.patch 1230 BLAKE2B c5fea7af513b0db45be93861ee6f9eefaa8666645ece9c9112adcc34b17d7578503d7409cd6b4005e1c635d7db86755cf4de078966ced0eb0eb7cd29492f604f SHA512 a847164cbe7b64345b09a455bd6776249b697ec2b2222751f0dd96d87252b8bff0182626de1a4b96aa525861c181101f80950cafb18a782cd7af10d50c2d1db5
-DIST mimalloc-1.7.2.tar.gz 903317 BLAKE2B 6983a575c8e3a9ee92acc0042bc229805b7090794de6e693ff1cc344cd50e333d46f23663fbd16647ae4442b28f24bdc2043b46ed2bc16e13c3f8def08b155bb SHA512 5d78c5cc00dfff3dd7eb4bb59e8eff32397f5110d1183b4656cb56c40b88e2e648e3b18338119412b95ba9526937b16fce3aa4732f241a61a546e2bcea1efc9d
 DIST mimalloc-1.7.3.tar.gz 908042 BLAKE2B 6a96fc33148261e3f69a55196725bb2cf2e45f08a668b3d74fd6e06f808c1ce40fbb4783c5df50abe58dbae8b9c1dd264e6fcc6cce0a259b2cbec397d4667736 SHA512 e5a17b98d77a27d2a544869c2e0302a7e3bf77b5b494b2ee8ddc7af18bf9da152fea41702a8a17eb7e128238259fba6f96fa5bac549f5927453dc9a0bc06d013
 DIST mimalloc-2.0.3.tar.gz 917461 BLAKE2B 4b803881ab75afa358cb2dd251268c0934472074bf1983c3851a9d4f8c8ec0ea3907b52c40b0efe1cc09916cf4c5aa93f786a606e0b999536118b91bb5800310 SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f
-EBUILD mimalloc-1.7.2.ebuild 693 BLAKE2B b6905afe48c8674e813f55027b3f68371a04d9106759167de2bf58324c4a28494155f2a1df904ce200c5f72a3e31f54b6436a3b9fd42c65756297e45834d91bb SHA512 974885203bc9374f10025401e3d47d709128000893de0f0164eac18fdc8149986af95e74617574b4fd4fa6d3859b3361d2668797504678f765755c79664479b9
-EBUILD mimalloc-1.7.3.ebuild 694 BLAKE2B 13272ef91e6f6e49ccd8c45edd8ae39d8ac39d60e2ddd9d1876509409d56d5d9ecb3592d107c7c269dd4c00100680820b129df66587987e2d397ba313e6dd91e SHA512 bffc969e62417a003cc7a283b2108c78f4d63ee8d2fc98fdf690398ba37b63d868c08de98ab225d8bbecdd4f9f1f941564138996fc4ef9fd09bd6dd982ccccdf
+EBUILD mimalloc-1.7.3.ebuild 637 BLAKE2B 552662f1b43b295fbab238b23057817d390b4b3996e0b89edeace2928c06700eb061b4aa8ee7fb22cbf1fdb9424d1db887bc956498bd03337c5993205b668eda SHA512 173520d36a96e6b8cd4634592c948d41de78b3cd87437add909768ee4fe2f139f18010b830a827d4dab0e6f4a296ebcef699192845324f3d0e6676bec3f1d312
 EBUILD mimalloc-2.0.3-r1.ebuild 761 BLAKE2B 6e6187c1bea297633a50df0d45e8b244e3d4bcfcb003f726578337b08b8754fb96155d98864b93e8d25640228f10bd4fa9606712d0068e38c2439976b241fefe SHA512 108a0ddbbbd54899e569bf667d4633edeeab643c1fa6f4294747a826c5b04dc1d674c92215b51a8a93f4a41d8edc32ffff9115c1eee4cb356a3a24d1dab1fc0d
 MISC metadata.xml 322 BLAKE2B 811930d7bd9b6240b866a9a8e90ff6b4d48ba7e985c61cb475c8b8de67265d8f9b7317a84191cf5b5a9961e130e792b6cfbbdd3cbebe9e3d9128a7a5bcfaaf49 SHA512 b9b3bdc237c9a9f362f90ff72888f5bed80385d3acd27cc1a4c9bcd89939ce3a45593c51481a6529a9aac25a86726e1a0362ce2094e11dce555175e656c293d1
diff --git a/dev-libs/mimalloc/files/mimalloc-1.7.2-GNUInstallDirs.patch b/dev-libs/mimalloc/files/mimalloc-1.7.2-GNUInstallDirs.patch
deleted file mode 100644
index 99b86f311264..000000000000
--- a/dev-libs/mimalloc/files/mimalloc-1.7.2-GNUInstallDirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/microsoft/mimalloc/pull/463
-
-From: Yaroslav Syrytsia <me@ys.lc>
-Date: Tue, 28 Sep 2021 20:34:56 +0300
-Subject: [PATCH] cmake: removed hardcoded names for top level configuration
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,6 +24,7 @@ option(MI_DEBUG_UBSAN       "Build with undefined-behavior sanitizer (needs clan
- option(MI_CHECK_FULL        "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF)
- option(MI_INSTALL_TOPLEVEL  "Install directly into $CMAKE_INSTALL_PREFIX instead of PREFIX/lib/mimalloc-version" OFF)
- 
-+include(GNUInstallDirs)
- include("cmake/mimalloc-config-version.cmake")
- 
- set(mi_sources
-@@ -208,9 +209,9 @@ endif()
- # -----------------------------------------------------------------------------
- 
- if (MI_INSTALL_TOPLEVEL)
--  set(mi_install_libdir   "lib")
--  set(mi_install_incdir   "include")
--  set(mi_install_cmakedir "cmake")
-+  set(mi_install_libdir   "${CMAKE_INSTALL_LIBDIR}")
-+  set(mi_install_incdir   "${CMAKE_INSTALL_INCLUDEDIR}")
-+  set(mi_install_cmakedir "${CMAKE_INSTALL_LIBDIR}/cmake/mimalloc")
- else()
-   set(mi_install_libdir   "lib/mimalloc-${mi_version}")
-   set(mi_install_incdir   "include/mimalloc-${mi_version}")
diff --git a/dev-libs/mimalloc/mimalloc-1.7.2.ebuild b/dev-libs/mimalloc/mimalloc-1.7.2.ebuild
deleted file mode 100644
index 33efb631d03b..000000000000
--- a/dev-libs/mimalloc/mimalloc-1.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="mimalloc is a compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-GNUInstallDirs.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: build hardened variant?
-		#-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild b/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
index 40b252a87e40..b3ea5f3bc374 100644
--- a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
+++ b/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,10 +15,6 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-#	"${FILESDIR}"/${PN}-1.7.2-GNUInstallDirs.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		# TODO: build hardened variant?