From 07041260fda55bdcd3c1d0baec2b21515a4a5370 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Wed, 29 Sep 2021 21:09:46 +0000 Subject: [PATCH] dev-util/meson: Sync with gentoo upstream; updates to 0.57.2 gentoo ref: https://github.com/gentoo/gentoo/commit/476cd2936dcbfba9852fc32250ef180a15064764 Signed-off-by: Sayan Chowdhury --- .../third_party/portage-stable/dev-util/meson/Manifest | 2 +- .../meson/{meson-0.55.3.ebuild => meson-0.57.2.ebuild} | 10 ++++++---- .../portage-stable/dev-util/meson/meson-9999.ebuild | 10 ++++++---- .../portage-stable/dev-util/meson/metadata.xml | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/meson/{meson-0.55.3.ebuild => meson-0.57.2.ebuild} (87%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest index 56d8beb192..765d085eb4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest @@ -1 +1 @@ -DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae +DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.57.2.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.57.2.ebuild index 533774fb28..4376ab3bfe 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.57.2.ebuild @@ -1,16 +1,15 @@ -# Copyright 2016-2020 Gentoo Authors +# Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_USE_SETUPTOOLS="rdepend" +PYTHON_COMPAT=( python3_{6,7,8,9} ) if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi inherit distutils-r1 toolchain-funcs @@ -78,6 +77,9 @@ python_test() { # test_cross_file_system_paths unset XDG_DATA_HOME + # 'test cases/unit/73 summary' expects 80 columns + export COLUMNS=80 + ${EPYTHON} -u run_tests.py ) || die "Testing failed with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild index a13eeb7ea1..3b18cdf978 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild @@ -1,16 +1,15 @@ -# Copyright 2016-2020 Gentoo Authors +# Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_USE_SETUPTOOLS="rdepend" +PYTHON_COMPAT=( python3_{7,8,9} ) if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi inherit distutils-r1 toolchain-funcs @@ -78,6 +77,9 @@ python_test() { # test_cross_file_system_paths unset XDG_DATA_HOME + # 'test cases/unit/73 summary' expects 80 columns + export COLUMNS=80 + ${EPYTHON} -u run_tests.py ) || die "Testing failed with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml index d762c3aed0..aba1d26bb8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml @@ -1,4 +1,4 @@ - +