gentoo resync : 20.03.2021

4 files changed, 24 insertions, 22 deletions

diff --git a/dev-util/memprof/Manifest b/dev-util/memprof/Manifest
index e605c13a996f..45f3cb0247e5 100644
--- a/dev-util/memprof/Manifest
+++ b/dev-util/memprof/Manifest
@@ -1,5 +1,5 @@
-AUX memprof-0.6.2-binutils.patch 212 BLAKE2B 0d96ae801a90044478219132d422f44d67f8362a8f44c76236d6c3fc5d98ae771842f45b1ebcd24d2e61b1b467a006bdc0d8645cb4407a74a1debe08595b2edb SHA512 f0b5d6ff79d04536f1b0f2e7275eb795c4fb816f973483970d9fcf01ef07e6216e89890d7a5a367004883b2a5b7d6eda344397641fbd7ae9c921a7f8674a7001
-AUX memprof-0.6.2-desktop.patch 754 BLAKE2B d6e57a85f552dff99fe62e5cecc69956a426fb988ee7f8e7e8c00b50e427a1f9dd7c29c5178d3003432708d473c2ef469290ec74908743801939e8d603d7529e SHA512 a9e96331aac0b5c1eb50ffc24d6e242479d8e3642fff762f529ec2d3ad97e50262109e15ac80ddbeea8bd87bd4c5ac9d5c7f27989a93422140e5edbe0087b375
+AUX memprof-0.6.2-binutils.patch 216 BLAKE2B a2b0b9a8445e7015d7475bc2158d0fa175ef551d6c856220d1f5e6ed9b18cd0e729569fac3fb5300ce168e158a679772e02abc15a7f52c5702f3ebd5a5704b42 SHA512 554281705f92c3e398a1d10bc810d75f3074fe5c0a9879410ce574487e30e4c47b19795b3812efdcfc088451951bf9d4e4a68a21624139bcfdb5c458308a0ad9
+AUX memprof-0.6.2-desktop.patch 758 BLAKE2B d600c34b5a7cef6536a5dbb4a5feb75b2344a8d3b3288b9aff2578251f586a7251eaa5b8e4be0a16687432055ef4e9ffbd25bd31c2f1d10e4d776b4173e6c34d SHA512 60d5e12b16d30272dab56cd1cab3ac4b5cd1f9ff6f099285a8eb699dd1196c54e9605f162e3ce2745a478cf2c00f989a0685b39b961ac7f6b86dee06d39744cc
 DIST memprof-0.6.2.tar.gz 534543 BLAKE2B bc4b98d13ac2a789540006c69b185c95ab9a8c059250e53d89e3baed8d80cffc506ab27e081fbab914390d77c4e67371f2632363a90e3a8d804799b00b5bb208 SHA512 cecfeb88f10f11fc4df106367871487453ddd9cb502ef96a6f120ee8889cfa96e8463f260c853abb351c7864e68904cf6e833864d561f9e7b09a785f4c315ca7
-EBUILD memprof-0.6.2-r1.ebuild 830 BLAKE2B c85bd0d3d84cd11a187af5f23e2973cb50d8a8723d49cfb73b2f0e42494576b6d654a04b6c52d81bc30da17fa8ad9be0db2f6ca9aa8116bf70d16913d3e35823 SHA512 c81b8412eec7ae10abea8da9a2308bdd97316f4428816242a6c8a792f1b287a7de82ef6c0b7db50212f4729ba7a6c12c498786ef7860481ecb485b80c9d53a0f
+EBUILD memprof-0.6.2-r1.ebuild 815 BLAKE2B f34a215f49bc613e6e8760b8dfc4ed9ae3158458ffd639ca3a0a0ec00663fe7cb32049f48212ce0a8d7cf33c930510e21e127eb9a5908fea3df816a1bc1b5dd2 SHA512 24bc293ebe172e9151cff8a78f82cced938b3f1b0a9f7e677ab6cb5835721b6ee5625680b863b7f230fba592bc1eb2230f401e72c5e74f377be4b6284c69be52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/memprof/files/memprof-0.6.2-binutils.patch b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
index 2a7f80993d5e..c38e8d95b4f2 100644
--- a/dev-util/memprof/files/memprof-0.6.2-binutils.patch
+++ b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
@@ -1,5 +1,5 @@
---- src/memprof.h
-+++ src/memprof.h
+--- a/src/memprof.h
++++ b/src/memprof.h
 @@ -24,6 +24,7 @@
  #include <gtk/gtkwidget.h>
  #include <stdio.h>
diff --git a/dev-util/memprof/files/memprof-0.6.2-desktop.patch b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
index a49b5697aaca..9c1cd7a2f995 100644
--- a/dev-util/memprof/files/memprof-0.6.2-desktop.patch
+++ b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
@@ -1,5 +1,5 @@
---- memprof.desktop
-+++ memprof.desktop
+--- a/memprof.desktop
++++ b/memprof.desktop
 @@ -11,17 +11,13 @@
  Name[uk]=MemProf
  Comment=Check a program for leaks and analyze its memory usage
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
index 5bceac4e7801..b2216864763e 100644
--- a/dev-util/memprof/memprof-0.6.2-r1.ebuild
+++ b/dev-util/memprof/memprof-0.6.2-r1.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Profiling and leak detection tool"
-HOMEPAGE="http://www.secretlabs.de/projects/memprof/"
-SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
+HOMEPAGE="https://www.secretlabs.de/projects/memprof/"
+SRC_URI="https://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	>=gnome-base/libglade-2
 	>=x11-libs/gtk+-2.6:2
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 DOCS=( AUTHORS ChangeLog README NEWS )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-binutils.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
 
 src_configure() {
 	econf \
@@ -38,5 +40,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }