From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-util/meson/Manifest | 6 +- dev-util/meson/meson-0.62.2.ebuild | 2 +- dev-util/meson/meson-0.63.0.ebuild | 110 +++++++++++++++++++++++++++++++++ dev-util/meson/meson-0.63.0_rc2.ebuild | 110 --------------------------------- 4 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 dev-util/meson/meson-0.63.0.ebuild delete mode 100644 dev-util/meson/meson-0.63.0_rc2.ebuild (limited to 'dev-util/meson') diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 33f6f8f4fa17..8ce9f66eef11 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -3,11 +3,11 @@ DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195 DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195 -DIST meson-0.63.0rc2.tar.gz 2059282 BLAKE2B 4b90ccc87fddcd9d1e6edc71d508990e68da8eeb6349de76f170a4951d64b106d098fc23ef46424b6af2210ccc5be1d79a5c12f18c2ac70c3f8162ceaa4e2b6b SHA512 898e2dbb8b1dc4145c70c9042054cd2bc9568ce363cfb9b9ac697f2d8f406f7d4e312f7c7233b1cfd8d74946b253d597231d2dbc4f7803f98a33cdd03237a1a5 +DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea EBUILD meson-0.60.3.ebuild 2678 BLAKE2B 1b602648e5c7eb7be683acf70c759499f95e3a777b42dd1e0b7d26edfa9c3b468b7b2d9a1962240f14efbb569654e1d937da3a505c8e0f68f2700c1d5ad5f2f6 SHA512 2aaf4796facbe63668cf4ae702d0a1a13cd56de0760ea803acbd48d491a2eaa76839b8a43dd1b077a9aaac8a7da416fa7de840107479b261fdaa2895a44d99c5 EBUILD meson-0.61.4-r2.ebuild 2921 BLAKE2B 9ef05e7b1f2eaa0220aa2932cfdf6eaa77752bb7ae8a63e5f05ec86cbffe4155bb1f7ff36fb11a045e14b3a45d1a6836c8fad381058000d63edd004249ce135c SHA512 3aeca22ff744634526306de74e995d69e1cf2c0ef7b367567b6babf973366dd2e84b8e073d84c5872355e6420da6557be96876a261a17983285a1a0799c7148f EBUILD meson-0.62.1.ebuild 2857 BLAKE2B e1fe1482234d090c12b995d6bcf56336c299d2759d6f0e1e487598021a5c551a175d04ddd29f29fd516ce87137cf32aa614dedbedd304a207622e1a79ec700f9 SHA512 29cf1f26c8c2449f9aba2ee2d554514df0f1244be206255702edd20a5a91f89ae01c88006c55890dee7812ed08828f4a2600358e3248eb8752972b536fca556a -EBUILD meson-0.62.2.ebuild 2856 BLAKE2B a7c0401f5d366a9191302d7d58395ab7287db6c5b4de696091139a99dd870ff0ee09a1be8e67d149525f566c507341bd8127d9a3a615f5849a878bb91b08772b SHA512 56b07a732851a7d464a5bf19539923ca49ef6be14c4af83e3022061760aa5c02ec1d1e3e9ee4e1ff6db6ea273f96cf0e8f97262835d501979a67549da15cda4c -EBUILD meson-0.63.0_rc2.ebuild 2896 BLAKE2B 36395f0a737b9ae248f08276d2cb4892a3a1090b4c8f0740f1dca475c3daf19c4b529631eac748ecd75bbb54a92b6817c941dbadcbb185243c2425a120a868d9 SHA512 5ebfe5456c078aa2d7cbc9a9c4d27111c49e5c81e2f3c4ec800c99c4ccf56efc687e14046873d52be6068abf84d2a1cd28c1f4c7e276fe31e03a8409220754bf +EBUILD meson-0.62.2.ebuild 2848 BLAKE2B 0f1794a5141c01af083d614e9acd9d37461a0ffc68f71d33177bf934efe1261c260c1518e502552193d45814529335e9a98ba1ceb78349cf243bcdbe6eb3b12d SHA512 d333739fa3d7557cf9e84950004c1539c072ce43a3dcd88bd1409af4961ab2a37cf2989ed34fd0c6e80bf79d66a53f0e7e9d550e5e802d8b70ecc7f54a3dcd68 +EBUILD meson-0.63.0.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da EBUILD meson-9999.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4 diff --git a/dev-util/meson/meson-0.62.2.ebuild b/dev-util/meson/meson-0.62.2.ebuild index b5d3433c2dab..f424a7baab47 100644 --- a/dev-util/meson/meson-0.62.2.ebuild +++ b/dev-util/meson/meson-0.62.2.ebuild @@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi inherit bash-completion-r1 distutils-r1 toolchain-funcs diff --git a/dev-util/meson/meson-0.63.0.ebuild b/dev-util/meson/meson-0.63.0.ebuild new file mode 100644 index 000000000000..14ecaa4f465b --- /dev/null +++ b/dev-util/meson/meson-0.63.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 2016-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_USE_PEP517=setuptools + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/mesonbuild/meson" + inherit git-r3 +else + MY_P=${P/_/} + S=${WORKDIR}/${MY_P} + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +inherit bash-completion-r1 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[@]}" 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 + distutils-r1_src_test + fi +} + +python_test() { + ( + # test_meson_installed + unset PYTHONDONTWRITEBYTECODE + + # https://bugs.gentoo.org/687792 + unset PKG_CONFIG + + # test_cross_file_system_paths + unset XDG_DATA_HOME + + # 'test cases/unit/73 summary' expects 80 columns + export COLUMNS=80 + + # If JAVA_HOME is not set, meson looks for javac in PATH. + # If javac is in /usr/bin, meson assumes /usr/include is a valid + # JDK include path. Setting JAVA_HOME works around this broken + # autodetection. If no JDK is installed, we should end up with an empty + # value in JAVA_HOME, and the tests should get skipped. + export JAVA_HOME=$(java-config -O 2>/dev/null) + + # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled. + python3 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 + + dobashcomp data/shell-completions/bash/meson +} diff --git a/dev-util/meson/meson-0.63.0_rc2.ebuild b/dev-util/meson/meson-0.63.0_rc2.ebuild deleted file mode 100644 index a7a111a382b8..000000000000 --- a/dev-util/meson/meson-0.63.0_rc2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 2016-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -DISTUTILS_USE_PEP517=setuptools - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit git-r3 -else - MY_P=${P/_/} - S=${WORKDIR}/${MY_P} - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -inherit bash-completion-r1 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[@]}" 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 - distutils-r1_src_test - fi -} - -python_test() { - ( - # test_meson_installed - unset PYTHONDONTWRITEBYTECODE - - # https://bugs.gentoo.org/687792 - unset PKG_CONFIG - - # test_cross_file_system_paths - unset XDG_DATA_HOME - - # 'test cases/unit/73 summary' expects 80 columns - export COLUMNS=80 - - # If JAVA_HOME is not set, meson looks for javac in PATH. - # If javac is in /usr/bin, meson assumes /usr/include is a valid - # JDK include path. Setting JAVA_HOME works around this broken - # autodetection. If no JDK is installed, we should end up with an empty - # value in JAVA_HOME, and the tests should get skipped. - export JAVA_HOME=$(java-config -O 2>/dev/null) - - # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled. - python3 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 - - dobashcomp data/shell-completions/bash/meson -} -- cgit v1.2.3