gentoo resync : 25.04.2020

3 files changed, 71 insertions, 2 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ae35453e1547..1368d7e13f38 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,9 @@ AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216e
 AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
 DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
-EBUILD meson-0.52.1.ebuild 2099 BLAKE2B 2ec3ee910716247d78f701c283d1d98de405c142e8f420bf5f381703f072d0cc1ca72e53dbac2a61c15dd5a037a24180daa04a9e6f737a3135a72b75670014b9 SHA512 dc59db1ff0e24206bb18b3fdc1862bf3bc4fab86d8b66ec6b96e6b5cfc108c83381ecdd46ede0accbce0299db43f5469feed7cece8776ed7fe739aaedcac7880
+DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
+EBUILD meson-0.52.1.ebuild 2100 BLAKE2B da9c9eefec2f28acc8df8fc2e0484c781eef4bd1485826ca58717563a4d0f1e187653ae291ebb1f8c8a7da32c206d8dc54858fdedca54e5427d576eb1f9ab8ff SHA512 7794fdb872d5399e7315f781836de48e263c79ee7069d5c13005e7a028999d4aef282a67d56d4e95dcb4a784cb2e60968301f8792aec276d78c08062a1e63267
 EBUILD meson-0.53.1.ebuild 1980 BLAKE2B 97d27410b495edd1c85818593d2422031825e2933793e9c3b838b4fad7c339a7a7b4543f371449c9e8cc150e82d8033f4c371a299c3ba4a54774f55318bfb9fe SHA512 3316d47f924e64c576e9acc74ab2912c503a4698c5facc7c366e4a249dd0ba188ab975ba2a29d5afcf703d34ba8431b311e07b7c59127f1bad7b25c2d0a3bb6b
+EBUILD meson-0.54.0.ebuild 1543 BLAKE2B d888fe595fc099515fd1ea247f82617560a99f75d6c9eedf4966c60a6429d16db3a7ed894d9ebcf7693e3b391c48cc59d2729b3a5625aad923d1f39057996bf3 SHA512 d99ef333252c2d5222156f777a2ac6c31360f3ff12f5f1790bb084dc47b59c8ae3a087a19a963b95e022f133d24b20488436e0ffc63dad0b1e0e0b7cae8e4b3f
 EBUILD meson-9999.ebuild 1543 BLAKE2B d888fe595fc099515fd1ea247f82617560a99f75d6c9eedf4966c60a6429d16db3a7ed894d9ebcf7693e3b391c48cc59d2729b3a5625aad923d1f39057996bf3 SHA512 d99ef333252c2d5222156f777a2ac6c31360f3ff12f5f1790bb084dc47b59c8ae3a087a19a963b95e022f133d24b20488436e0ffc63dad0b1e0e0b7cae8e4b3f
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
index 0eced5aeae4e..2408f6bf1444 100644
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ b/dev-util/meson/meson-0.52.1.ebuild
@@ -10,7 +10,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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild
new file mode 100644
index 000000000000..6154c7a5df15
--- /dev/null
+++ b/dev-util/meson/meson-0.54.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+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
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		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
+}