gentoo resync : 03.03.2021

5 files changed, 36 insertions, 36 deletions

diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index a95d33f0798c..8859b6715190 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -1,6 +1,6 @@
-AUX 1.4-asneeded.patch 533 BLAKE2B b2f1202d6f788c41f4e96c2a9b2354abe922fda568ebc19e29b76661b8199ad3eca7a0cce3c2f99ac6a35f6a628320e3be1a353acd86a8b4065a2387969cca5f SHA512 de3ed7a3515efcef2518fc04def32b4145b3975d25535f1d1ef06211a89573ccb024286d1904475b8b510caa6109e5106fb264fc097764566aa31616be6bb7de
-AUX 1.4-doc.patch 539 BLAKE2B fbd5b0c726273bec32d7643edfce37bf4295fd12c92664bba6c5136cbfda4e50c3f260fe87577dd8eb32a3e847ffac08dfae376345675b3732d04e92f08cf744 SHA512 7ca3d028c86c6938a51f44f9d7f769702b5a8732bbd98ac9abaee916f25b2b7bad69883844a36a4add055838ce67e779ccc02634aed05bea2704c20b59b5fb67
-AUX 1.4-mpi.patch 652 BLAKE2B 0ad1e3ea9b79178ba8e1d16efc1fd6b59b931773faa0add3519a917164d4d62bbe158e05881d8e077c3ff375cefec2851ddbb160b2d64fac299cde145c2eb3d1 SHA512 73d00caccb02f5fa94336c63a653e99bccdeebd39d6e10d4c8eaab95a8e4f4b90ac5d1232d781e25e5079c7fdb8038471078cc63ba638579f523e27816e49d43
+AUX maloc-1.4-asneeded.patch 440 BLAKE2B d1693dd96756f83e8e0381eb399ef3a80bb920b964b24facdce172ed69632caaa6449b0b5946ba8d889e832975009133c15cfe43e90c9bbc99d410275ab8b9cb SHA512 083956054c32aae4cbf4b4f111714c0cf48987bbf3098529c0638dc0a03137f8f2df5e14e452aff5b97045e058c92ddb967c80b9fad5a14fdecfb3402a2c2616
+AUX maloc-1.4-doc.patch 446 BLAKE2B 5fccdf966ba391c91abd3f2c3d219af122bc12aecbb2a5195aa3cf2335f7ba1a3cdd67aefbd994472d5bb50c49a718f4499499d059510a1c02b83265d2435806 SHA512 80c1abe14d01b1953a97c15e682d2c5b1a58e3b1bf6afb72d3aea0566365458cf2b173f9e82eb05457622d7eb62cfbc8cc267db8f45741d258332b5df186fa58
+AUX maloc-1.4-mpi.patch 581 BLAKE2B e2ac355eb674189e7368fe6b7d2f93c3cc60094cfc73d65d0a3a2b639e5705ce750e89f44bce09b5323e39f73355cc890a598d958612c3d683309eedbdc8988b SHA512 cc5957bdd189199d52621d511673a41b7204d8efe9c3453a5f1cb1408a4863911c939be78f47929fd664aa502be53fa4a16a5b1da0b17a7b62aa3eac78a9883c
 DIST maloc-1.5.tar.gz 794138 BLAKE2B 28b5b6a3bb9769ead517e181c9098762378dea7c8b8ddddaf809c958a553a4e96ee654d477a974c769b027c57c93b84ec5e447af142489b59d2ce8800b5631a6 SHA512 9b50ffc0dd2a9c74808783fdc3bcad9dd6fb4ba0edcdad099eb7ab5e9a1f7d5c708db4b6e2a5373adfabd2a013b1cc4f92281905ef108df3fa6376726ca7a62c
-EBUILD maloc-1.5-r1.ebuild 1232 BLAKE2B 89fd133e2ded56a3c6fb919b4c0578ffa721f9fe1df05d500a1c7efe02f63b35dc0fba0f255f8dd7d628a0dc5b7d6723a703d2b1f883e321cc92e3d820d9ca2e SHA512 75b23865c0516751d547942681c768c5503613351ed79ef8ae5a63adbc64977d560b6a6532275cfe5f5aec16dfeffa644a7fece4aa82c137b96df38ad1f39baa
+EBUILD maloc-1.5-r1.ebuild 1240 BLAKE2B e2d70862242145079ba6958e636881de0efdd66f0c31f35f45a9e18ea3866e74a4f60850274cb52ac1a39aacdb694ec6b7929cfea79c613e3b131d968d48b00c SHA512 c8256aed84edbc4268fd4b9c3da794ddde36cf818c11e461eeccdbcab1a33a896df4e41cd0c434d7a8c892c32af3b61b53a47fbd645f96886e4ddd11c20bc5ea
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/maloc/files/1.4-asneeded.patch b/dev-libs/maloc/files/maloc-1.4-asneeded.patch
index aed7299e089a..966c28a4d1e1 100644
--- a/dev-libs/maloc/files/1.4-asneeded.patch
+++ b/dev-libs/maloc/files/maloc-1.4-asneeded.patch
@@ -1,5 +1,3 @@
-diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
-index 512e1ef..eda73ee 100644
 --- a/src/aaa_lib/Makefile.am
 +++ b/src/aaa_lib/Makefile.am
 @@ -49,11 +49,10 @@ else
diff --git a/dev-libs/maloc/files/1.4-doc.patch b/dev-libs/maloc/files/maloc-1.4-doc.patch
index 73be364812cc..575b44f228f1 100644
--- a/dev-libs/maloc/files/1.4-doc.patch
+++ b/dev-libs/maloc/files/maloc-1.4-doc.patch
@@ -1,5 +1,3 @@
-diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
-index 2686292..8f77fe2 100644
 --- a/doc/doxygen/Makefile.am
 +++ b/doc/doxygen/Makefile.am
 @@ -29,14 +29,12 @@
diff --git a/dev-libs/maloc/files/1.4-mpi.patch b/dev-libs/maloc/files/maloc-1.4-mpi.patch
index 807d5ddc8d38..c11420e80213 100644
--- a/dev-libs/maloc/files/1.4-mpi.patch
+++ b/dev-libs/maloc/files/maloc-1.4-mpi.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index d82b184..b8c5321 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -397,12 +397,14 @@ AC_SUBST(rl_inc)
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index 09db961acc5c..7c7351aab1b8 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -1,59 +1,65 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Minimal Abstraction Layer for Object-oriented C/C++ programs"
 HOMEPAGE="http://www.fetk.org/codes/maloc/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="doc mpi static-libs"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	sys-libs/readline:0=
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? (
-		media-gfx/graphviz
 		app-doc/doxygen
-		)"
-
-S="${WORKDIR}/${PN}"
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	sys-libs/readline:0=
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/1.4-mpi.patch
-	"${FILESDIR}"/1.4-asneeded.patch
-	"${FILESDIR}"/1.4-doc.patch
-	)
+	"${FILESDIR}"/${PN}-1.4-mpi.patch
+	"${FILESDIR}"/${PN}-1.4-asneeded.patch
+	"${FILESDIR}"/${PN}-1.4-doc.patch
+)
 
 src_prepare() {
+	default
+
 	echo 'VPUBLIC int Vio_getc(Vio *thee){  ASC *asc; asc = thee->axdr; return asc->buf[asc->pos++];  }' >> src/vsys/vio.c || die
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs
+	local myeconfargs=()
+
 	use mpi && export CC="mpicc"
 	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
 
 	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable mpi)
 		--disable-triplet
-		)
-	autotools-utils_src_configure
+		$(use_enable mpi)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
+	docinto html
+	dodoc doc/index.html
 
-	# install doc
-	dohtml doc/index.html
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
 }