gentoo resync : 25.04.2020

3 files changed, 2 insertions, 91 deletions

diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 4464b60bd9a1..7bc1c06cc769 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -2,6 +2,5 @@ AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832
 DIST gperftools-2.6.2.tar.gz 911811 BLAKE2B 1201185f3008f75b9db219e47658f5b34294f15d5cae5a9badbc2718d63e58c07e485e84f6af05bdd12398c7ab8af520db9f34f4b33b790b0276ba10fb945358 SHA512 2630687d98cdb7011b9b90ba65e337d74f7e1f7d44190edf5414d0898b906686e547e4bb08979f26fb16ca1ccc065a5a1022dee03539bb1ccdf136439eb99ec1
 DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
 EBUILD google-perftools-2.6.2.ebuild 2222 BLAKE2B 3a4bbffae09223f1bde0ac608a1a18d569bd6d1862431a24143b7e8d7fee24ffcc4784765735011975569a6d84acbaf6ee22afab4a656dff2faad2def164ca00 SHA512 60f1bcbe05561d9d91b51b314e56e46f81a862a7cc849e832c7e72d923be012569b184e4a49549db84edb85786327fe8e0f6827f28424afa482dcb85caf405c2
-EBUILD google-perftools-2.7-r1.ebuild 2379 BLAKE2B 79b736fe95ad07919df6fd3b7f3cf790a239b9ddb35c0cb73bd35bd16d1208caee6c58a8058e6feb66e7ff9bda5aeefaeeb562cfe893ab60ae02b60837f3ec73 SHA512 94057345f11062254e0f63acb7beddb607700e783cc27b90b9861401d1782aaf44e2985730e0a1bac5374108d578a3b8e3e3ff050381a904dfecf06155c9e360
-EBUILD google-perftools-2.7.ebuild 2315 BLAKE2B 5ffdb176bb77f92e90d9fdfa2b750ee95257a0298bbdae266f7448e45f7736ac0174614c56286213b2e38f546f8faa215d1e7f744458783f665ab9c6ae0ee551 SHA512 fe42024025eae833242847f81e087a3466776a9b36452b85af91a7b84ce7e76175c14fc79ed8930ce960e2789f751b4561a046723e0d84b4449673193c3c3746
+EBUILD google-perftools-2.7-r1.ebuild 2378 BLAKE2B 1eeac9fa0abc7c94dd89c26e91f6cb060b0c5ff23054456c0fc84c34a154dbd8d39dad9890c8d9bd34c2f0e524162b6ace2d34dafec7698979b83d75a90dd5ee SHA512 992961db8e7cd0e8c0961d5d6908ced58ad005f29c55525dbd710557b7662c2c169c7b2402bbfe15c4a818cf7013b38dd490daa9a7c84b74d987ede01b5765fa
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
index 3e177a9c1d8d..0a5197f050eb 100644
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="largepages +debug minimal optimisememory test static-libs"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
deleted file mode 100644
index b120b338e577..000000000000
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ /dev/null
@@ -1,88 +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="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-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
-}