Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/
Date: Mon, 20 Mar 2023 13:11:03
Message-Id: 1679317843.14a02dce92fa917e38d6c0756f1359b5b6f62ecf.mgorny@gentoo
1 commit: 14a02dce92fa917e38d6c0756f1359b5b6f62ecf
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 20 13:08:49 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 20 13:10:43 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14a02dce
7
8 sys-libs/libcxx: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/Manifest | 5 -
13 sys-libs/libcxx/libcxx-16.0.0_rc3.ebuild | 204 -----------------------
14 sys-libs/libcxx/libcxx-16.0.0_rc4.ebuild | 204 -----------------------
15 sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild | 204 -----------------------
16 4 files changed, 617 deletions(-)
17
18 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
19 index ddf4d4d6feb1..f5a0c685bcf9 100644
20 --- a/sys-libs/libcxx/Manifest
21 +++ b/sys-libs/libcxx/Manifest
22 @@ -6,9 +6,4 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
23 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
24 DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
25 DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
26 -DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
27 -DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
28 -DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
29 -DIST llvm-project-16.0.0rc4.src.tar.xz.sig 566 BLAKE2B bfcf39070f32e16cfeae699d95d06f184b1331c3af403340c31cc5a973a3bb1faec0b6342445176cebed5819ddf68e4abfdaa8542ec425b1c822fc8c03c03349 SHA512 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f
30 -DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
31 DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAKE2B 6750855453b575eb8fcc861d5b24b144497bba62df9b9292ac586cf340e04b2b58290fe9df6d89142f29b56aa37ddeb3bd11cc3337e4dc985a4487954d1e2ffa SHA512 d8a87064ba0f92967df019e9345222b87cda81852a9599902cedc4a49ec7d9e2175c972b7fa6d19920489c1d309822f9c31c23bdce0376a8d40c71d57bcd5068
32
33 diff --git a/sys-libs/libcxx/libcxx-16.0.0_rc3.ebuild b/sys-libs/libcxx/libcxx-16.0.0_rc3.ebuild
34 deleted file mode 100644
35 index c9983680a218..000000000000
36 --- a/sys-libs/libcxx/libcxx-16.0.0_rc3.ebuild
37 +++ /dev/null
38 @@ -1,204 +0,0 @@
39 -# Copyright 1999-2023 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=8
43 -
44 -PYTHON_COMPAT=( python3_{9..11} )
45 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
46 - toolchain-funcs
47 -
48 -DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
49 -HOMEPAGE="https://libcxx.llvm.org/"
50 -
51 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
52 -SLOT="0"
53 -KEYWORDS="~loong"
54 -IUSE="+clang +libcxxabi static-libs test"
55 -REQUIRED_USE="test? ( clang )"
56 -RESTRICT="!test? ( test )"
57 -
58 -RDEPEND="
59 - libcxxabi? (
60 - ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
61 - )
62 - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
63 -"
64 -DEPEND="
65 - ${RDEPEND}
66 - sys-devel/llvm:${LLVM_MAJOR}
67 -"
68 -BDEPEND="
69 - clang? (
70 - sys-devel/clang:${LLVM_MAJOR}
71 - )
72 - !test? (
73 - ${PYTHON_DEPS}
74 - )
75 - test? (
76 - >=dev-util/cmake-3.16
77 - sys-devel/gdb[python]
78 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
79 - )
80 -"
81 -
82 -LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
83 -llvm.org_set_globals
84 -
85 -python_check_deps() {
86 - use test || return 0
87 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
88 -}
89 -
90 -pkg_setup() {
91 - # Darwin Prefix builds do not have llvm installed yet, so rely on
92 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
93 - # of using llvm_pkg_setup.
94 - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
95 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
96 - fi
97 - python-any-r1_pkg_setup
98 -
99 - if ! use libcxxabi && ! tc-is-gcc ; then
100 - eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
101 - eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
102 - eerror "and try again."
103 - die
104 - fi
105 -}
106 -
107 -test_compiler() {
108 - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
109 - <<<'int main() { return 0; }' &>/dev/null
110 -}
111 -
112 -src_configure() {
113 - # note: we need to do this before multilib kicks in since it will
114 - # alter the CHOST
115 - local cxxabi cxxabi_incs
116 - if use libcxxabi; then
117 - cxxabi=system-libcxxabi
118 - cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
119 - else
120 - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
121 - cxxabi=libsupc++
122 - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
123 - fi
124 -
125 - multilib-minimal_src_configure
126 -}
127 -
128 -multilib_src_configure() {
129 - if use clang; then
130 - local -x CC=${CHOST}-clang
131 - local -x CXX=${CHOST}-clang++
132 - strip-unsupported-flags
133 - fi
134 -
135 - # link to compiler-rt
136 - local use_compiler_rt=OFF
137 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
138 -
139 - # bootstrap: cmake is unhappy if compiler can't link to stdlib
140 - local nolib_flags=( -nodefaultlibs -lc )
141 - if ! test_compiler; then
142 - if test_compiler "${nolib_flags[@]}"; then
143 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
144 - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
145 - fi
146 - fi
147 -
148 - local libdir=$(get_libdir)
149 - local mycmakeargs=(
150 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
151 - -DPython3_EXECUTABLE="${PYTHON}"
152 - -DLLVM_ENABLE_RUNTIMES=libcxx
153 - -DLLVM_INCLUDE_TESTS=OFF
154 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
155 -
156 - -DLIBCXX_ENABLE_SHARED=ON
157 - -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
158 - -DLIBCXX_CXX_ABI=${cxxabi}
159 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
160 - # we're using our own mechanism for generating linker scripts
161 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
162 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
163 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
164 - -DLIBCXX_INCLUDE_TESTS=$(usex test)
165 - -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
166 - )
167 -
168 - if use test; then
169 - mycmakeargs+=(
170 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
171 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
172 - -DPython3_EXECUTABLE="${PYTHON}"
173 - )
174 - fi
175 - cmake_src_configure
176 -}
177 -
178 -multilib_src_compile() {
179 - cmake_src_compile
180 - if [[ ${CHOST} != *-darwin* ]] ; then
181 - gen_shared_ldscript
182 - use static-libs && gen_static_ldscript
183 - fi
184 -}
185 -
186 -multilib_src_test() {
187 - local -x LIT_PRESERVES_TMP=1
188 - cmake_build check-cxx
189 -}
190 -
191 -multilib_src_install() {
192 - cmake_src_install
193 - # since we've replaced libc++.{a,so} with ldscripts, now we have to
194 - # install the extra symlinks
195 - if [[ ${CHOST} != *-darwin* ]] ; then
196 - dolib.so lib/libc++_shared.so
197 - use static-libs && dolib.a lib/libc++_static.a
198 - fi
199 -}
200 -
201 -# Usage: deps
202 -gen_ldscript() {
203 - local output_format
204 - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
205 - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
206 -
207 - cat <<-END_LDSCRIPT
208 -/* GNU ld script
209 - Include missing dependencies
210 -*/
211 -${output_format}
212 -GROUP ( $@ )
213 -END_LDSCRIPT
214 -}
215 -
216 -gen_static_ldscript() {
217 - # Move it first.
218 - mv lib/libc++{,_static}.a || die
219 - # Generate libc++.a ldscript for inclusion of its dependencies so that
220 - # clang++ -stdlib=libc++ -static works out of the box.
221 - local deps=(
222 - libc++_static.a
223 - $(usex libcxxabi libc++abi.a libsupc++.a)
224 - )
225 - # On Linux/glibc it does not link without libpthread or libdl. It is
226 - # fine on FreeBSD.
227 - use elibc_glibc && deps+=( libpthread.a libdl.a )
228 -
229 - gen_ldscript "${deps[*]}" > lib/libc++.a || die
230 -}
231 -
232 -gen_shared_ldscript() {
233 - # Move it first.
234 - mv lib/libc++{,_shared}.so || die
235 - local deps=(
236 - libc++_shared.so
237 - # libsupc++ doesn't have a shared version
238 - $(usex libcxxabi libc++abi.so libsupc++.a)
239 - )
240 -
241 - gen_ldscript "${deps[*]}" > lib/libc++.so || die
242 -}
243
244 diff --git a/sys-libs/libcxx/libcxx-16.0.0_rc4.ebuild b/sys-libs/libcxx/libcxx-16.0.0_rc4.ebuild
245 deleted file mode 100644
246 index c9983680a218..000000000000
247 --- a/sys-libs/libcxx/libcxx-16.0.0_rc4.ebuild
248 +++ /dev/null
249 @@ -1,204 +0,0 @@
250 -# Copyright 1999-2023 Gentoo Authors
251 -# Distributed under the terms of the GNU General Public License v2
252 -
253 -EAPI=8
254 -
255 -PYTHON_COMPAT=( python3_{9..11} )
256 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
257 - toolchain-funcs
258 -
259 -DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
260 -HOMEPAGE="https://libcxx.llvm.org/"
261 -
262 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
263 -SLOT="0"
264 -KEYWORDS="~loong"
265 -IUSE="+clang +libcxxabi static-libs test"
266 -REQUIRED_USE="test? ( clang )"
267 -RESTRICT="!test? ( test )"
268 -
269 -RDEPEND="
270 - libcxxabi? (
271 - ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
272 - )
273 - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
274 -"
275 -DEPEND="
276 - ${RDEPEND}
277 - sys-devel/llvm:${LLVM_MAJOR}
278 -"
279 -BDEPEND="
280 - clang? (
281 - sys-devel/clang:${LLVM_MAJOR}
282 - )
283 - !test? (
284 - ${PYTHON_DEPS}
285 - )
286 - test? (
287 - >=dev-util/cmake-3.16
288 - sys-devel/gdb[python]
289 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
290 - )
291 -"
292 -
293 -LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
294 -llvm.org_set_globals
295 -
296 -python_check_deps() {
297 - use test || return 0
298 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
299 -}
300 -
301 -pkg_setup() {
302 - # Darwin Prefix builds do not have llvm installed yet, so rely on
303 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
304 - # of using llvm_pkg_setup.
305 - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
306 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
307 - fi
308 - python-any-r1_pkg_setup
309 -
310 - if ! use libcxxabi && ! tc-is-gcc ; then
311 - eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
312 - eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
313 - eerror "and try again."
314 - die
315 - fi
316 -}
317 -
318 -test_compiler() {
319 - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
320 - <<<'int main() { return 0; }' &>/dev/null
321 -}
322 -
323 -src_configure() {
324 - # note: we need to do this before multilib kicks in since it will
325 - # alter the CHOST
326 - local cxxabi cxxabi_incs
327 - if use libcxxabi; then
328 - cxxabi=system-libcxxabi
329 - cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
330 - else
331 - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
332 - cxxabi=libsupc++
333 - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
334 - fi
335 -
336 - multilib-minimal_src_configure
337 -}
338 -
339 -multilib_src_configure() {
340 - if use clang; then
341 - local -x CC=${CHOST}-clang
342 - local -x CXX=${CHOST}-clang++
343 - strip-unsupported-flags
344 - fi
345 -
346 - # link to compiler-rt
347 - local use_compiler_rt=OFF
348 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
349 -
350 - # bootstrap: cmake is unhappy if compiler can't link to stdlib
351 - local nolib_flags=( -nodefaultlibs -lc )
352 - if ! test_compiler; then
353 - if test_compiler "${nolib_flags[@]}"; then
354 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
355 - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
356 - fi
357 - fi
358 -
359 - local libdir=$(get_libdir)
360 - local mycmakeargs=(
361 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
362 - -DPython3_EXECUTABLE="${PYTHON}"
363 - -DLLVM_ENABLE_RUNTIMES=libcxx
364 - -DLLVM_INCLUDE_TESTS=OFF
365 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
366 -
367 - -DLIBCXX_ENABLE_SHARED=ON
368 - -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
369 - -DLIBCXX_CXX_ABI=${cxxabi}
370 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
371 - # we're using our own mechanism for generating linker scripts
372 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
373 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
374 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
375 - -DLIBCXX_INCLUDE_TESTS=$(usex test)
376 - -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
377 - )
378 -
379 - if use test; then
380 - mycmakeargs+=(
381 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
382 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
383 - -DPython3_EXECUTABLE="${PYTHON}"
384 - )
385 - fi
386 - cmake_src_configure
387 -}
388 -
389 -multilib_src_compile() {
390 - cmake_src_compile
391 - if [[ ${CHOST} != *-darwin* ]] ; then
392 - gen_shared_ldscript
393 - use static-libs && gen_static_ldscript
394 - fi
395 -}
396 -
397 -multilib_src_test() {
398 - local -x LIT_PRESERVES_TMP=1
399 - cmake_build check-cxx
400 -}
401 -
402 -multilib_src_install() {
403 - cmake_src_install
404 - # since we've replaced libc++.{a,so} with ldscripts, now we have to
405 - # install the extra symlinks
406 - if [[ ${CHOST} != *-darwin* ]] ; then
407 - dolib.so lib/libc++_shared.so
408 - use static-libs && dolib.a lib/libc++_static.a
409 - fi
410 -}
411 -
412 -# Usage: deps
413 -gen_ldscript() {
414 - local output_format
415 - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
416 - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
417 -
418 - cat <<-END_LDSCRIPT
419 -/* GNU ld script
420 - Include missing dependencies
421 -*/
422 -${output_format}
423 -GROUP ( $@ )
424 -END_LDSCRIPT
425 -}
426 -
427 -gen_static_ldscript() {
428 - # Move it first.
429 - mv lib/libc++{,_static}.a || die
430 - # Generate libc++.a ldscript for inclusion of its dependencies so that
431 - # clang++ -stdlib=libc++ -static works out of the box.
432 - local deps=(
433 - libc++_static.a
434 - $(usex libcxxabi libc++abi.a libsupc++.a)
435 - )
436 - # On Linux/glibc it does not link without libpthread or libdl. It is
437 - # fine on FreeBSD.
438 - use elibc_glibc && deps+=( libpthread.a libdl.a )
439 -
440 - gen_ldscript "${deps[*]}" > lib/libc++.a || die
441 -}
442 -
443 -gen_shared_ldscript() {
444 - # Move it first.
445 - mv lib/libc++{,_shared}.so || die
446 - local deps=(
447 - libc++_shared.so
448 - # libsupc++ doesn't have a shared version
449 - $(usex libcxxabi libc++abi.so libsupc++.a)
450 - )
451 -
452 - gen_ldscript "${deps[*]}" > lib/libc++.so || die
453 -}
454
455 diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild
456 deleted file mode 100644
457 index 56140d06df64..000000000000
458 --- a/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild
459 +++ /dev/null
460 @@ -1,204 +0,0 @@
461 -# Copyright 1999-2023 Gentoo Authors
462 -# Distributed under the terms of the GNU General Public License v2
463 -
464 -EAPI=8
465 -
466 -PYTHON_COMPAT=( python3_{9..11} )
467 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
468 - toolchain-funcs
469 -
470 -DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
471 -HOMEPAGE="https://libcxx.llvm.org/"
472 -
473 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
474 -SLOT="0"
475 -KEYWORDS=""
476 -IUSE="+clang +libcxxabi static-libs test"
477 -REQUIRED_USE="test? ( clang )"
478 -RESTRICT="!test? ( test )"
479 -
480 -RDEPEND="
481 - libcxxabi? (
482 - ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
483 - )
484 - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
485 -"
486 -DEPEND="
487 - ${RDEPEND}
488 - sys-devel/llvm:${LLVM_MAJOR}
489 -"
490 -BDEPEND="
491 - clang? (
492 - sys-devel/clang:${LLVM_MAJOR}
493 - )
494 - !test? (
495 - ${PYTHON_DEPS}
496 - )
497 - test? (
498 - >=dev-util/cmake-3.16
499 - sys-devel/gdb[python]
500 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
501 - )
502 -"
503 -
504 -LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
505 -llvm.org_set_globals
506 -
507 -python_check_deps() {
508 - use test || return 0
509 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
510 -}
511 -
512 -pkg_setup() {
513 - # Darwin Prefix builds do not have llvm installed yet, so rely on
514 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
515 - # of using llvm_pkg_setup.
516 - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
517 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
518 - fi
519 - python-any-r1_pkg_setup
520 -
521 - if ! use libcxxabi && ! tc-is-gcc ; then
522 - eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
523 - eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
524 - eerror "and try again."
525 - die
526 - fi
527 -}
528 -
529 -test_compiler() {
530 - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
531 - <<<'int main() { return 0; }' &>/dev/null
532 -}
533 -
534 -src_configure() {
535 - # note: we need to do this before multilib kicks in since it will
536 - # alter the CHOST
537 - local cxxabi cxxabi_incs
538 - if use libcxxabi; then
539 - cxxabi=system-libcxxabi
540 - cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
541 - else
542 - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
543 - cxxabi=libsupc++
544 - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
545 - fi
546 -
547 - multilib-minimal_src_configure
548 -}
549 -
550 -multilib_src_configure() {
551 - if use clang; then
552 - local -x CC=${CHOST}-clang
553 - local -x CXX=${CHOST}-clang++
554 - strip-unsupported-flags
555 - fi
556 -
557 - # link to compiler-rt
558 - local use_compiler_rt=OFF
559 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
560 -
561 - # bootstrap: cmake is unhappy if compiler can't link to stdlib
562 - local nolib_flags=( -nodefaultlibs -lc )
563 - if ! test_compiler; then
564 - if test_compiler "${nolib_flags[@]}"; then
565 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
566 - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
567 - fi
568 - fi
569 -
570 - local libdir=$(get_libdir)
571 - local mycmakeargs=(
572 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
573 - -DPython3_EXECUTABLE="${PYTHON}"
574 - -DLLVM_ENABLE_RUNTIMES=libcxx
575 - -DLLVM_INCLUDE_TESTS=OFF
576 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
577 -
578 - -DLIBCXX_ENABLE_SHARED=ON
579 - -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
580 - -DLIBCXX_CXX_ABI=${cxxabi}
581 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
582 - # we're using our own mechanism for generating linker scripts
583 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
584 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
585 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
586 - -DLIBCXX_INCLUDE_TESTS=$(usex test)
587 - -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
588 - )
589 -
590 - if use test; then
591 - mycmakeargs+=(
592 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
593 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
594 - -DPython3_EXECUTABLE="${PYTHON}"
595 - )
596 - fi
597 - cmake_src_configure
598 -}
599 -
600 -multilib_src_compile() {
601 - cmake_src_compile
602 - if [[ ${CHOST} != *-darwin* ]] ; then
603 - gen_shared_ldscript
604 - use static-libs && gen_static_ldscript
605 - fi
606 -}
607 -
608 -multilib_src_test() {
609 - local -x LIT_PRESERVES_TMP=1
610 - cmake_build check-cxx
611 -}
612 -
613 -multilib_src_install() {
614 - cmake_src_install
615 - # since we've replaced libc++.{a,so} with ldscripts, now we have to
616 - # install the extra symlinks
617 - if [[ ${CHOST} != *-darwin* ]] ; then
618 - dolib.so lib/libc++_shared.so
619 - use static-libs && dolib.a lib/libc++_static.a
620 - fi
621 -}
622 -
623 -# Usage: deps
624 -gen_ldscript() {
625 - local output_format
626 - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
627 - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
628 -
629 - cat <<-END_LDSCRIPT
630 -/* GNU ld script
631 - Include missing dependencies
632 -*/
633 -${output_format}
634 -GROUP ( $@ )
635 -END_LDSCRIPT
636 -}
637 -
638 -gen_static_ldscript() {
639 - # Move it first.
640 - mv lib/libc++{,_static}.a || die
641 - # Generate libc++.a ldscript for inclusion of its dependencies so that
642 - # clang++ -stdlib=libc++ -static works out of the box.
643 - local deps=(
644 - libc++_static.a
645 - $(usex libcxxabi libc++abi.a libsupc++.a)
646 - )
647 - # On Linux/glibc it does not link without libpthread or libdl. It is
648 - # fine on FreeBSD.
649 - use elibc_glibc && deps+=( libpthread.a libdl.a )
650 -
651 - gen_ldscript "${deps[*]}" > lib/libc++.a || die
652 -}
653 -
654 -gen_shared_ldscript() {
655 - # Move it first.
656 - mv lib/libc++{,_shared}.so || die
657 - local deps=(
658 - libc++_shared.so
659 - # libsupc++ doesn't have a shared version
660 - $(usex libcxxabi libc++abi.so libsupc++.a)
661 - )
662 -
663 - gen_ldscript "${deps[*]}" > lib/libc++.so || die
664 -}