Update meson.eclass. Remaining EAPI=8 bumps

Signed-off-by: Martin Väth <martin@mvath.de>

4 files changed, 29 insertions, 11 deletions

diff --git a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
index 05e4e2cf..05824e25 100644
--- a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
+++ b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 RESTRICT="mirror"
 
 DIST_AUTHOR=PEVANS
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 74c9cbb6..15801c9f 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -91,3 +91,6 @@
 
   28 Aug 2021; Martin Väth <martin@mvath.de>:
   Update meson eclass
+
+  13 Feb 2022; Martin Väth <martin@mvath.de>:
+  Update meson eclass
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 4cca2fd1..910ab675 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -1,4 +1,4 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: meson.eclass
@@ -52,7 +52,7 @@ inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs
 
 EXPORT_FUNCTIONS src_configure src_compile src_test src_install
 
-_MESON_DEPEND=">=dev-util/meson-0.56.0
+_MESON_DEPEND=">=dev-util/meson-0.58.2-r1
 	>=dev-util/ninja-1.8.2
 	dev-util/meson-format-array
 "
@@ -78,6 +78,11 @@ __MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
 # Build directory, location where all generated files should be placed.
 # If this isn't set, it defaults to ${WORKDIR}/${P}-build.
 
+# @ECLASS-VARIABLE: EMESON_BUILDTYPE
+# @DESCRIPTION:
+# The buildtype value to pass to meson setup.
+: ${EMESON_BUILDTYPE=plain}
+
 # @ECLASS-VARIABLE: EMESON_SOURCE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -324,7 +329,6 @@ meson_src_configure() {
 
 	local mesonargs=(
 		meson setup
-		--buildtype plain
 		--libdir "$(get_libdir)"
 		--localstatedir "${EPREFIX}/var/lib"
 		--prefix "${EPREFIX}/usr"
@@ -335,6 +339,10 @@ meson_src_configure() {
 		--native-file "$(_meson_create_native_file)"
 	)
 
+	if [[ -n ${EMESON_BUILDTYPE} ]]; then
+		mesonargs+=( --buildtype "${EMESON_BUILDTYPE}" )
+	fi
+
 	if tc-is-cross-compiler; then
 		mesonargs+=( --cross-file "$(_meson_create_cross_file)" )
 	fi
@@ -418,11 +426,11 @@ meson_src_test() {
 	"$@" || die "tests failed"
 }
 
-# @FUNCTION: meson_src_install
+# @FUNCTION: meson_install
 # @USAGE: [extra meson install arguments]
 # @DESCRIPTION:
-# This is the meson_src_install function.
-meson_src_install() {
+# Calls meson install with suitable arguments
+meson_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local mesoninstallargs=(
@@ -434,10 +442,17 @@ meson_src_install() {
 	set -- meson install "${mesoninstallargs[@]}"
 	echo "$@" >&2
 	"$@" || die "install failed"
+}
+
+# @FUNCTION: meson_src_install
+# @USAGE: [extra meson install arguments]
+# @DESCRIPTION:
+# This is the meson_src_install function.
+meson_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null || die
+	meson_install "$@"
 	einstalldocs
-	popd > /dev/null || die
 }
 
 fi
diff --git a/net-dialup/martian-modem/martian-modem-20100123-r3.ebuild b/net-dialup/martian-modem/martian-modem-20100123-r3.ebuild
index 53d3f74b..1c4c2d54 100644
--- a/net-dialup/martian-modem/martian-modem-20100123-r3.ebuild
+++ b/net-dialup/martian-modem/martian-modem-20100123-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2012-2019 Gentoo Authors and Martin V\"ath
+# Copyright 2012-2022 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit linux-mod readme.gentoo-r1
 
 MY_P="martian-full-${PV}"