From 56d56c1b0441193d28b77902c92608d4d347a575 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 13 Jan 2020 23:38:26 -0500 Subject: [PATCH] dev-util/meson: remove "test cases/frameworks/1 boost" This test requires python2, which conflicts with python_wrapper_setup. Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24 Signed-off-by: Mike Gilbert --- dev-util/meson/meson-0.52.1.ebuild | 3 +++ dev-util/meson/meson-0.53.0.ebuild | 3 +++ dev-util/meson/meson-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild index 1dda18d8a31f..85edd45c7d12 100644 --- a/dev-util/meson/meson-0.52.1.ebuild +++ b/dev-util/meson/meson-0.52.1.ebuild @@ -43,6 +43,9 @@ python_prepare_all() { # https://bugs.gentoo.org/692822 sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + # Requires python2 + rm -r "test cases/frameworks/1 boost" || die + distutils-r1_python_prepare_all } diff --git a/dev-util/meson/meson-0.53.0.ebuild b/dev-util/meson/meson-0.53.0.ebuild index b70381e6157d..e7ca1f73f7bf 100644 --- a/dev-util/meson/meson-0.53.0.ebuild +++ b/dev-util/meson/meson-0.53.0.ebuild @@ -43,6 +43,9 @@ python_prepare_all() { # https://bugs.gentoo.org/692822 sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + # Requires python2 + rm -r "test cases/frameworks/1 boost" || die + distutils-r1_python_prepare_all } diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index b70381e6157d..e7ca1f73f7bf 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -43,6 +43,9 @@ python_prepare_all() { # https://bugs.gentoo.org/692822 sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + # Requires python2 + rm -r "test cases/frameworks/1 boost" || die + distutils-r1_python_prepare_all } -- 2.26.2