Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/
Date: Mon, 27 Dec 2021 03:41:34
Message-Id: 1640576325.404c6eb1a82cd80bf148df0ac526132bc014d6f3.floppym@gentoo
1 commit: 404c6eb1a82cd80bf148df0ac526132bc014d6f3
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 27 02:06:03 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 27 03:38:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=404c6eb1
7
8 dev-util/meson: sync live ebuild
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 dev-util/meson/meson-9999.ebuild | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
16 index e2a175666ca3..b1532c0364e4 100644
17 --- a/dev-util/meson/meson-9999.ebuild
18 +++ b/dev-util/meson/meson-9999.ebuild
19 @@ -1,7 +1,7 @@
20 # Copyright 2016-2021 Gentoo Authors
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=7
24 +EAPI=8
25 PYTHON_COMPAT=( python3_{7,8,9,10} )
26
27 if [[ ${PV} = *9999* ]]; then
28 @@ -83,7 +83,7 @@ python_test() {
29 # If JAVA_HOME is not set, meson looks for javac in PATH.
30 # If javac is in /usr/bin, meson assumes /usr/include is a valid
31 # JDK include path. Setting JAVA_HOME works around this broken
32 - # autodection. If no JDK is installed, we should end up with an empty
33 + # autodetection. If no JDK is installed, we should end up with an empty
34 # value in JAVA_HOME, and the tests should get skipped.
35 export JAVA_HOME=$(java-config -O 2>/dev/null)