From be88e1d689b3470b0840ffabd7c3093cae10721d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 13 Oct 2017 19:06:49 +0200
Subject: [PATCH] meson: bump version.

* remove upstreamed patch.
---
 ...eson-0.42.1.recipe => meson-0.43.0.recipe} |  3 +-
 dev-util/meson/patches/meson-0.42.1.patchset  | 36 -------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 rename dev-util/meson/{meson-0.42.1.recipe => meson-0.43.0.recipe} (91%)
 delete mode 100644 dev-util/meson/patches/meson-0.42.1.patchset

diff --git a/dev-util/meson/meson-0.42.1.recipe b/dev-util/meson/meson-0.43.0.recipe
similarity index 91%
rename from dev-util/meson/meson-0.42.1.recipe
rename to dev-util/meson/meson-0.43.0.recipe
index 39df0aea0..ba203f1c9 100644
--- a/dev-util/meson/meson-0.42.1.recipe
+++ b/dev-util/meson/meson-0.43.0.recipe
@@ -6,8 +6,7 @@ COPYRIGHT="2013-2017 The Meson development team"
 LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
-CHECKSUM_SHA256="30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b"
-PATCHES="meson-$portVersion.patchset"
+CHECKSUM_SHA256="c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340"
 PYTHON_VERSION="3.6"
 
 ARCHITECTURES="any"
diff --git a/dev-util/meson/patches/meson-0.42.1.patchset b/dev-util/meson/patches/meson-0.42.1.patchset
deleted file mode 100644
index ece0d995b..000000000
--- a/dev-util/meson/patches/meson-0.42.1.patchset
+++ /dev/null
@@ -1,36 +0,0 @@
-From 88b4446f1a7b13dd3c40924b1e172e56e18f8f51 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sun, 16 Apr 2017 13:57:03 +0200
-Subject: Haiku patch
-
-
-diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
-index 0263768..f67ae52 100644
---- a/mesonbuild/mesonlib.py
-+++ b/mesonbuild/mesonlib.py
-@@ -218,6 +218,9 @@ def is_osx():
- def is_linux():
-     return platform.system().lower() == 'linux'
- 
-+def is_haiku():
-+    return platform.system().lower() == 'haiku'
-+
- def is_windows():
-     platname = platform.system().lower()
-     return platname == 'windows' or 'mingw' in platname
-diff --git a/run_tests.py b/run_tests.py
-index d0a67e8..5d0f77e 100755
---- a/run_tests.py
-+++ b/run_tests.py
-@@ -125,7 +125,7 @@ if __name__ == '__main__':
-                 backend = Backend.xcode
-             break
-     # Running on a developer machine? Be nice!
--    if not mesonlib.is_windows() and 'TRAVIS' not in os.environ:
-+    if not mesonlib.is_windows() and not mesonlib.is_haiku() and 'TRAVIS' not in os.environ:
-         os.nice(20)
-     # Appveyor sets the `platform` environment variable which completely messes
-     # up building with the vs2010 and vs2015 backends.
--- 
-2.12.2
-