gentoo resync : 18.11.2018

3 files changed, 51 insertions, 3 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index a40ccea14c1c..23ca690c3f96 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,9 +5,11 @@ DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236b
 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
+DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
-EBUILD meson-0.47.1.ebuild 939 BLAKE2B 7ef511941dfdf7919d03588c824cbc7eb8c2b205551836742e02edbd39b737a57efada2c4973826f77e711bc8a12e38f0b7aed085a329cbc267aff4bd03ef12c SHA512 0b886e2c31ba4bc3d72e923dcb9d17e16f5f17d7b5dcfae49a0dad4d628bdf86d3c0e0c397f6e56128a09765468986e1085418a8109e1f571876892ef1b1d488
+EBUILD meson-0.47.1.ebuild 926 BLAKE2B 779aaf05ce0d6481cdff78e5fbbe14ec5ca8b1494e28317bb7aeb2c8ad6554d8645477b29400ea1e29f2fd2b433c3424444084e67635d603281d7cad59ce84f8 SHA512 19b89992fb1b9cfc79d07ed6d12ef482eb88232b659887725e894fa2fafcb6b67093bcaf4989783ecfe9a9f1a2a3c2b85d52e7a074bd500405e33d8df34b09f4
 EBUILD meson-0.48.0-r2.ebuild 1205 BLAKE2B 6b7b273e23e9e28e8fe78d20948802ed6834d017930bd8ddb286a0c01af68fb9d91443bbebbf8c1a82433759a6b74be85c744fb1fd812d3e2b2b8e3bdefe2105 SHA512 f107c74333c075cccae7e91afb465ced0c7f8d21b5c13849b425c6581567d854a663f0f452efb7ba7ad6bc145c2d8c8e5bdef80a12770c46fc7fd9e038646420
 EBUILD meson-0.48.1.ebuild 1139 BLAKE2B 813a717e745a1adf42be7e66a7fda714b9244a80859b8983470ae34abaeb4c1e09c28d8538ca7a9560131609ed5408c7f9699f92200847341d06ec86b6e02882 SHA512 ca5ce3d1069263b4b4a88535c15e768ee7131e0a8a1155c39c614dee20a8eac7f598ce7daa270853fa968ad0e2ab84078bcbff251d4744c0de7e9f91c433ba96
+EBUILD meson-0.48.2.ebuild 1089 BLAKE2B 67f08d54245c15ea50af9488c6325e1c995354dcf9bea444b5f9c96fa1f2781d9f02a8b91cb2aeabb6f6512296b56834bfce0058a53f786e0d95a1dcba5f3373 SHA512 379127b8f22c610c6b3479ed97f4eec880bbd81b0e52ac63e31fe1347003195031d8187a08c76fea5fca51b94d8094fd049c284e0548c56ce8009af8d15f2c25
 EBUILD meson-9999.ebuild 1089 BLAKE2B 67f08d54245c15ea50af9488c6325e1c995354dcf9bea444b5f9c96fa1f2781d9f02a8b91cb2aeabb6f6512296b56834bfce0058a53f786e0d95a1dcba5f3373 SHA512 379127b8f22c610c6b3479ed97f4eec880bbd81b0e52ac63e31fe1347003195031d8187a08c76fea5fca51b94d8094fd049c284e0548c56ce8009af8d15f2c25
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.47.1.ebuild b/dev-util/meson/meson-0.47.1.ebuild
index 0f0d9d52aa8e..4fe83c922960 100644
--- a/dev-util/meson/meson-0.47.1.ebuild
+++ b/dev-util/meson/meson-0.47.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x64-macos ~x64-solaris"
+	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
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
new file mode 100644
index 000000000000..d7d772117ac9
--- /dev/null
+++ b/dev-util/meson/meson-0.48.2.ebuild
@@ -0,0 +1,46 @@
+# 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="${DEPEND}"
+
+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
+}