From fbc2ce256a57d79917378e5e16916771c58c84e2 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 6 Oct 2018 20:26:14 -0400
Subject: dev-util/meson: backport fix for meson test -u

Closes: https://bugs.gentoo.org/667010
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 dev-util/meson/files/0.48.0-test-u.patch | 28 ++++++++++++++++++++
 dev-util/meson/meson-0.48.0-r1.ebuild    | 43 -------------------------------
 dev-util/meson/meson-0.48.0-r2.ebuild    | 44 ++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 43 deletions(-)
 create mode 100644 dev-util/meson/files/0.48.0-test-u.patch
 delete mode 100644 dev-util/meson/meson-0.48.0-r1.ebuild
 create mode 100644 dev-util/meson/meson-0.48.0-r2.ebuild

(limited to 'dev-util/meson')

diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch
new file mode 100644
index 000000000000..099d4686b963
--- /dev/null
+++ b/dev-util/meson/files/0.48.0-test-u.patch
@@ -0,0 +1,28 @@
+From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001
+From: Masanori Kakura <kakurasan@gmail.com>
+Date: Tue, 25 Sep 2018 18:04:06 +0900
+Subject: [PATCH] environment: Use os.path.basename() when checking
+ mesonlib.meson_command
+
+Without this, when one of Meson's parent directories contains
+"python", unexpected option "-u" will be passed to Meson.
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 7a44f2fd..a0c2fda4 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -375,7 +375,7 @@ class Environment:
+ 
+     def get_build_command(self, unbuffered=False):
+         cmd = mesonlib.meson_command[:]
+-        if unbuffered and 'python' in cmd[0]:
++        if unbuffered and 'python' in os.path.basename(cmd[0]):
+             cmd.insert(1, '-u')
+         return cmd
+ 
+-- 
+2.19.0
+
diff --git a/dev-util/meson/meson-0.48.0-r1.ebuild b/dev-util/meson/meson-0.48.0-r1.ebuild
deleted file mode 100644
index d0fbb01b4722..000000000000
--- a/dev-util/meson/meson-0.48.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/0.48.0-multilib.patch
-)
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild
new file mode 100644
index 000000000000..aa2d0f068eb1
--- /dev/null
+++ b/dev-util/meson/meson-0.48.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/0.48.0-multilib.patch
+	"${FILESDIR}"/0.48.0-test-u.patch
+)
+
+python_test() {
+	${EPYTHON} run_tests.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
-- 
cgit v1.2.3-65-gdbad