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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4795C138359 for ; Sat, 4 Jul 2020 23:45:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E42DE080E; Sat, 4 Jul 2020 23:45:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A26F8E080E for ; Sat, 4 Jul 2020 23:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AE2334EF34 for ; Sat, 4 Jul 2020 23:45:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2126828F for ; Sat, 4 Jul 2020 23:45:33 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1593906294.51a987701a7e0541fde86acad1cd9de3c6e6272c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/Manifest dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch dev-util/meson/files/0.53.1-remove-asan.patch dev-util/meson/meson-0.52.1.ebuild dev-util/meson/meson-0.53.1.ebuild dev-util/meson/meson-0.54.0.ebuild dev-util/meson/meson-0.54.1.ebuild X-VCS-Directories: dev-util/meson/files/ dev-util/meson/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 51a987701a7e0541fde86acad1cd9de3c6e6272c X-VCS-Branch: master Date: Sat, 4 Jul 2020 23:45:33 +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: 7072eb13-66e7-4337-9bfb-ed55d96cba54 X-Archives-Hash: d489b2429867e2a6f46ad7a528311d87 commit: 51a987701a7e0541fde86acad1cd9de3c6e6272c Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 4 23:44:54 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 4 23:44:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a98770 dev-util/meson: remove old Signed-off-by: Mike Gilbert gentoo.org> dev-util/meson/Manifest | 4 - .../files/0.52.1-test_pkgconfig_gen_deps.patch | 46 ------------ .../files/0.53.1-remove-asan-ld_preload.patch | 27 ------- dev-util/meson/files/0.53.1-remove-asan.patch | 27 ------- dev-util/meson/meson-0.52.1.ebuild | 86 ---------------------- dev-util/meson/meson-0.53.1.ebuild | 84 --------------------- dev-util/meson/meson-0.54.0.ebuild | 67 ----------------- dev-util/meson/meson-0.54.1.ebuild | 82 --------------------- 8 files changed, 423 deletions(-) diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 5252e89d8ce..8f3c5fdd8c9 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,6 +1,2 @@ -DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41 -DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859 -DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7 -DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b diff --git a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch deleted file mode 100644 index ec753e00230..00000000000 --- a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Mon, 13 Jan 2020 23:46:09 -0500 -Subject: [PATCH] test_pkgconfig_gen_deps: set - PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib - -pkgconf automatically prunes "system library paths" from its output. The -system library paths depend on the system toolchain. A common value on a -64-bit system is as follows: - -/lib64:/usr/lib64:/usr/local/lib64 - -So, if -L/usr/lib64 appears in the Libs section, it will be pruned from -the output of pkg-config --libs. - -The pc files generated for this test contain something like this: - -libdir=/usr/lib -Libs: -L${libdir} ... - -pkgconf may not consider /usr/lib to be a system library path, so it is -not pruned as the test expects. To work around this, override the -compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH -environment variable. - -Fixes: https://github.com/mesonbuild/meson/issues/6004 ---- - run_unittests.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 898f05e54d..5a60b9b6a4 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self): - privatedir2 = self.privatedir - - os.environ -- env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])} -+ env = { -+ 'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]), -+ 'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib', -+ } - self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env) - - # pkg-config strips some duplicated flags so we have to parse the diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch deleted file mode 100644 index 4ee11829904..00000000000 --- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001 -From: William Hubbs -Date: Sat, 15 Feb 2020 12:24:42 -0600 -Subject: [PATCH 1/2] remove asan ld_preload - -ASAN and sandbox both want control over LD_PRELOAD -https://bugs.gentoo.org/673016 ---- - run_unittests.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 676604f4..1c9aaf0c 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests): - r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n') - - @skip_if_not_base_option('b_sanitize') -- def test_generate_gir_with_address_sanitizer(self): -+ def _test_generate_gir_with_address_sanitizer(self): - if is_cygwin(): - raise unittest.SkipTest('asan not available on Cygwin') - if is_openbsd(): --- -2.24.1 - diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch deleted file mode 100644 index 4cc2aead0ba..00000000000 --- a/dev-util/meson/files/0.53.1-remove-asan.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001 -From: William Hubbs -Date: Sat, 15 Feb 2020 12:28:35 -0600 -Subject: [PATCH 2/2] remove asan - -ASAN is unsupported on some targets -https://bugs.gentoo.org/692822 ---- - run_unittests.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 1c9aaf0c..171ee0f0 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests): - self.assertEqual(install_rpath, 'baz') - - @skip_if_not_base_option('b_sanitize') -- def test_pch_with_address_sanitizer(self): -+ def _test_pch_with_address_sanitizer(self): - if is_cygwin(): - raise unittest.SkipTest('asan not available on Cygwin') - if is_openbsd(): --- -2.24.1 - diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild deleted file mode 100644 index 077d7508af2..00000000000 --- a/dev-util/meson/meson-0.52.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2016-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -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 ~x64-macos ~x64-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 PATCHES=( - "${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch - ) - - # 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 - - # 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/dev-util/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.53.1.ebuild deleted file mode 100644 index a0802ef4fcb..00000000000 --- a/dev-util/meson/meson-0.53.1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2016-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -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 ~x64-macos ~x64-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 - ) -" - -PATCHES=( - # ASAN and sandbox both want control over LD_PRELOAD - # https://bugs.gentoo.org/673016 - "${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch - # ASAN is unsupported on some targets - # https://bugs.gentoo.org/692822 - "${FILESDIR}"/0.53.1-remove-asan.patch - ) - -python_prepare_all() { - - # 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/dev-util/meson/meson-0.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild deleted file mode 100644 index 77f6244e6e2..00000000000 --- a/dev-util/meson/meson-0.54.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2016-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -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 ~x64-macos ~x64-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 - ) -" - -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-0.54.1.ebuild b/dev-util/meson/meson-0.54.1.ebuild deleted file mode 100644 index 053a12bbeb2..00000000000 --- a/dev-util/meson/meson-0.54.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2016-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -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 ~x64-macos ~x64-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() { - # 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 - - # 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 -}