commit: b2e403b1859fddabf72e812090e1f7107eb26617 Author: William Hubbs <william.hubbs <AT> sony <DOT> com> AuthorDate: Thu Aug 22 15:48:59 2019 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Thu Aug 22 15:52:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e403b1
dev-util/meson: remove several old versions Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> dev-util/meson/Manifest | 2 - .../meson/files/meson-0.49-python3.5-tests.patch | 34 ---------- dev-util/meson/meson-0.48.2.ebuild | 73 --------------------- dev-util/meson/meson-0.49.2.ebuild | 76 ---------------------- 4 files changed, 185 deletions(-) diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 0abdbfd7c1c..f0545ae0c90 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,4 +1,2 @@ -DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f -DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch deleted file mode 100644 index 640348b2bc2..00000000000 --- a/dev-util/meson/files/meson-0.49-python3.5-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <[email protected]> -Date: Fri, 11 Jan 2019 18:03:15 +0000 -Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess - invocation - -subprocess.run() didn't get the encoding parameter until 3.6. - -Signed-off-by: Simon McVittie <[email protected]> ---- - run_unittests.py | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 342ad883..e1246140 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests): - ret = subprocess.run( - ["{}"] + extra_args, - stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- encoding='utf-8') -- print(ret.stdout) -- print(ret.stderr, file=sys.stderr) -+ stderr=subprocess.PIPE) -+ print(ret.stdout.decode('utf-8')) -+ print(ret.stderr.decode('utf-8'), file=sys.stderr) - sys.exit(ret.returncode) - - if __name__ == '__main__': --- -2.21.0 - diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild deleted file mode 100644 index b6374c8e969..00000000000 --- a/dev-util/meson/meson-0.48.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2016-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/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild deleted file mode 100644 index 795f89a188d..00000000000 --- a/dev-util/meson/meson-0.49.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2016-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 - ) -" - -PATCHES=( - "${FILESDIR}/meson-0.49-python3.5-tests.patch" -) - -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() { - 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 - - # 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 -}
