From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B655A158089 for ; Tue, 14 Nov 2023 01:43:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA1E12BC022; Tue, 14 Nov 2023 01:43:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90B0C2BC022 for ; Tue, 14 Nov 2023 01:43:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B9B5335D50 for ; Tue, 14 Nov 2023 01:43:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF0B71318 for ; Tue, 14 Nov 2023 01:43:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699926155.7e09941b86cab01593d6c6fd68b1f8b01fe2a896.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/Manifest dev-util/meson/meson-1.3.0_rc1.ebuild X-VCS-Directories: dev-util/meson/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7e09941b86cab01593d6c6fd68b1f8b01fe2a896 X-VCS-Branch: master Date: Tue, 14 Nov 2023 01:43:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 27eff8da-7de5-4fa6-b08b-6b6ad5672a75 X-Archives-Hash: e78693506176d87fc7e3c51da7431de9 commit: 7e09941b86cab01593d6c6fd68b1f8b01fe2a896 Author: Eli Schwartz gmail com> AuthorDate: Tue Nov 14 01:26:52 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 14 01:42:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e09941b dev-util/meson: drop 1.3.0_rc1 Signed-off-by: Eli Schwartz gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33813 Signed-off-by: Sam James gentoo.org> dev-util/meson/Manifest | 2 - dev-util/meson/meson-1.3.0_rc1.ebuild | 129 ---------------------------------- 2 files changed, 131 deletions(-) diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 9f847f40181c..868038779563 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -6,7 +6,5 @@ DIST meson-1.2.2.tar.gz 2190455 BLAKE2B b355c8e5ab7508fca51dbe5c95eea68f91b995a6 DIST meson-1.2.2.tar.gz.asc 833 BLAKE2B 21c12a94ea5803b8a608d522988f9da63826bff9ce4a74c8c2cf9721d87504b930135532697e9a18710f732446dde2dc70f1c972f825542d043ae20bb76ed9f5 SHA512 9d4117a09f6852bcad7c91c0084bf6f37c05295b134d297a77b8ca5958edb93f030d05e216206c42cf2739e5a6ccdf680fb612056f3a21da9ec3ee80922236df DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9 -DIST meson-1.3.0rc1.tar.gz 2139141 BLAKE2B b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81 SHA512 196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8 -DIST meson-1.3.0rc1.tar.gz.asc 833 BLAKE2B 08409567887443e841b7fddbac18d62c31e9d97bc9c380d2b2579de5a52c313fae955e9c9e3d1f27086103017608a5bcbffaef5f672eb4c97bc80f760dad520b SHA512 5d5d44e6ed10f564b7e5452fb665121c9793d8ae044073b0315db8beba7b00540ebf1d25f20d3d94e17d5e9964bf9d618026d5b3abe6fc31ef8c434bcc275e42 DIST meson-1.3.0rc3.tar.gz 2218690 BLAKE2B 2bd5564b766240a849620a26a7fd9c47ff1973a3636c95b9f52634ff980b04b203e62aa790eed3d5ae027e992435be945d18ddea2d85b9da3f437a38d6c7556b SHA512 66a82381490c0e55031b55165ccbeeaeb4e47b9e578eb6731f4deec3965ca2671679fcaf3070900733077b71ff442197ba6530b5720e86c95bb4d56abdad59d2 DIST meson-1.3.0rc3.tar.gz.asc 833 BLAKE2B 06c65e567067c2b3576fd2c3764feaed1e8a84ef11ad5901e6ad41441f1b3f148d19d2fcb2a642c991894c9428debb9f5c6cf3148e06916386fbbc192fb264db SHA512 6002fa01d8647f8f7ce13a287c7abf6c6619c116927b7f0671824563244bdd3f7a3f9dfae9c8e12ed22a682c2d44d9a34269fd6216c2eb15c2944e83bdc87b44 diff --git a/dev-util/meson/meson-1.3.0_rc1.ebuild b/dev-util/meson/meson-1.3.0_rc1.ebuild deleted file mode 100644 index 429bfd5ba7d3..000000000000 --- a/dev-util/meson/meson-1.3.0_rc1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 2016-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} pypy3 ) -DISTUTILS_USE_PEP517=setuptools - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit git-r3 -else - inherit verify-sig - - MY_PV=${PV/_/} - MY_P=${P/_/} - S=${WORKDIR}/${MY_P} - - SRC_URI=" - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz - verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) - " - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -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 - ) -" -RDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.1-python-path.patch -) - -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 -}