From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-util/meson/Manifest | 6 ++- dev-util/meson/meson-0.61.1.ebuild | 2 +- dev-util/meson/meson-0.61.3.ebuild | 103 +++++++++++++++++++++++++++++++++++++ dev-util/meson/meson-9999.ebuild | 6 ++- 4 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 dev-util/meson/meson-0.61.3.ebuild (limited to 'dev-util/meson') diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 11a430ff83c1..d43e9b996bfc 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -4,9 +4,11 @@ DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552 DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80 DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc DIST meson-0.61.1.tar.gz 2009680 BLAKE2B d3a704a0f39bd92334f91d4206effb13fa6d7916a71d028e89b36dc8d8f82612f05cdefe8df73c5810faabdc59522592d0a22d6fba8c9208c8c9d2bd5306ad8a SHA512 6c9fabd6f70c276f6daa4bab14de148692d4ab55da964143b73a4e3197ad84c0074d64b729d4492a0c1e0fbea116fa82bd349ed22cb8f53981d492b515e2fb00 +DIST meson-0.61.3.tar.gz 2011631 BLAKE2B 7b50480f05b23f42547cf020e9279fa8379da8421d52aa4ab4476d9b7e8ef2d94d3290e4b4cc425493d7d95dbbea06ec24eeb217327bf6d607c23179c8111905 SHA512 955c56cbaeb23a33a5e536eee547312ca5f1122aaa03d839113a2b2bcd9a0486ab24d1783220d9981c29ed9b4bda06a971cb0e21aa9f32d57f6696fa27853da8 EBUILD meson-0.59.4.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54 EBUILD meson-0.60.2-r1.ebuild 2756 BLAKE2B e3c00db9be838a448e1b63ab7987db64590375fd3ff6c714ffc883af5982a8ca109d56a3f5539808e90022091e83735baf804f0b75f9929b5b323080abad69ed SHA512 ab5ced255a8ab04475ee1f68c4b3b10769d17332c5f8cf3a9b4ba42d4ac5d2ea9664ba99e9638bc05fcb9f4d8201ca91a5032a1567e630347bf15d2ecd63d77a EBUILD meson-0.60.3.ebuild 2680 BLAKE2B 7391a09710a966e2dc274797c3c6a2c8bef5dc489c3c5d8f597db8fa10f8f76ed8021409991274f68f4de0556ab8d435480508a6dcec287a5e999bcf39c76098 SHA512 4275793478b7cb7e58eb216b3230de2592aff2ed42da138dcddeb313e9e9b1008c3e0e28dc4a63aaa88bbad8eb9d933ae95f93d6d8c243ff037c253001a557f3 -EBUILD meson-0.61.1.ebuild 2688 BLAKE2B c649dfb54d92828659db63ff7954462ecc1918f265d284bf7e35aa3daf8d10d93df4260d529192746754b78e9d3b2f869af20ac1a45be8f8a874333b2408ab71 SHA512 6abdf4ff1c7a27b31fdbda7b025eb0a6aac41b0c0115f2cb233fed791a17e5279296e90dd4bf1f5636d8067d2477a70ab518a8257458b8fc61363646b0560d2b -EBUILD meson-9999.ebuild 2688 BLAKE2B 07df2f86ca9079443f8709f5f2231799793d03c844f3d31cdec3ca7491053f5126be078f62d928b9e770aa6957d8b769f8d5b0bc13884186a531516e7004218a SHA512 f953b6ce95a3bcfb187ff52e0214a32faf297fec1a280161c0b4e07d77b60cbe643511cbee915a27d17cf0fe4c2a2e0246750354bdd83119408fd273a1790131 +EBUILD meson-0.61.1.ebuild 2686 BLAKE2B f609c25c9f2af32c59878db37fa306499854b370056de83fbfc86e59b1da97ceac7de0a7cd1a627dc03f79578e397e61318e504ad60e12d0e18c23016b2c97e5 SHA512 10bf18121a244ba44e0e8f0595c354318022b0dca51f5b788bc250fdb826a0532c57b87a176865352f3cb23b096e84063a41314085b27733cee5ceb6ab68b09d +EBUILD meson-0.61.3.ebuild 2719 BLAKE2B 2c35b9222d363a307e0053911011dc0856f65b188fa34892b36efa233e0118530006e030036eb97978d7ad642e3a255982c1c2c5d0c70b345efa44894ca06848 SHA512 a4e61122cb0cf357cc8c70b955df2833ea6e89c3abe5e42a62820235c0d23f7d664c385abedfe2a3ec8daed89fefea822f28547cd1da4c054126fff1d7793a46 +EBUILD meson-9999.ebuild 2719 BLAKE2B 2c35b9222d363a307e0053911011dc0856f65b188fa34892b36efa233e0118530006e030036eb97978d7ad642e3a255982c1c2c5d0c70b345efa44894ca06848 SHA512 a4e61122cb0cf357cc8c70b955df2833ea6e89c3abe5e42a62820235c0d23f7d664c385abedfe2a3ec8daed89fefea822f28547cd1da4c054126fff1d7793a46 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4 diff --git a/dev-util/meson/meson-0.61.1.ebuild b/dev-util/meson/meson-0.61.1.ebuild index 5f05ec422699..62b0fbfd0aec 100644 --- a/dev-util/meson/meson-0.61.1.ebuild +++ b/dev-util/meson/meson-0.61.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{8,9,10} ) if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" diff --git a/dev-util/meson/meson-0.61.3.ebuild b/dev-util/meson/meson-0.61.3.ebuild new file mode 100644 index 000000000000..52bbb982abcc --- /dev/null +++ b/dev-util/meson/meson-0.61.3.ebuild @@ -0,0 +1,103 @@ +# Copyright 2016-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10} ) +DISTUTILS_USE_PEP517=setuptools + +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 ~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 + + # '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) + + ${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 b1532c0364e4..52bbb982abcc 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -1,8 +1,10 @@ -# Copyright 2016-2021 Gentoo Authors +# Copyright 2016-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) + +PYTHON_COMPAT=( python3_{8,9,10} ) +DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" -- cgit v1.2.3