Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/
Date: Sun, 27 Mar 2022 02:58:45
Message-Id: 1648349754.744b10ce3584e839902565692a1d09c60a24e320.sam@gentoo
1 commit: 744b10ce3584e839902565692a1d09c60a24e320
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 02:55:54 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 02:55:54 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=744b10ce
7
8 dev-util/meson: drop 0.61.1, 0.61.3
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/meson/Manifest | 2 -
13 dev-util/meson/meson-0.61.1.ebuild | 101 ------------------------------------
14 dev-util/meson/meson-0.61.3.ebuild | 103 -------------------------------------
15 3 files changed, 206 deletions(-)
16
17 diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
18 index 04dfcb717931..a0c6713b44c0 100644
19 --- a/dev-util/meson/Manifest
20 +++ b/dev-util/meson/Manifest
21 @@ -1,6 +1,4 @@
22 DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
23 DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80
24 DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
25 -DIST meson-0.61.1.tar.gz 2009680 BLAKE2B d3a704a0f39bd92334f91d4206effb13fa6d7916a71d028e89b36dc8d8f82612f05cdefe8df73c5810faabdc59522592d0a22d6fba8c9208c8c9d2bd5306ad8a SHA512 6c9fabd6f70c276f6daa4bab14de148692d4ab55da964143b73a4e3197ad84c0074d64b729d4492a0c1e0fbea116fa82bd349ed22cb8f53981d492b515e2fb00
26 -DIST meson-0.61.3.tar.gz 2011631 BLAKE2B 7b50480f05b23f42547cf020e9279fa8379da8421d52aa4ab4476d9b7e8ef2d94d3290e4b4cc425493d7d95dbbea06ec24eeb217327bf6d607c23179c8111905 SHA512 955c56cbaeb23a33a5e536eee547312ca5f1122aaa03d839113a2b2bcd9a0486ab24d1783220d9981c29ed9b4bda06a971cb0e21aa9f32d57f6696fa27853da8
27 DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
28
29 diff --git a/dev-util/meson/meson-0.61.1.ebuild b/dev-util/meson/meson-0.61.1.ebuild
30 deleted file mode 100644
31 index 62b0fbfd0aec..000000000000
32 --- a/dev-util/meson/meson-0.61.1.ebuild
33 +++ /dev/null
34 @@ -1,101 +0,0 @@
35 -# Copyright 2016-2022 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=8
39 -PYTHON_COMPAT=( python3_{8,9,10} )
40 -
41 -if [[ ${PV} = *9999* ]]; then
42 - EGIT_REPO_URI="https://github.com/mesonbuild/meson"
43 - inherit git-r3
44 -else
45 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
46 - 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"
47 -fi
48 -
49 -inherit distutils-r1 toolchain-funcs
50 -
51 -DESCRIPTION="Open source build system"
52 -HOMEPAGE="https://mesonbuild.com/"
53 -
54 -LICENSE="Apache-2.0"
55 -SLOT="0"
56 -IUSE="test"
57 -RESTRICT="!test? ( test )"
58 -
59 -DEPEND="
60 - test? (
61 - dev-libs/glib:2
62 - dev-libs/gobject-introspection
63 - dev-util/ninja
64 - dev-vcs/git
65 - sys-libs/zlib[static-libs(+)]
66 - virtual/pkgconfig
67 - )
68 -"
69 -
70 -python_prepare_all() {
71 - local disable_unittests=(
72 - # ASAN and sandbox both want control over LD_PRELOAD
73 - # https://bugs.gentoo.org/673016
74 - -e 's/test_generate_gir_with_address_sanitizer/_&/'
75 -
76 - # ASAN is unsupported on some targets
77 - # https://bugs.gentoo.org/692822
78 - -e 's/test_pch_with_address_sanitizer/_&/'
79 -
80 - # https://github.com/mesonbuild/meson/issues/7203
81 - -e 's/test_templates/_&/'
82 -
83 - # Broken due to python2 wrapper
84 - -e 's/test_python_module/_&/'
85 - )
86 -
87 - sed -i "${disable_unittests[@]}" run_unittests.py || die
88 -
89 - # Broken due to python2 script created by python_wrapper_setup
90 - rm -r "test cases/frameworks/1 boost" || die
91 -
92 - distutils-r1_python_prepare_all
93 -}
94 -
95 -src_test() {
96 - tc-export PKG_CONFIG
97 - if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
98 - ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
99 - else
100 - # https://bugs.gentoo.org/687792
101 - unset PKG_CONFIG
102 - distutils-r1_src_test
103 - fi
104 -}
105 -
106 -python_test() {
107 - (
108 - # test_meson_installed
109 - unset PYTHONDONTWRITEBYTECODE
110 -
111 - # test_cross_file_system_paths
112 - unset XDG_DATA_HOME
113 -
114 - # 'test cases/unit/73 summary' expects 80 columns
115 - export COLUMNS=80
116 -
117 - # If JAVA_HOME is not set, meson looks for javac in PATH.
118 - # If javac is in /usr/bin, meson assumes /usr/include is a valid
119 - # JDK include path. Setting JAVA_HOME works around this broken
120 - # autodetection. If no JDK is installed, we should end up with an empty
121 - # value in JAVA_HOME, and the tests should get skipped.
122 - export JAVA_HOME=$(java-config -O 2>/dev/null)
123 -
124 - ${EPYTHON} -u run_tests.py
125 - ) || die "Testing failed with ${EPYTHON}"
126 -}
127 -
128 -python_install_all() {
129 - distutils-r1_python_install_all
130 -
131 - insinto /usr/share/vim/vimfiles
132 - doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
133 - insinto /usr/share/zsh/site-functions
134 - doins data/shell-completions/zsh/_meson
135 -}
136
137 diff --git a/dev-util/meson/meson-0.61.3.ebuild b/dev-util/meson/meson-0.61.3.ebuild
138 deleted file mode 100644
139 index 52bbb982abcc..000000000000
140 --- a/dev-util/meson/meson-0.61.3.ebuild
141 +++ /dev/null
142 @@ -1,103 +0,0 @@
143 -# Copyright 2016-2022 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=8
147 -
148 -PYTHON_COMPAT=( python3_{8,9,10} )
149 -DISTUTILS_USE_PEP517=setuptools
150 -
151 -if [[ ${PV} = *9999* ]]; then
152 - EGIT_REPO_URI="https://github.com/mesonbuild/meson"
153 - inherit git-r3
154 -else
155 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
156 - 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"
157 -fi
158 -
159 -inherit distutils-r1 toolchain-funcs
160 -
161 -DESCRIPTION="Open source build system"
162 -HOMEPAGE="https://mesonbuild.com/"
163 -
164 -LICENSE="Apache-2.0"
165 -SLOT="0"
166 -IUSE="test"
167 -RESTRICT="!test? ( test )"
168 -
169 -DEPEND="
170 - test? (
171 - dev-libs/glib:2
172 - dev-libs/gobject-introspection
173 - dev-util/ninja
174 - dev-vcs/git
175 - sys-libs/zlib[static-libs(+)]
176 - virtual/pkgconfig
177 - )
178 -"
179 -
180 -python_prepare_all() {
181 - local disable_unittests=(
182 - # ASAN and sandbox both want control over LD_PRELOAD
183 - # https://bugs.gentoo.org/673016
184 - -e 's/test_generate_gir_with_address_sanitizer/_&/'
185 -
186 - # ASAN is unsupported on some targets
187 - # https://bugs.gentoo.org/692822
188 - -e 's/test_pch_with_address_sanitizer/_&/'
189 -
190 - # https://github.com/mesonbuild/meson/issues/7203
191 - -e 's/test_templates/_&/'
192 -
193 - # Broken due to python2 wrapper
194 - -e 's/test_python_module/_&/'
195 - )
196 -
197 - sed -i "${disable_unittests[@]}" run_unittests.py || die
198 -
199 - # Broken due to python2 script created by python_wrapper_setup
200 - rm -r "test cases/frameworks/1 boost" || die
201 -
202 - distutils-r1_python_prepare_all
203 -}
204 -
205 -src_test() {
206 - tc-export PKG_CONFIG
207 - if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
208 - ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
209 - else
210 - # https://bugs.gentoo.org/687792
211 - unset PKG_CONFIG
212 - distutils-r1_src_test
213 - fi
214 -}
215 -
216 -python_test() {
217 - (
218 - # test_meson_installed
219 - unset PYTHONDONTWRITEBYTECODE
220 -
221 - # test_cross_file_system_paths
222 - unset XDG_DATA_HOME
223 -
224 - # 'test cases/unit/73 summary' expects 80 columns
225 - export COLUMNS=80
226 -
227 - # If JAVA_HOME is not set, meson looks for javac in PATH.
228 - # If javac is in /usr/bin, meson assumes /usr/include is a valid
229 - # JDK include path. Setting JAVA_HOME works around this broken
230 - # autodetection. If no JDK is installed, we should end up with an empty
231 - # value in JAVA_HOME, and the tests should get skipped.
232 - export JAVA_HOME=$(java-config -O 2>/dev/null)
233 -
234 - ${EPYTHON} -u run_tests.py
235 - ) || die "Testing failed with ${EPYTHON}"
236 -}
237 -
238 -python_install_all() {
239 - distutils-r1_python_install_all
240 -
241 - insinto /usr/share/vim/vimfiles
242 - doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
243 - insinto /usr/share/zsh/site-functions
244 - doins data/shell-completions/zsh/_meson
245 -}