From 4e049e88573eabbe0e7a6d3a623acd17a2cba0ce Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 25 Feb 2022 12:52:00 +0100
Subject: [PATCH] meson: bump version

---
 ...eson-0.60.2.recipe => meson-0.61.2.recipe} |  4 +--
 ...-0.60.2.patchset => meson-0.61.2.patchset} | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)
 rename dev-util/meson/{meson-0.60.2.recipe => meson-0.61.2.recipe} (93%)
 rename dev-util/meson/patches/{meson-0.60.2.patchset => meson-0.61.2.patchset} (82%)

diff --git a/dev-util/meson/meson-0.60.2.recipe b/dev-util/meson/meson-0.61.2.recipe
similarity index 93%
rename from dev-util/meson/meson-0.60.2.recipe
rename to dev-util/meson/meson-0.61.2.recipe
index c74a2763a..9bec2838e 100644
--- a/dev-util/meson/meson-0.60.2.recipe
+++ b/dev-util/meson/meson-0.61.2.recipe
@@ -4,9 +4,9 @@ build system."
 HOMEPAGE="https://mesonbuild.com/"
 COPYRIGHT="2013-2020 The Meson development team"
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
-CHECKSUM_SHA256="64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
+CHECKSUM_SHA256="0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889"
 PATCHES="meson-$portVersion.patchset"
 PYTHON_VERSION="3.7"
 
diff --git a/dev-util/meson/patches/meson-0.60.2.patchset b/dev-util/meson/patches/meson-0.61.2.patchset
similarity index 82%
rename from dev-util/meson/patches/meson-0.60.2.patchset
rename to dev-util/meson/patches/meson-0.61.2.patchset
index 6f4830ba8..c1951cbc0 100644
--- a/dev-util/meson/patches/meson-0.60.2.patchset
+++ b/dev-util/meson/patches/meson-0.61.2.patchset
@@ -1,4 +1,4 @@
-From 3ec1af7c0f6d364c92767f33f80c1d35a0ee8445 Mon Sep 17 00:00:00 2001
+From be94747ea36d7ec0a2747744d3006d8fe0d42a60 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 3 Aug 2020 11:56:45 +0200
 Subject: Fix include path for boost
@@ -25,14 +25,14 @@ index aadf3f8..f2bf548 100644
 2.30.2
 
 
-From 9fcf7eeb0d72fc035c63f70f9bcd77eb1d05a56f Mon Sep 17 00:00:00 2001
+From 6081acef2fe915a8b05b7d9f30f05554bba0861f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 26 Nov 2021 11:39:48 +0100
 Subject: add support for gcc 2.95.3
 
 
 diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
-index 1eacecf..e7d7937 100644
+index 03c5226..f39c919 100644
 --- a/mesonbuild/compilers/detect.py
 +++ b/mesonbuild/compilers/detect.py
 @@ -415,7 +415,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
@@ -74,3 +74,26 @@ index bc40af4..923a8ef 100644
 -- 
 2.30.2
 
+
+From e72c3cc0ef66d66dc763ba7c0bdc0f5ce8ca2570 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 25 Feb 2022 12:51:24 +0100
+Subject: setup: entry_points
+
+
+diff --git a/setup.cfg b/setup.cfg
+index 585905c..4093664 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -36,7 +36,7 @@ python_requires = >= 3.6
+ setup_requires = 
+ 	setuptools
+ 
+-[options.entry_points]
++[entry_points]
+ console_scripts = 
+ 	meson = mesonbuild.mesonmain:main
+ 
+-- 
+2.30.2
+