gentoo resync : 22.10.2018

3 files changed, 53 insertions, 5 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index cd879f0785ff..e73ef706a785 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -4,8 +4,10 @@ AUX test-llvm.patch 872 BLAKE2B f67b6f266a86a4fe72d8a6c39b2b4df07a5f13404f01e8da
 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
+DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-0.48.0-r2.ebuild 1196 BLAKE2B 1e36c78920fa7897f72e497dc68c76e127cffc0d5491fc4ff7a23aa6c1e2a67543683ef753ea1b55957b526ac7c206e64c8f4abd83fc32993573d3cf280e8473 SHA512 f7a6f2ceb491a429a2d03e814bc746c318c766aca488a578bb2424999e56c4f5b9b1afa4734af6f88868eb7863c69a3b5f34a6c9535bc6a1772968aa6be23151
-EBUILD meson-9999.ebuild 1124 BLAKE2B 38282459eddadc22bf10e3ba29373f06003b72930f60d74546aba436c164cdb26394f450b3fa85ec972465e2c171682d7cc2b0cf436ff7249bed50c20e9b82fa SHA512 80a17e57a3547bcf5e2f90ca20924d56beb825c57daf5a180196301bd11d1437439742f720bef8e4325f2517bdad8accc862f7b5fe362629b822281c6179ba0c
+EBUILD meson-0.48.1.ebuild 1130 BLAKE2B 9046928f6f8a61db1b953e68e98335404faa62db738837082a52c063a3d44aff506979062a4695329044028b538374f8c5405bb4789125c5405098539bd0c1b2 SHA512 091bd3265a8444aa24e28dbd0fa43fe96869ba79f4394c6ea7d3b21b6c34c575d409b709f6c608fff208c60ca59bcf9d71ff3dfa2ca32f2a9d62342a8aa828d3
+EBUILD meson-9999.ebuild 1080 BLAKE2B 5348a19505f572d16e6e1650591631efc4ec4ec19040e9cf462e4466d188a6c374f110d7985ae70dc9d313f5261e880816a8ca347a475e9ade130935dd785ff4 SHA512 c3832e217c487ae1e2196d17a009a1602c3b0aa9b216ae0f72d0532d4ca172af5149305371c1940a575398e136ac130e0b9be71b57c19d40363d97f1a62d38c5
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.48.1.ebuild b/dev-util/meson/meson-0.48.1.ebuild
new file mode 100644
index 000000000000..3b76628728cb
--- /dev/null
+++ b/dev-util/meson/meson-0.48.1.ebuild
@@ -0,0 +1,50 @@
+# 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=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/0.48.0-multilib.patch
+)
+
+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 0d5b9b4711c3..9e0fbd73864a 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -24,10 +24,6 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}"/test-llvm.patch
-)
-
 python_test() {
 	(
 		# test_meson_installed