commit: 760553ab999375f5da19c2f3471840956fb6c513
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 23:28:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 01:00:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760553ab
dev-libs/maloc: port to EAPI 7
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
...1.4-asneeded.patch => maloc-1.4-asneeded.patch} | 2 -
.../files/{1.4-doc.patch => maloc-1.4-doc.patch} | 2 -
.../files/{1.4-mpi.patch => maloc-1.4-mpi.patch} | 2 -
dev-libs/maloc/maloc-1.5-r1.ebuild | 58 ++++++++++++----------
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/dev-libs/maloc/files/1.4-asneeded.patch
b/dev-libs/maloc/files/maloc-1.4-asneeded.patch
similarity index 82%
rename from dev-libs/maloc/files/1.4-asneeded.patch
rename to dev-libs/maloc/files/maloc-1.4-asneeded.patch
index aed7299e089..966c28a4d1e 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
similarity index 82%
rename from dev-libs/maloc/files/1.4-doc.patch
rename to dev-libs/maloc/files/maloc-1.4-doc.patch
index 73be364812c..575b44f228f 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
similarity index 89%
rename from dev-libs/maloc/files/1.4-mpi.patch
rename to dev-libs/maloc/files/maloc-1.4-mpi.patch
index 807d5ddc8d3..c11420e8021 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 09db961acc5..7c7351aab1b 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
}
