gentoo resync : 30.09.2018

4 files changed, 97 insertions, 3 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index d510af52dd19..7306d0777470 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,9 @@
+AUX 0.48.0-multilib.patch 2180 BLAKE2B 8201fe0c2e495671129653ae9fb9ff9135d28d4c49a02d97f0a5d78031272ce34733e95d48cb8b70bd933c939b96b068ab2189856c1281f4c606e9fce419988f SHA512 75facb5b8d668175c75313299ee570028dab266d1e0ce0e7d2d21cec3df1e2308b80008e2af801bfd63b931bf3a8fbc6a70f02dc1f5d371dddaea6365dca0daf
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
 DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
+DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
-EBUILD meson-9999.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
+EBUILD meson-0.48.0-r1.ebuild 989 BLAKE2B 6f114e3eb92f9012dbf302dde1c555c29aa89674e93198aa039a76509ec60f917547884beda3e635dc4e3c6c07c0694a919f1fb408d3dc8fb37e2d7688d01fa5 SHA512 811e92a31c00d6500130efc8f4abee4b91fed903b55d559e1226e00e0b5750270bd485f36274de4a3841f9e3580a5d74bc4372ecf48fdabe150e24ab12620c2c
+EBUILD meson-9999.ebuild 939 BLAKE2B df8ab6f647468ad3451e69eee5cf84ab98191a124e459ac1a65b37e5813c752a9899114c8722eeabcc9b78d8aea3885bfc11c78d20db7df2c52f89ac11c0c9ce SHA512 243878f66c0eb2009e6e79bdd13cf9e1b87d0a58a3c8b008c62229282f9166fb1b8d73e30e5c55d5a566eec8a67b72d27562e6ba7139b11d1a2f6acebab544c9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/0.48.0-multilib.patch b/dev-util/meson/files/0.48.0-multilib.patch
new file mode 100644
index 000000000000..0b488f50cd5b
--- /dev/null
+++ b/dev-util/meson/files/0.48.0-multilib.patch
@@ -0,0 +1,48 @@
+From 3bb300a76ed4d7a614c4a83ddefe86425040ec13 Mon Sep 17 00:00:00 2001
+From: Dylan Baker <dylan@pnwbakers.com>
+Date: Mon, 24 Sep 2018 11:08:19 -0700
+Subject: [PATCH] backends: allow running host arch binaries on compatible
+ build machines
+
+Meson 0.48.0 some validation for using compiled binaries in custom
+targets and generators, which is nice. It didn't take into account
+though that as long as the OS is the same, some architectures support
+running a related architecture natively (x86_64 can run x86 natively,
+for example).
+
+Fortunately we already have a method for covering this case available
+through the Environment class.
+
+Fixes #4254
+---
+ mesonbuild/backend/backends.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
+index 0e7e8e0fe3..ccbbe173fd 100644
+--- a/mesonbuild/backend/backends.py
++++ b/mesonbuild/backend/backends.py
+@@ -13,6 +13,7 @@
+ # limitations under the License.
+ 
+ import os, pickle, re
++import textwrap
+ from .. import build
+ from .. import dependencies
+ from .. import mesonlib
+@@ -731,10 +732,11 @@ def get_regen_filelist(self):
+     def exe_object_to_cmd_array(self, exe):
+         if self.environment.is_cross_build() and \
+            isinstance(exe, build.BuildTarget) and exe.is_cross:
+-            if self.environment.exe_wrapper is None:
+-                s = 'Can not use target %s as a generator because it is cross-built\n'
+-                s += 'and no exe wrapper is defined. You might want to set it to native instead.'
+-                s = s % exe.name
++            if self.environment.exe_wrapper is None and self.environment.cross_info.need_exe_wrapper():
++                s = textwrap.dedent('''
++                    Can not use target {} as a generator because it is cross-built
++                    and no exe wrapper is defined or needs_exe_wrapper is true.
++                    You might want to set it to native instead.'''.format(exe.name))
+                 raise MesonException(s)
+         if isinstance(exe, build.BuildTarget):
+             exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))]
diff --git a/dev-util/meson/meson-0.48.0-r1.ebuild b/dev-util/meson/meson-0.48.0-r1.ebuild
new file mode 100644
index 000000000000..d0fbb01b4722
--- /dev/null
+++ b/dev-util/meson/meson-0.48.0-r1.ebuild
@@ -0,0 +1,43 @@
+# 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-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index a02f93d684e4..aace7f3caa4f 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"