gentoo resync : 28.04.2019

4 files changed, 78 insertions, 4 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fdd5ffefadaf..be4f745729fc 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,9 @@
 AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92e364c5c55debf61c115559cacb676596e98a9e01970661b16c4a95bfbf161d6c02e314bbe746979cb77c8f7f6dc5ce7fa6 SHA512 c856436331f6d80912e0519303051e49f4c2c08d348e575ff71b2628621ce752148bccf7aa348d0f27d7df11ff15ee96439d4438d0a2755e1f6c66d2be0ac942
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
+DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
-EBUILD meson-0.49.2.ebuild 1772 BLAKE2B 465819137a0ad5b52547d88c47a4ea9ac591440e98e1de4deb7c83e9753a16114e0a4a9e84bf0c0c52a2d05ef77baca6ffdc0d30d720aaee6da45a73f8b7b6d2 SHA512 d0043e6282a35030ece03c6ff20b673843b049767ce89f1c1a7832a69931f6ca3773772ec1d99a3673970a5d46056c6aefd7c2acb4c5704f5fce8cfadb737e0a
-EBUILD meson-9999.ebuild 1711 BLAKE2B b2ab12ee5111a491c9e5278cc0cc49cd8acead98418272927c8518c58c31ce7a5754ca8092a749ba40ba35558b11fc3ceffbb8fde736aa442efc71d431e834be SHA512 e502aefc4aec2f7833e9cdc8921591ce0f2e447e029494b50f83df5be7957224ff64e53d6b6ef320b24fe84d3a5d393337098a71a6cde45d51d92504675bd6e4
+EBUILD meson-0.49.2.ebuild 1765 BLAKE2B afa08e7f0136b0db159a09c866bfe8b7244abe3d95ea460ddb450c07c0ad15601b0c4f11ba9136fc85ba01cc72514a9205d6ee13eccc43e97947689971bf05a8 SHA512 658cc3789a6f13a16159182d6074940e8d4dfcb74855129d926368789e3c6b2aca084ceaf923d790cdc7b8b843b5b1c195054990f51ee358ff99ac67c1fae5e0
+EBUILD meson-0.50.1.ebuild 1711 BLAKE2B afaca717bf2a872604765f13ae718d58d18fd47d506eecdfb20732a946b1e6fdadb01f987f1458ee82ab78523e14a86482c079bc5420c453313c7d404a622846 SHA512 30f19f93d1d3f1ecdea9b7174ace190904a94f81793e4085c702ec57be5172eca2ded880cf3735e70abe9c714ac4c3daeb09a00b738dc7620ff5214002b2bf23
+EBUILD meson-9999.ebuild 1711 BLAKE2B afaca717bf2a872604765f13ae718d58d18fd47d506eecdfb20732a946b1e6fdadb01f987f1458ee82ab78523e14a86482c079bc5420c453313c7d404a622846 SHA512 30f19f93d1d3f1ecdea9b7174ace190904a94f81793e4085c702ec57be5172eca2ded880cf3735e70abe9c714ac4c3daeb09a00b738dc7620ff5214002b2bf23
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
index 09b40845cc6a..f598f3fd1ae8 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.49.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.50.1.ebuild b/dev-util/meson/meson-0.50.1.ebuild
new file mode 100644
index 000000000000..11bb7c9a56f4
--- /dev/null
+++ b/dev-util/meson/meson-0.50.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+
+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
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+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 89b176910cb5..11bb7c9a56f4 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
 
 if [[ ${PV} = *9999* ]]; then