gentoo resync : 17.02.2020

5 files changed, 65 insertions, 26 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 7f7aeaec0947..98e07b1fef07 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,9 @@
 AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef
+AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216eadae9d190efd4743a138afae73d42f082499793b4688e2419cb3ef38fe7c5e7f29b472e8a27e9ce8701c28f83f390f55dddd SHA512 50b7b4c269d186e3c2274297f04dae46484af4f2f090bef3fc42dfbecab94d8a91b31c27369cf40a52c7ce71cf96d9bc22601739b6e886c6c710f0665c2ef311
+AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
-DIST meson-0.53.0.tar.gz 1548138 BLAKE2B 42340645f3417930856e05da9b479e9352e1fe3ea567929215f433a04fe3b0216d6de8693428be058048d2bd9c8d21031b19d0d5599a99e8f61aa9b6da689bf7 SHA512 e79a093aba5df137d463ac1334199833b8374689b2aba1cfd935fc484fff524d84bf6c2b3fcd9371b67daade0e18d1fe5e47dccdb7cf416932e86b83f49fec73
+DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
 EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 28e4a775dfda6eca957f883e8d21edecea83b46fbe9c0f16f0f967a41f80a4a6aa05196c51f23910d7ea19b4f985888a30d62a147279834a4d06d132a0eb1790 SHA512 043c7b168433388c1ec86b20767bdc533e5cbe7ac1a8786ea604091836dfbc84f1f5b2584d06d2f10f129558ff0ea869e4eabc363cee6416a1d71cd3d58f531b
-EBUILD meson-0.53.0.ebuild 2113 BLAKE2B 7852e6dd0459f26beaa4f9e121578d6cd44281ead0984f577d16c38b93aa6b03d6ddf4a9401f983c996342c2a937bc3e1b856696bbfc022e5398766cee535a3d SHA512 af11e0bcb5b4858c93ae40c0df410f99e8cd7c4be32404d1c22afabf7e792530ec1939baa1ccccef3bcd06fd7313eb8523465c24ef9cf4e116190ba86be48edc
-EBUILD meson-9999.ebuild 2039 BLAKE2B 7c795a9c84ad0aca3651cb0c16202208603fb0edd017a8d689c69f8980da35a9e73679b6d00d9cd249f3b23610e237770ef8cab2ba5af5a9499c08af5b55646a SHA512 4b96bf71cafcbb1c3f6327a2221f9f89a12088920b3f16c65631a6e19f46c58e39184a2d7277c645990b9fc4d533c8cb825d440581026669de03555198341b0b
+EBUILD meson-0.53.1.ebuild 1984 BLAKE2B 2271a68437e0f0afa1575f2d63fc92afbebbf1cf3197ae192137eebef1e8846b5752b6553c5a11ecd36aae233fd91ae949a39a3b78887b236281799a10795562 SHA512 cd2e1320ba38968dba45899e7cd232eca898794086eabe8887d2a2079d4e9c1d78bdae94650573141ea5c279b7575a53912a1592ef0b76cfc8894485713f181f
+EBUILD meson-9999.ebuild 1547 BLAKE2B 249b0a4fdf18d4be2f8a9143c8925988a76742d1a6fb845fb5b00c2a238c6c555d7e57e7442083c7686679207e725a40869958ca230e46c4a986a4db5aa2e1f9 SHA512 3df015631191572d52425270fc64d2331b8d8c28ddf8cedf681b9943e79e293e630675c62931cd8767943c67c7dfdcd67bf7520f49ff769b433bc734bf237c6e
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
new file mode 100644
index 000000000000..4ee11829904d
--- /dev/null
+++ b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
@@ -0,0 +1,27 @@
+From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Sat, 15 Feb 2020 12:24:42 -0600
+Subject: [PATCH 1/2] remove asan ld_preload
+
+ASAN and sandbox both want control over LD_PRELOAD
+https://bugs.gentoo.org/673016
+---
+ run_unittests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 676604f4..1c9aaf0c 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
+                              r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
+ 
+     @skip_if_not_base_option('b_sanitize')
+-    def test_generate_gir_with_address_sanitizer(self):
++    def _test_generate_gir_with_address_sanitizer(self):
+         if is_cygwin():
+             raise unittest.SkipTest('asan not available on Cygwin')
+         if is_openbsd():
+-- 
+2.24.1
+
diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch
new file mode 100644
index 000000000000..4cc2aead0ba6
--- /dev/null
+++ b/dev-util/meson/files/0.53.1-remove-asan.patch
@@ -0,0 +1,27 @@
+From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Sat, 15 Feb 2020 12:28:35 -0600
+Subject: [PATCH 2/2] remove asan
+
+ASAN is unsupported on some targets
+https://bugs.gentoo.org/692822
+---
+ run_unittests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 1c9aaf0c..171ee0f0 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
+         self.assertEqual(install_rpath, 'baz')
+ 
+     @skip_if_not_base_option('b_sanitize')
+-    def test_pch_with_address_sanitizer(self):
++    def _test_pch_with_address_sanitizer(self):
+         if is_cygwin():
+             raise unittest.SkipTest('asan not available on Cygwin')
+         if is_openbsd():
+-- 
+2.24.1
+
diff --git a/dev-util/meson/meson-0.53.0.ebuild b/dev-util/meson/meson-0.53.1.ebuild
index 0c1735955a49..0d8071675585 100644
--- a/dev-util/meson/meson-0.53.0.ebuild
+++ b/dev-util/meson/meson-0.53.1.ebuild
@@ -34,18 +34,16 @@ DEPEND="
 	)
 "
 
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
-	)
-
+PATCHES=(
 	# ASAN and sandbox both want control over LD_PRELOAD
 	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
+	"${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
 	# ASAN is unsupported on some targets
 	# https://bugs.gentoo.org/692822
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+	"${FILESDIR}"/0.53.1-remove-asan.patch
+	)
+
+python_prepare_all() {
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 7b35af518736..ab875e3bb07b 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -34,21 +34,6 @@ DEPEND="
 	)
 "
 
-python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
 src_test() {
 	tc-export PKG_CONFIG
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then