From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- dev-util/meson/Manifest | 11 ++- .../meson/files/meson-0.49-python3.5-tests.patch | 34 ---------- dev-util/meson/meson-0.48.2.ebuild | 73 -------------------- dev-util/meson/meson-0.49.2.ebuild | 76 --------------------- dev-util/meson/meson-0.51.1.ebuild | 9 ++- dev-util/meson/meson-0.51.2.ebuild | 79 ++++++++++++++++++++++ dev-util/meson/meson-9999.ebuild | 7 ++ 7 files changed, 98 insertions(+), 191 deletions(-) delete mode 100644 dev-util/meson/files/meson-0.49-python3.5-tests.patch delete mode 100644 dev-util/meson/meson-0.48.2.ebuild delete mode 100644 dev-util/meson/meson-0.49.2.ebuild create mode 100644 dev-util/meson/meson-0.51.2.ebuild (limited to 'dev-util/meson') diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index c2db450b7710..b03e50f44506 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,11 +1,8 @@ -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 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c -EBUILD meson-0.48.2.ebuild 1737 BLAKE2B eb62b3cb156cd4c686bc9da4b5e69a4ab21dbcf61ca48740724e3fb88468c479f23c9e524825d18c528cc38f4aba067c8f5144530911fac94b0b1344d26ad57f SHA512 161336944be7a6bbe552f63d2712f24aaabe634b73a0bf5631bb73c5001164755f6488c1cf6590e5ef060cc7bd02af35863d147ea753f2ac4a090898030519a0 -EBUILD meson-0.49.2.ebuild 1764 BLAKE2B 897dc3089b7a4e645dafe38e407a02723e182f53102b6a0a953eac810124bfbf34c6495638dee835fd940957bd69dbc3887c67dfe81490282c839dc0fdeebfad SHA512 490420403cc9c56b6d652beba7f89964020dbdae40781b83385160a09d3ee797a9c2589fff2fc359fb9f955d0575b58d30b3e9ae9dd8b3b6c480665d0efe1667 +DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0 EBUILD meson-0.50.1.ebuild 1717 BLAKE2B fef0e6f1b04e505a25759907af4a0839241a0e3334ee08525f1e91f2ec47dcc36f08ec29cfc80a9b28e0863550724b19590dea1c182c079871a432b36b06a63d SHA512 81d3c76ca483b5ab174a5ba1b1b3b61dff1a03405668f0ee03ba265049684da03c3abe02241135d48d5ca957d7b94095e1749684eba258b88cb7d854239a507b -EBUILD meson-0.51.1.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0 -EBUILD meson-9999.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0 +EBUILD meson-0.51.1.ebuild 1955 BLAKE2B 262d70d7d4321213248c7fecf2370f921d882c4571d904079605838b3d21815825e265346bfb33f115be6127264a58c495476ed335650c9345bd03433c985584 SHA512 61912689b45e4823e62da762b65d0063267fef830595a94cf29fe1a2e95cc9fca8db2fff72df70fc2abd4a68177f4d8cb365dc7dfd41d2238a3488d92d3a4799 +EBUILD meson-0.51.2.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f +EBUILD meson-9999.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467 diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch deleted file mode 100644 index 640348b2bc2d..000000000000 --- a/dev-util/meson/files/meson-0.49-python3.5-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Fri, 11 Jan 2019 18:03:15 +0000 -Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess - invocation - -subprocess.run() didn't get the encoding parameter until 3.6. - -Signed-off-by: Simon McVittie ---- - run_unittests.py | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 342ad883..e1246140 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests): - ret = subprocess.run( - ["{}"] + extra_args, - stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- encoding='utf-8') -- print(ret.stdout) -- print(ret.stderr, file=sys.stderr) -+ stderr=subprocess.PIPE) -+ print(ret.stdout.decode('utf-8')) -+ print(ret.stderr.decode('utf-8'), file=sys.stderr) - sys.exit(ret.returncode) - - if __name__ == '__main__': --- -2.21.0 - diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild deleted file mode 100644 index b6374c8e969f..000000000000 --- a/dev-util/meson/meson-0.48.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2016-2019 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 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() { - if tc-is-gcc; then - # LTO fails for static libs because the bfd plugin in missing. - # Remove this workaround after sys-devel/gcc-config-2.0 is stable. - # https://bugs.gentoo.org/672706 - tc-getPROG AR gcc-ar >/dev/null - fi - distutils-r1_src_test -} - -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.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild deleted file mode 100644 index 795f89a188d2..000000000000 --- a/dev-util/meson/meson-0.49.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2016-2019 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 ~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 - ) -" - -PATCHES=( - "${FILESDIR}/meson-0.49-python3.5-tests.patch" -) - -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-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild index 33a23e5a8708..74eddfbf1864 100644 --- a/dev-util/meson/meson-0.51.1.ebuild +++ b/dev-util/meson/meson-0.51.1.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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi inherit distutils-r1 toolchain-funcs @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} dev-libs/gobject-introspection dev-util/ninja dev-vcs/git + sys-libs/zlib[static-libs(+)] virtual/pkgconfig ) " @@ -38,6 +39,10 @@ python_prepare_all() { # 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 } @@ -46,6 +51,8 @@ src_test() { 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 } diff --git a/dev-util/meson/meson-0.51.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild new file mode 100644 index 000000000000..782127bd368c --- /dev/null +++ b/dev-util/meson/meson-0.51.2.ebuild @@ -0,0 +1,79 @@ +# 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-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 + 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-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 33a23e5a8708..782127bd368c 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} dev-libs/gobject-introspection dev-util/ninja dev-vcs/git + sys-libs/zlib[static-libs(+)] virtual/pkgconfig ) " @@ -38,6 +39,10 @@ python_prepare_all() { # 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 } @@ -46,6 +51,8 @@ src_test() { 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 } -- cgit v1.2.3