From c6a6d5a685f821b34e1bdbff95f37a249263559e Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 20 Oct 2020 15:30:08 +0000 Subject: [PATCH] dev-util/meson: Sync package with the upstream Signed-off-by: Sayan Chowdhury --- .../portage-stable/dev-util/meson/Manifest | 5 +- .../dev-util/meson/meson-0.48.2.ebuild | 73 --------------- .../dev-util/meson/meson-0.49.0.ebuild | 73 --------------- .../dev-util/meson/meson-0.49.1.ebuild | 73 --------------- .../dev-util/meson/meson-0.49.2.ebuild | 73 --------------- .../dev-util/meson/meson-0.55.3.ebuild | 92 +++++++++++++++++++ .../dev-util/meson/meson-9999.ebuild | 51 ++++++---- .../dev-util/meson/metadata.xml | 8 +- 8 files changed, 132 insertions(+), 316 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.48.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest index f7ebfa30bf..56d8beb192 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest @@ -1,4 +1 @@ -DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f -DIST meson-0.49.0.tar.gz 1338576 BLAKE2B 6ae3152af337591928232c5dea8331185c8aa7f712019ed3635269544e4506fc0d9195d3d59128c5e5a286aff8ad1e3a0edf3afe28ab469989753c3c988ddae3 SHA512 6aba2a1c1dbf247fc30526215dd499b7c918c19f7f16a7216f5762e95cde39b7cfae2a1ebca1e2ea5323f2f855ed98c99af1b9048aa00bd1ffbe8da20ef2121b -DIST meson-0.49.1.tar.gz 1340585 BLAKE2B 7df52f68948c74d4d713d57406a7b496e33740e43ea069b5cb6474a80b94800f8af7983413f3154eb2e6b7f0ea8df51e7359b8b7c6661f454dbb9a21ccf9bdc6 SHA512 cc955509d2c82b12d347f7a670a0e2abf5f6a4455dda3d53ec4abb0930b5f1c4a0ff996223ba5a5333bfec66e5d3fb3448a8187d4640e4b65397fc3e0e43dc72 -DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d +DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.48.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.48.2.ebuild deleted file mode 100644 index a6397466e0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.48.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-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/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.0.ebuild deleted file mode 100644 index 6149ebc1ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-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 - ) -" - -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/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.1.ebuild deleted file mode 100644 index 6149ebc1ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-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 - ) -" - -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/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.2.ebuild deleted file mode 100644 index 6149ebc1ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.49.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-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 - ) -" - -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/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild new file mode 100644 index 0000000000..533774fb28 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.55.3.ebuild @@ -0,0 +1,92 @@ +# Copyright 2016-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Open source build system" +HOMEPAGE="https://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 disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + + # https://github.com/mesonbuild/meson/issues/7203 + -e 's/test_templates/_&/' + + # Broken due to python2 wrapper + -e 's/test_python_module/_&/' + ) + + sed -i "${disable_unittests[@]}" run_unittests.py || die + + # Broken due to python2 script created by python_wrapper_setup + 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/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild index 6149ebc1ee..a13eeb7ea1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild @@ -1,54 +1,73 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2016-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) +EAPI=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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi inherit distutils-r1 toolchain-funcs DESCRIPTION="Open source build system" -HOMEPAGE="http://mesonbuild.com/" +HOMEPAGE="https://mesonbuild.com/" LICENSE="Apache-2.0" 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 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 + local disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + + # https://github.com/mesonbuild/meson/issues/7203 + -e 's/test_templates/_&/' + + # Broken due to python2 wrapper + -e 's/test_python_module/_&/' + ) + + sed -i "${disable_unittests[@]}" run_unittests.py || die + + # Broken due to python2 script created by python_wrapper_setup + rm -r "test cases/frameworks/1 boost" || 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 + 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 - distutils-r1_src_test } python_test() { diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml index 301e400a3d..d762c3aed0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml @@ -1,14 +1,14 @@ - - williamh@gentoo.org - William Hubbs - floppym@gentoo.org Mike Gilbert + + williamh@gentoo.org + William Hubbs + meson