From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-util/meson/Manifest | 13 ++-- .../files/0.52.1-test_pkgconfig_gen_deps.patch | 46 ++++++++++++ dev-util/meson/meson-0.51.1.ebuild | 79 -------------------- dev-util/meson/meson-0.51.2.ebuild | 10 +-- dev-util/meson/meson-0.52.0.ebuild | 79 -------------------- dev-util/meson/meson-0.52.1.ebuild | 86 ++++++++++++++++++++++ dev-util/meson/meson-0.53.0.ebuild | 86 ++++++++++++++++++++++ dev-util/meson/meson-9999.ebuild | 11 ++- 8 files changed, 237 insertions(+), 173 deletions(-) create mode 100644 dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch delete mode 100644 dev-util/meson/meson-0.51.1.ebuild delete mode 100644 dev-util/meson/meson-0.52.0.ebuild create mode 100644 dev-util/meson/meson-0.52.1.ebuild create mode 100644 dev-util/meson/meson-0.53.0.ebuild (limited to 'dev-util/meson') diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 2f638351baaf..7a3aa987bd1f 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,8 +1,9 @@ -DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c +AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0 -DIST meson-0.52.0.tar.gz 1507218 BLAKE2B d3d869cf4a992ba89f150960ed742ac5da2b63b60a3583f2c4c7cce1e2a86f5101a90a05f59000af70c7ada00c119268df87aaadc55ccee50b85c24e308c1d5c SHA512 b32206c5499580a74bb5442d21263b5328cc3302c3226452fb3a2434fdcf55d5fc16fc841102b09a85abc19dbd00e836a571f917833ef3d726d84524f89b2e1c -EBUILD meson-0.51.1.ebuild 1940 BLAKE2B 6dc6c1a49dffa23edcab9da8e60cf20d9e57d2ce612a6adf7e5cc92f21b0eaef6b241f5dccbfbdfa05de8542b473ff175f639eb5abbcc0fa23e8033ac6988628 SHA512 e3afe681ac5b465bac3d80ed6f083750430971aec0dc82ecd98910cf27f0ffd0aab40e80ae9713fd471e62bb0f7298f993564d9fc150ceba66ca02214b6701f2 -EBUILD meson-0.51.2.ebuild 1941 BLAKE2B a2037c7b214b9349c956c7275c7ad187bcdec091b316a401e312e959242fcf4ce913291c1eaf63169fcf647794e1276dacee26eff3207128f778c9447b9ad605 SHA512 dbba78b53f1ba5f52ddc8c9bc4fc6abfb276c713253bcce475d39214bf1dbdb6934ec79614946b63d30efc3f440609c000007f9fa0307f90641a8aef234fdfea -EBUILD meson-0.52.0.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223 -EBUILD meson-9999.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223 +DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41 +DIST meson-0.53.0.tar.gz 1548138 BLAKE2B 42340645f3417930856e05da9b479e9352e1fe3ea567929215f433a04fe3b0216d6de8693428be058048d2bd9c8d21031b19d0d5599a99e8f61aa9b6da689bf7 SHA512 e79a093aba5df137d463ac1334199833b8374689b2aba1cfd935fc484fff524d84bf6c2b3fcd9371b67daade0e18d1fe5e47dccdb7cf416932e86b83f49fec73 +EBUILD meson-0.51.2.ebuild 1913 BLAKE2B 8b3ff8f9a249c018a67dbf3a37954ce9b0dab5876e5f06a8066384958f55ef1037f2823b186334478237b450343e06bfdaa1672704c281355e008362807ecbe8 SHA512 6623c39876b25df3bd72b29d8a2512e12f0dad2791aedd6bbdbec32b6553ccce50b4aeb3b7400cd3437f778e6c3ede8935537851b1ca78e2277c70d9785779e4 +EBUILD meson-0.52.1.ebuild 2056 BLAKE2B 97daa03333835f4d5ef3920de9ba23f4ec7e0cf74fd6d3838b82c59bc6991f5b7531d53668bf43035aac319b096bdef66c74b74d9438418347c8087673bef295 SHA512 dff49479711a176066a415d5ebb9626fd7ba9f554fda9921e392d8645bb04c3bc07af23181670014083a4132fdb9a8dc95db44f7891b355c2dcf3c6a8ae2608c +EBUILD meson-0.53.0.ebuild 2069 BLAKE2B cadf14d173234effe76c0444aa6c235bbe9f162b0523228e46989d75e1297517e22c118b402e6d0d9c1e29ebd7f48d82a36b408cfec124eaf0eea6334efd400b SHA512 93e39c8181e43e1b30226482bf90cffa3d3b4dde70334d0afcc7bfae9d4920702c240dc0e834758982fd5f27b5d2c7a5cbee3973eb148835cca9e004c568826a +EBUILD meson-9999.ebuild 1995 BLAKE2B 077063da3cd5c8458313b759da409e2f73177e1418b3ee318eb60f474b62e6d822b36ee78179728b916ba1b6c3116b29009c6ec2b6e88b16cd681d5fb47d4dd8 SHA512 abfe6967a70dc0c4b951e304ccd271741d53a9cc10c1051d0a97afac6f2e5fe52ed31f729f15822c8bdfc09f461f2df8ede06b854733b6e699bc392fa7a40c4b MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467 diff --git a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch new file mode 100644 index 000000000000..ec753e00230a --- /dev/null +++ b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch @@ -0,0 +1,46 @@ +From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Mon, 13 Jan 2020 23:46:09 -0500 +Subject: [PATCH] test_pkgconfig_gen_deps: set + PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib + +pkgconf automatically prunes "system library paths" from its output. The +system library paths depend on the system toolchain. A common value on a +64-bit system is as follows: + +/lib64:/usr/lib64:/usr/local/lib64 + +So, if -L/usr/lib64 appears in the Libs section, it will be pruned from +the output of pkg-config --libs. + +The pc files generated for this test contain something like this: + +libdir=/usr/lib +Libs: -L${libdir} ... + +pkgconf may not consider /usr/lib to be a system library path, so it is +not pruned as the test expects. To work around this, override the +compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH +environment variable. + +Fixes: https://github.com/mesonbuild/meson/issues/6004 +--- + run_unittests.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/run_unittests.py b/run_unittests.py +index 898f05e54d..5a60b9b6a4 100755 +--- a/run_unittests.py ++++ b/run_unittests.py +@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self): + privatedir2 = self.privatedir + + os.environ +- env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])} ++ env = { ++ 'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]), ++ 'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib', ++ } + self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env) + + # pkg-config strips some duplicated flags so we have to parse the diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild deleted file mode 100644 index 2d3a813898bf..000000000000 --- a/dev-util/meson/meson-0.51.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2016-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 ~riscv s390 sh 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 )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - dev-util/ninja - dev-vcs/git - sys-libs/zlib[static-libs(+)] - 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 - - # ASAN is unsupported on some targets - # https://bugs.gentoo.org/692822 - sed -i -e 's/test_pch_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 - # 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 -} diff --git a/dev-util/meson/meson-0.51.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild index 2025bfdfa9ec..f7c71e2ff810 100644 --- a/dev-util/meson/meson-0.51.2.ebuild +++ b/dev-util/meson/meson-0.51.2.ebuild @@ -1,15 +1,16 @@ -# Copyright 2016-2019 Gentoo Authors +# Copyright 2016-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) +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 sh 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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi inherit distutils-r1 toolchain-funcs @@ -22,8 +23,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} +DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection diff --git a/dev-util/meson/meson-0.52.0.ebuild b/dev-util/meson/meson-0.52.0.ebuild deleted file mode 100644 index 6a59a76c31ba..000000000000 --- a/dev-util/meson/meson-0.52.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2016-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 ~riscv ~s390 ~sh ~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 )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - dev-util/ninja - dev-vcs/git - sys-libs/zlib[static-libs(+)] - 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 - - # ASAN is unsupported on some targets - # https://bugs.gentoo.org/692822 - sed -i -e 's/test_pch_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 - # 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 -} diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild new file mode 100644 index 000000000000..232e93978e1a --- /dev/null +++ b/dev-util/meson/meson-0.52.1.ebuild @@ -0,0 +1,86 @@ +# 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 sh 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 + ) +" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch + ) + + # 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 + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + + # Requires python2 + rm -r "test cases/frameworks/1 boost" || 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 + # 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 +} diff --git a/dev-util/meson/meson-0.53.0.ebuild b/dev-util/meson/meson-0.53.0.ebuild new file mode 100644 index 000000000000..c03f936be1ba --- /dev/null +++ b/dev-util/meson/meson-0.53.0.ebuild @@ -0,0 +1,86 @@ +# 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 ~sh ~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 + ) +" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch + ) + + # 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 + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + + # Requires python2 + rm -r "test cases/frameworks/1 boost" || 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 + # 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 +} diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 6a59a76c31ba..1cb26feeb184 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -1,8 +1,9 @@ -# Copyright 2016-2019 Gentoo Authors +# Copyright 2016-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS="rdepend" if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" @@ -22,8 +23,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} +DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection @@ -43,6 +43,9 @@ python_prepare_all() { # https://bugs.gentoo.org/692822 sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die + # Requires python2 + rm -r "test cases/frameworks/1 boost" || die + distutils-r1_python_prepare_all } -- cgit v1.2.3