summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-12-26 22:40:45 -0500
committerMike Gilbert <floppym@gentoo.org>2021-12-26 22:40:45 -0500
commitd75dac93ff5c2314a224d5e9486b624a1bb0b972 (patch)
treeb491bf310e96e4b1e27651ed92fd5ec02160112d /dev-util
parentdev-util/meson: add 0.60.3 (diff)
downloadgentoo-d75dac93ff5c2314a224d5e9486b624a1bb0b972.tar.gz
gentoo-d75dac93ff5c2314a224d5e9486b624a1bb0b972.tar.bz2
gentoo-d75dac93ff5c2314a224d5e9486b624a1bb0b972.zip
dev-util/meson: drop 0.59.1-r1
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/meson/Manifest1
-rw-r--r--dev-util/meson/files/meson-tests-rust-add-libm.patch22
-rw-r--r--dev-util/meson/meson-0.59.1-r1.ebuild106
3 files changed, 0 insertions, 129 deletions
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 450d1d3524f6..fd415add0961 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,4 +1,3 @@
-DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80
DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
diff --git a/dev-util/meson/files/meson-tests-rust-add-libm.patch b/dev-util/meson/files/meson-tests-rust-add-libm.patch
deleted file mode 100644
index 45803976bb9b..000000000000
--- a/dev-util/meson/files/meson-tests-rust-add-libm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7ad54cce49ce22b063e0cd56edb4b7f722dc5e8e Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Wed, 29 Sep 2021 14:20:53 +0200
-Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55
-
-Fixes #9309
----
- test cases/rust/5 polyglot static/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build
-index de2e61bcbc3..a6e9550b6e2 100644
---- a/test cases/rust/5 polyglot static/meson.build
-+++ b/test cases/rust/5 polyglot static/meson.build
-@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust')
-
- deps = [
- meson.get_compiler('c').find_library('dl', required: false),
-+ meson.get_compiler('c').find_library('m', required: false),
- dependency('threads'),
- ]
-
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
deleted file mode 100644
index f5024d59f182..000000000000
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-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
- )
-"
-
-PATCHES=(
- "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
- "${FILESDIR}/meson-tests-rust-add-libm.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[@]}" 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
- # autodection. 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
-}