commit: 9a53f6b4f4ca0d4e6660679e4603c1ca06ad63f3
Author: Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Sat Dec 13 03:36:01 2025 +0000
Commit: Itai Ferber <itai <AT> itaiferber <DOT> net>
CommitDate: Sat Dec 13 12:43:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9a53f6b4
dev-lang/swift: drop older 6.0.3 revisions
Cleans up pre-r2 ebuild revisions.
Signed-off-by: Itai Ferber <itai <AT> itaiferber.net>
.../swift-6.0.3-r1/backtracing-noexecstack.patch | 1 -
.../disable-libdispatch-werror.patch | 1 -
.../files/swift-6.0.3-r1/link-ncurses-tinfo.patch | 1 -
.../swift/files/swift-6.0.3-r1/link-with-lld.patch | 1 -
dev-lang/swift/files/swift-6.0.3-r2 | 1 -
.../backtracing-noexecstack.patch | 0
.../disable-libdispatch-werror.patch | 0
.../{swift-6.0.3-r1 => swift-6.0.3-r2}/gentoo.ini | 0
.../indexstoredb-constant.patch | 0
.../link-ncurses-tinfo.patch | 0
.../link-with-lld.patch | 0
.../respect-c-cxx-flags.patch | 0
.../files/swift-6.0.3/gentoo-build-preset.patch | 56 ----
.../swift-6.1.3/backtracing-noexecstack.patch | 2 +-
dev-lang/swift/metadata.xml | 5 -
dev-lang/swift/swift-6.0.3-r1.ebuild | 308 ---------------------
dev-lang/swift/swift-6.0.3-r2.ebuild | 1 -
dev-lang/swift/swift-6.0.3.ebuild | 247 -----------------
18 files changed, 1 insertion(+), 623 deletions(-)
diff --git a/dev-lang/swift/files/swift-6.0.3-r1/backtracing-noexecstack.patch
b/dev-lang/swift/files/swift-6.0.3-r1/backtracing-noexecstack.patch
deleted file mode 120000
index 2b90f491a0..0000000000
--- a/dev-lang/swift/files/swift-6.0.3-r1/backtracing-noexecstack.patch
+++ /dev/null
@@ -1 +0,0 @@
-../swift-6.0.3/backtracing-noexecstack.patch
\ No newline at end of file
diff --git
a/dev-lang/swift/files/swift-6.0.3-r1/disable-libdispatch-werror.patch
b/dev-lang/swift/files/swift-6.0.3-r1/disable-libdispatch-werror.patch
deleted file mode 120000
index 51c160975e..0000000000
--- a/dev-lang/swift/files/swift-6.0.3-r1/disable-libdispatch-werror.patch
+++ /dev/null
@@ -1 +0,0 @@
-../swift-6.0.3/disable-libdispatch-werror.patch
\ No newline at end of file
diff --git a/dev-lang/swift/files/swift-6.0.3-r1/link-ncurses-tinfo.patch
b/dev-lang/swift/files/swift-6.0.3-r1/link-ncurses-tinfo.patch
deleted file mode 120000
index 85087f8ba7..0000000000
--- a/dev-lang/swift/files/swift-6.0.3-r1/link-ncurses-tinfo.patch
+++ /dev/null
@@ -1 +0,0 @@
-../swift-6.0.3/link-ncurses-tinfo.patch
\ No newline at end of file
diff --git a/dev-lang/swift/files/swift-6.0.3-r1/link-with-lld.patch
b/dev-lang/swift/files/swift-6.0.3-r1/link-with-lld.patch
deleted file mode 120000
index 866615918a..0000000000
--- a/dev-lang/swift/files/swift-6.0.3-r1/link-with-lld.patch
+++ /dev/null
@@ -1 +0,0 @@
-../swift-6.0.3/link-with-lld.patch
\ No newline at end of file
diff --git a/dev-lang/swift/files/swift-6.0.3-r2
b/dev-lang/swift/files/swift-6.0.3-r2
deleted file mode 120000
index 7c1e7a016c..0000000000
--- a/dev-lang/swift/files/swift-6.0.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-swift-6.0.3-r1
\ No newline at end of file
diff --git a/dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch
b/dev-lang/swift/files/swift-6.0.3-r2/backtracing-noexecstack.patch
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3/backtracing-noexecstack.patch
rename to dev-lang/swift/files/swift-6.0.3-r2/backtracing-noexecstack.patch
diff --git a/dev-lang/swift/files/swift-6.0.3/disable-libdispatch-werror.patch
b/dev-lang/swift/files/swift-6.0.3-r2/disable-libdispatch-werror.patch
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3/disable-libdispatch-werror.patch
rename to dev-lang/swift/files/swift-6.0.3-r2/disable-libdispatch-werror.patch
diff --git a/dev-lang/swift/files/swift-6.0.3-r1/gentoo.ini
b/dev-lang/swift/files/swift-6.0.3-r2/gentoo.ini
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3-r1/gentoo.ini
rename to dev-lang/swift/files/swift-6.0.3-r2/gentoo.ini
diff --git a/dev-lang/swift/files/swift-6.0.3-r1/indexstoredb-constant.patch
b/dev-lang/swift/files/swift-6.0.3-r2/indexstoredb-constant.patch
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3-r1/indexstoredb-constant.patch
rename to dev-lang/swift/files/swift-6.0.3-r2/indexstoredb-constant.patch
diff --git a/dev-lang/swift/files/swift-6.0.3/link-ncurses-tinfo.patch
b/dev-lang/swift/files/swift-6.0.3-r2/link-ncurses-tinfo.patch
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3/link-ncurses-tinfo.patch
rename to dev-lang/swift/files/swift-6.0.3-r2/link-ncurses-tinfo.patch
diff --git a/dev-lang/swift/files/swift-6.0.3/link-with-lld.patch
b/dev-lang/swift/files/swift-6.0.3-r2/link-with-lld.patch
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3/link-with-lld.patch
rename to dev-lang/swift/files/swift-6.0.3-r2/link-with-lld.patch
diff --git a/dev-lang/swift/files/swift-6.0.3-r1/respect-c-cxx-flags.patch
b/dev-lang/swift/files/swift-6.0.3-r2/respect-c-cxx-flags.patch
similarity index 100%
rename from dev-lang/swift/files/swift-6.0.3-r1/respect-c-cxx-flags.patch
rename to dev-lang/swift/files/swift-6.0.3-r2/respect-c-cxx-flags.patch
diff --git a/dev-lang/swift/files/swift-6.0.3/gentoo-build-preset.patch
b/dev-lang/swift/files/swift-6.0.3/gentoo-build-preset.patch
deleted file mode 100644
index 654c4a51c5..0000000000
--- a/dev-lang/swift/files/swift-6.0.3/gentoo-build-preset.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# Individual preset options:
-#
-# 1. mixin-preset: building for Linux, without compiler assertions, and with
-# most tests disabled
-# 2. build-ninja=0, libicu=0, skip-build-curl, skip-build-zlib: we'd prefer to
-# pick these up from the system
-# 3. build-swift-libexec=0: don't build binaries normally installed in
-# `/usr/local/libexec` because we're not allowed to install there ourselves
-# 4. extra-cmake-options:
-# * -DSWIFT_USE_LINKER=lld: let Swift know we'll be building it with `lld`
-# * -DBUILD_TESTING, -DSWIFT_INCLUDE_TESTS, -DSWIFT_INCLUDE_TEST_BINARIES:
-# the `no_test` preset disables building most, but not all tests; we don't
-# need to build any of them
-# * -DCOMPILER_RT_BUILD_ORC: the `compiler-rt` library defaults to building
-# the ORC LLVM JIT library, which we don't require; we disable it because
-# it builds with executable stacks, which trip up warnings on installation
-# * -DPython3_FIND_UNVERSIONED_NAMES: LLDB ships with Python bindings, and
-# uses CMake to search for Python. By default, CMake tries to find the
-# latest version installed on disk (currently, `python3.13`, then
-# `python3.12`, then...). This might not be the version of Python
specified
-# by `PYTHON_SINGLE_TARGET`, which we want to respect. We use
-# `python_setup` to place `${EPYTHON}` at the front of `PATH` as the
-# unversioned `python3`, so we want CMake to discover and use this binary
-# first before falling back to its search
-# 5. llvm-targets-to-build: we don't currently support architectures other than
-# amd64, so there's no point in building LLVM for multiple architectures; if
-# this changes (or we start supporting cross-compilation), we'll need to
-# build for more than just the host
-
---- a/swift/utils/build-presets.ini
-+++ b/swift/utils/build-presets.ini
-@@ -3051,3 +3051,24 @@ skip-test-cmark
-
- llvm-cmake-options=
- -DCLANG_DEFAULT_LINKER=gold
-+
-+[preset: gentoo]
-+mixin-preset=buildbot_linux,no_assertions,no_test
-+build-ninja=0
-+extra-cmake-options=
-+ -DLLVM_USE_LINKER:STRING=lld
-+ -DBUILD_TESTING:BOOL=NO
-+ -DSWIFT_INCLUDE_TESTS:BOOL=NO
-+ -DSWIFT_INCLUDE_TEST_BINARIES:BOOL=NO
-+ -DCOMPILER_RT_BUILD_ORC:BOOL=NO
-+ -DPython3_FIND_UNVERSIONED_NAMES:STRING=FIRST
-+llvm-targets-to-build=host
-+skip-build-curl
-+skip-build-zlib
-+
-+[preset: gentoo,libcxx]
-+mixin-preset=gentoo
-+libcxx
-+llvm-cmake-options=
-+ -DCLANG_DEFAULT_LINKER=lld
-+ -DCLANG_DEFAULT_CXX_STDLIB=libc++
diff --git a/dev-lang/swift/files/swift-6.1.3/backtracing-noexecstack.patch
b/dev-lang/swift/files/swift-6.1.3/backtracing-noexecstack.patch
index a8cdcc75a9..ea790374ed 120000
--- a/dev-lang/swift/files/swift-6.1.3/backtracing-noexecstack.patch
+++ b/dev-lang/swift/files/swift-6.1.3/backtracing-noexecstack.patch
@@ -1 +1 @@
-../swift-6.0.3-r1/backtracing-noexecstack.patch
\ No newline at end of file
+../swift-6.0.3-r2/backtracing-noexecstack.patch
\ No newline at end of file
diff --git a/dev-lang/swift/metadata.xml b/dev-lang/swift/metadata.xml
index fc6ca1c2ab..e059c62b31 100644
--- a/dev-lang/swift/metadata.xml
+++ b/dev-lang/swift/metadata.xml
@@ -8,11 +8,6 @@
<upstream>
<remote-id type="github">swiftlang/swift</remote-id>
</upstream>
- <use>
- <flag name="libcxx">
- Use <pkg>llvm-runtimes/libcxx</pkg> as the default C++ runtime library.
- </flag>
- </use>
<slots>
<slot name="0">
The original slot for swift-5.10.1; should no longer be used.
diff --git a/dev-lang/swift/swift-6.0.3-r1.ebuild
b/dev-lang/swift/swift-6.0.3-r1.ebuild
deleted file mode 100644
index 5c93d2e3eb..0000000000
--- a/dev-lang/swift/swift-6.0.3-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-PYTHON_COMPAT=( python3_{11..13} )
-inherit llvm-r1 python-single-r1 toolchain-funcs
-
-DESCRIPTION="A high-level, general-purpose, multi-paradigm, compiled
programming language"
-HOMEPAGE="https://www.swift.org";
-
-SRC_URI="
-
https://github.com/apple/swift-argument-parser/archive/refs/tags/1.2.3.tar.gz
-> swift-argument-parser-1.2.3.tar.gz
- https://github.com/apple/swift-asn1/archive/refs/tags/1.0.0.tar.gz ->
swift-asn1-1.0.0.tar.gz
- https://github.com/apple/swift-atomics/archive/refs/tags/1.2.0.tar.gz
-> swift-atomics-1.2.0.tar.gz
-
https://github.com/apple/swift-certificates/archive/refs/tags/1.0.1.tar.gz ->
swift-certificates-1.0.1.tar.gz
-
https://github.com/apple/swift-collections/archive/refs/tags/1.1.2.tar.gz ->
swift-collections-1.1.2.tar.gz
- https://github.com/apple/swift-crypto/archive/refs/tags/3.0.0.tar.gz ->
swift-crypto-3.0.0.tar.gz
- https://github.com/apple/swift-nio-ssl/archive/refs/tags/2.15.0.tar.gz
-> swift-nio-ssl-2.15.0.tar.gz
- https://github.com/apple/swift-nio/archive/refs/tags/2.31.2.tar.gz ->
swift-nio-2.31.2.tar.gz
- https://github.com/apple/swift-numerics/archive/refs/tags/1.0.2.tar.gz
-> swift-numerics-1.0.2.tar.gz
- https://github.com/apple/swift-system/archive/refs/tags/1.3.0.tar.gz ->
swift-system-1.3.0.tar.gz
- https://github.com/jpsim/Yams/archive/refs/tags/5.0.6.tar.gz ->
Yams-5.0.6.tar.gz
-
https://github.com/swiftlang/indexstore-db/archive/refs/tags/${P}-RELEASE.tar.gz
-> indexstore-db-${PV}.tar.gz
-
https://github.com/swiftlang/llvm-project/archive/refs/tags/${P}-RELEASE.tar.gz
-> llvm-project-${PV}.tar.gz
-
https://github.com/swiftlang/sourcekit-lsp/archive/refs/tags/${P}-RELEASE.tar.gz
-> sourcekit-lsp-${PV}.tar.gz
-
https://github.com/swiftlang/swift-cmark/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-cmark-${PV}.tar.gz
-
https://github.com/swiftlang/swift-corelibs-foundation/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-corelibs-foundation-${PV}.tar.gz
-
https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-corelibs-libdispatch-${PV}.tar.gz
-
https://github.com/swiftlang/swift-corelibs-xctest/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-corelibs-xctest-${PV}.tar.gz
-
https://github.com/swiftlang/swift-docc-render-artifact/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-docc-render-artifact-${PV}.tar.gz
-
https://github.com/swiftlang/swift-docc-symbolkit/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-docc-symbolkit-${PV}.tar.gz
-
https://github.com/swiftlang/swift-docc/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-docc-${PV}.tar.gz
-
https://github.com/swiftlang/swift-driver/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-driver-${PV}.tar.gz
-
https://github.com/swiftlang/swift-experimental-string-processing/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-experimental-string-processing-${PV}.tar.gz
-
https://github.com/swiftlang/swift-format/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-format-${PV}.tar.gz
-
https://github.com/swiftlang/swift-foundation-icu/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-foundation-icu-${PV}.tar.gz
-
https://github.com/swiftlang/swift-foundation/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-foundation-${PV}.tar.gz
-
https://github.com/swiftlang/swift-installer-scripts/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-installer-scripts-${PV}.tar.gz
-
https://github.com/swiftlang/swift-integration-tests/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-integration-tests-${PV}.tar.gz
-
https://github.com/swiftlang/swift-llbuild/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-llbuild-${PV}.tar.gz
-
https://github.com/swiftlang/swift-llvm-bindings/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-llvm-bindings-${PV}.tar.gz
-
https://github.com/swiftlang/swift-lmdb/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-lmdb-${PV}.tar.gz
-
https://github.com/swiftlang/swift-markdown/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-markdown-${PV}.tar.gz
-
https://github.com/swiftlang/swift-package-manager/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-package-manager-${PV}.tar.gz
-
https://github.com/swiftlang/swift-stress-tester/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-stress-tester-${PV}.tar.gz
-
https://github.com/swiftlang/swift-syntax/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-syntax-${PV}.tar.gz
-
https://github.com/swiftlang/swift-testing/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-testing-${PV}.tar.gz
-
https://github.com/swiftlang/swift-tools-support-core/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-tools-support-core-${PV}.tar.gz
-
https://github.com/swiftlang/swift/archive/refs/tags/${P}-RELEASE.tar.gz ->
${P}.tar.gz
-"
-
-PATCHES=(
- "${FILESDIR}/${PF}/backtracing-noexecstack.patch"
- "${FILESDIR}/${PF}/disable-libdispatch-werror.patch"
- "${FILESDIR}/${PF}/indexstoredb-constant.patch"
- "${FILESDIR}/${PF}/link-ncurses-tinfo.patch"
- "${FILESDIR}/${PF}/link-with-lld.patch"
- "${FILESDIR}/${PF}/respect-c-cxx-flags.patch"
-)
-
-S="${WORKDIR}"
-LICENSE="Apache-2.0"
-SLOT="6/0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="strip"
-
-RDEPEND="
- ${PYTHON_DEPS}
- !~dev-lang/swift-5.10.1:0
- >=app-arch/zstd-1.5
- >=app-eselect/eselect-swift-1.0-r1
- >=dev-db/sqlite-3
- >=dev-libs/icu-69
- >=dev-libs/libedit-20221030
- >=dev-libs/libxml2-2.11.5
- >=net-misc/curl-8.4
- >=sys-libs/ncurses-6
- >=virtual/zlib-1.3:=
- dev-lang/python
- $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}=')
-"
-
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-build/cmake-3.24.2
- >=dev-build/ninja-1.11.1
- >=dev-db/sqlite-3
- >=dev-libs/icu-69
- >=dev-libs/libedit-20221030
- >=dev-libs/libxml2-2.11.5
- >=dev-util/patchelf-0.18
- >=dev-vcs/git-2.39
- >=sys-apps/coreutils-9
- >=sys-devel/gcc-11
- >=sys-libs/ncurses-6
- >=virtual/zlib-1.3:=
- || (
- dev-lang/swift
- dev-lang/swift-bootstrap
- )
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}=
- llvm-core/lld:${LLVM_SLOT}=
- ')
- dev-lang/python
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ' python3_{12..13})
-"
-
-SWIFT_BUILD_PRESETS_INI_PATH="${S}/gentoo-build-presets.ini"
-SWIFT_BUILD_PRESET='gentoo'
-PKG_PREINST_SWIFT_INTENTIONALLY_SET='true'
-
-# Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
-# (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
-clang-ldflags() {
- local flag input="$@"
- [[ -z ${input} ]] && input=${LDFLAGS}
- set --
- for flag in ${input//,/ } ; do
- case ${flag} in
- -Wl) ;;
- *) set -- "$@" "-Xlinker ${flag}" ;;
- esac
- done
- echo "$@"
-}
-
-pkg_setup() {
- # Sets `${EPYTHON}` according to `PYTHON_SINGLE_TARGET`, sets up
- # `${T}/${EPYTHON}` with that version, and adds it to the `PATH`.
- python_setup
-
- # Sets up `PATH` to point to the appropriate LLVM toolchain, and ensure
- # we're using the toolchain for compilation.
- llvm-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- # The Swift project expects a specific directory structure that we have
to
- # match. For most directories, it's enough to trim the version number
at the
- # end:
- find "${S}" \
- -mindepth 1 -maxdepth 1 \
- -execdir sh -c \
- "mv '{}' \"\$(echo '{}' | sed -e
's_-\(swift-${PV}-RELEASE\|\([0-9]\+\.\)*[0-9]\+\)\$__' | tr '[:upper:]'
'[:lower:]')\"" ';' \
- || die
-
- # Some one-off fixups:
- pushd "${S}" \
- && mv 'swift-cmark' 'cmark' \
- && mv 'swift-llbuild' 'llbuild' \
- && mv 'swift-package-manager' 'swiftpm' \
- && popd \
- || die
-}
-
-src_configure() {
- CC="$(type -P clang)"
- CXX="$(type -P clang++)"
- LD="$(type -P ld.lld)"
-
- # Swift builds with CMake, which picks up `LDFLAGS` from the
environment and
- # populates `CMAKE_EXE_LINKER_FLAGS` with them. `LDFLAGS` are typically
- # given as GCC-style flags (`-Wlinker,foo`), which Clang understands;
- # unfortunately, CMake passes these flags to all compilers under the
- # assumption they support the same syntax, but `swiftc` _only_
understands
- # Clang-style flags (`-Xlinker -foo`). In order to pass `LDFLAGS` in, we
- # have to turn them into a format that `swiftc` will understand.
- #
- # We can do this because we know we're compiling with Clang
specifically.
- export LDFLAGS="$(clang-ldflags)"
-
- # Extend the 'gentoo' build preset with user-specified flags and flags
for
- # libc++ systems.
- cp "${FILESDIR}/${PF}/gentoo.ini" "${SWIFT_BUILD_PRESETS_INI_PATH}"
- local extra_build_flags=()
-
- # Setting `-j<n>`/`--jobs=<n>` in MAKEOPTS needs to be manually exposed
to
- # the Swift build system.
- if [[ -n "${MAKEOPTS}" ]]; then
- local num_jobs make_opts=( $(getopt -qu -o 'j:' -l 'jobs:' --
${MAKEOPTS}) )
- while [[ "${#make_opts[@]}" -gt 1 ]]; do
- case "${make_opts[0]}" in
- -j | --jobs )
- num_jobs="${make_opts[1]}"
- make_opts=("${make_opts[@]:2}") ;;
- -- ) break ;;
- * ) make_opts=("${make_opts[@]:1}") ;;
- esac
- done
-
- if [[ -n "${num_jobs}" ]]; then
- extra_build_flags+=(--jobs="${num_jobs}")
- fi
- fi
-
- if [[ "$(tc-get-cxx-stdlib)" = 'libc++' ]]; then
- # On systems which use libc++ as their default C++ stdlib (e.g.
systems
- # with the LLVM profile), we want to build the internal libc++
and
- # ensure we link against it.
- extra_build_flags+=(
- --libcxx
- --extra-cmake-options=-DCLANG_DEFAULT_CXX_STDLIB=libc++
- )
- fi
-
- extra_build_flags+=(${SWIFT_EXTRA_BUILD_FLAGS})
-
- if [[ ${#extra_build_flags[@]} -gt 0 ]]; then
- SWIFT_BUILD_PRESET='gentoo,custom'
- {
- echo "[preset: gentoo,custom]"
- echo "mixin-preset=gentoo"
- for flag in "${extra_build_flags[@]}"; do
- echo "${flag#--}"
- done
- } >> "${SWIFT_BUILD_PRESETS_INI_PATH}"
- fi
-}
-
-src_compile() {
- # Building swift-driver writes to this directory for some reason, but
the
- # contents are irrelevant.
- addpredict /var/lib/portage/home/.swiftpm
-
- # Versions of Swift 6.0 and later require an existing Swift compiler to
- # bootstrap from. We can use any version from 5.10.1 and on.
- local swift_version="$(best_version -b "${CATEGORY}/${PN}")"
- swift_version="${swift_version#${CATEGORY}/}" # reduce to ${PVR} form
- swift_version="${swift_version%-r[[:digit:]]*}" # reduce to ${P} form
-
- local original_path="${PATH}"
- export PATH="/usr/lib64/${swift_version}/usr/bin:${original_path}"
- "${S}/swift/utils/build-script" \
- --preset-file="${S}/swift/utils/build-presets.ini" \
- --preset-file="${SWIFT_BUILD_PRESETS_INI_PATH}" \
- --preset="${SWIFT_BUILD_PRESET}" \
- install_destdir="${S}/${P}" \
- installable_package="" \
- || die
-
- export PATH="${original_path}"
-}
-
-src_install() {
- # `libTesting` as built has its RPATH set to the absolute path to its
- # containing dir, which is in the build sandbox. This directory won't
exist
- # after installation, and is the same as '$ORIGIN'.
- patchelf --set-rpath '$ORIGIN'
"${S}/${P}/usr/lib/swift/linux/libTesting.so" || die
-
- # The Swift build output is intended to be self-contained, and is
- # _significantly_ easier to leave as-is than attempt to splat onto the
- # filesystem; we'll install the output versioned into `/usr/lib64` and
- # expose the relevant binaries via linking.
- local dest_dir="/usr/lib64/${P}"
- mkdir -p "${ED}/${dest_dir}" \
- && cp -pPR "${S}/${P}/." "${ED}/${dest_dir}" \
- || die
-
- # Swift ships with its own `clang`, `lldb`, etc.; we don't want these
to be
- # exposed externally, so we'll just symlink Swift-specific binaries into
- # `/usr/bin`. (The majority of executables don't need to be exposed as
- # `swift <command>` calls `swift-<command>` directly.)
- local bin
- for bin in swift swiftc sourcekit-lsp; do
- # We only install versioned symlinks; non-versioned links are
maanged
- # via `eselect swift`.
- dosym -r "${dest_dir}/usr/bin/${bin}" "/usr/bin/${bin}-${PV}"
- done
-}
-
-pkg_preinst() {
- # After installation, we ideally want the system to have the latest
Swift
- # version set -- but if the system already has a Swift version set and
it
- # isn't the latest version, that's likely an intentional decision that
we
- # don't want to override.
- local current_swift_version="$(eselect swift show | tail -n1 | xargs)"
- local latest_swift_version="$(eselect swift show --latest | tail -n1 |
xargs)"
- [[ "${current_swift_version}" == '(unset)' ]] \
- || [[ "${current_swift_version}" == "${latest_swift_version}"
]] \
- && PKG_PREINST_SWIFT_INTENTIONALLY_SET='false'
-}
-
-pkg_postinst() {
- # If the system doesn't have Swift intentionally set to an older
version, we
- # can update to the latest.
- if [[ "${PKG_PREINST_SWIFT_INTENTIONALLY_SET}" == 'false' ]]; then
- eselect swift update
- fi
-}
-
-pkg_postrm() {
- # We don't want to leave behind symlinks pointing to this Swift version
on
- # removal.
- local current_swift_version="$(eselect swift show | tail -n1 | xargs)"
- if [[ "${current_swift_version}" == "${P}" ]]; then
- eselect swift update
- fi
-}
-
diff --git a/dev-lang/swift/swift-6.0.3-r2.ebuild
b/dev-lang/swift/swift-6.0.3-r2.ebuild
index 56fa038683..7757a3eeaa 100644
--- a/dev-lang/swift/swift-6.0.3-r2.ebuild
+++ b/dev-lang/swift/swift-6.0.3-r2.ebuild
@@ -318,4 +318,3 @@ pkg_postrm() {
eselect swift update
fi
}
-
diff --git a/dev-lang/swift/swift-6.0.3.ebuild
b/dev-lang/swift/swift-6.0.3.ebuild
deleted file mode 100644
index 1ec8179615..0000000000
--- a/dev-lang/swift/swift-6.0.3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-PYTHON_COMPAT=( python3_{11..13} )
-inherit llvm-r1 python-single-r1
-
-DESCRIPTION="A high-level, general-purpose, multi-paradigm, compiled
programming language"
-HOMEPAGE="https://www.swift.org";
-
-SRC_URI="
-
https://github.com/apple/swift-argument-parser/archive/refs/tags/1.2.3.tar.gz
-> swift-argument-parser-1.2.3.tar.gz
- https://github.com/apple/swift-asn1/archive/refs/tags/1.0.0.tar.gz ->
swift-asn1-1.0.0.tar.gz
- https://github.com/apple/swift-atomics/archive/refs/tags/1.2.0.tar.gz
-> swift-atomics-1.2.0.tar.gz
-
https://github.com/apple/swift-certificates/archive/refs/tags/1.0.1.tar.gz ->
swift-certificates-1.0.1.tar.gz
-
https://github.com/apple/swift-collections/archive/refs/tags/1.1.2.tar.gz ->
swift-collections-1.1.2.tar.gz
- https://github.com/apple/swift-crypto/archive/refs/tags/3.0.0.tar.gz ->
swift-crypto-3.0.0.tar.gz
- https://github.com/apple/swift-nio-ssl/archive/refs/tags/2.15.0.tar.gz
-> swift-nio-ssl-2.15.0.tar.gz
- https://github.com/apple/swift-nio/archive/refs/tags/2.31.2.tar.gz ->
swift-nio-2.31.2.tar.gz
- https://github.com/apple/swift-numerics/archive/refs/tags/1.0.2.tar.gz
-> swift-numerics-1.0.2.tar.gz
- https://github.com/apple/swift-system/archive/refs/tags/1.3.0.tar.gz ->
swift-system-1.3.0.tar.gz
- https://github.com/jpsim/Yams/archive/refs/tags/5.0.6.tar.gz ->
Yams-5.0.6.tar.gz
-
https://github.com/swiftlang/indexstore-db/archive/refs/tags/${P}-RELEASE.tar.gz
-> indexstore-db-${PV}.tar.gz
-
https://github.com/swiftlang/llvm-project/archive/refs/tags/${P}-RELEASE.tar.gz
-> llvm-project-${PV}.tar.gz
-
https://github.com/swiftlang/sourcekit-lsp/archive/refs/tags/${P}-RELEASE.tar.gz
-> sourcekit-lsp-${PV}.tar.gz
-
https://github.com/swiftlang/swift-cmark/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-cmark-${PV}.tar.gz
-
https://github.com/swiftlang/swift-corelibs-foundation/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-corelibs-foundation-${PV}.tar.gz
-
https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-corelibs-libdispatch-${PV}.tar.gz
-
https://github.com/swiftlang/swift-corelibs-xctest/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-corelibs-xctest-${PV}.tar.gz
-
https://github.com/swiftlang/swift-docc-render-artifact/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-docc-render-artifact-${PV}.tar.gz
-
https://github.com/swiftlang/swift-docc-symbolkit/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-docc-symbolkit-${PV}.tar.gz
-
https://github.com/swiftlang/swift-docc/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-docc-${PV}.tar.gz
-
https://github.com/swiftlang/swift-driver/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-driver-${PV}.tar.gz
-
https://github.com/swiftlang/swift-experimental-string-processing/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-experimental-string-processing-${PV}.tar.gz
-
https://github.com/swiftlang/swift-format/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-format-${PV}.tar.gz
-
https://github.com/swiftlang/swift-foundation-icu/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-foundation-icu-${PV}.tar.gz
-
https://github.com/swiftlang/swift-foundation/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-foundation-${PV}.tar.gz
-
https://github.com/swiftlang/swift-installer-scripts/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-installer-scripts-${PV}.tar.gz
-
https://github.com/swiftlang/swift-integration-tests/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-integration-tests-${PV}.tar.gz
-
https://github.com/swiftlang/swift-llbuild/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-llbuild-${PV}.tar.gz
-
https://github.com/swiftlang/swift-llvm-bindings/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-llvm-bindings-${PV}.tar.gz
-
https://github.com/swiftlang/swift-lmdb/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-lmdb-${PV}.tar.gz
-
https://github.com/swiftlang/swift-markdown/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-markdown-${PV}.tar.gz
-
https://github.com/swiftlang/swift-package-manager/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-package-manager-${PV}.tar.gz
-
https://github.com/swiftlang/swift-stress-tester/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-stress-tester-${PV}.tar.gz
-
https://github.com/swiftlang/swift-syntax/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-syntax-${PV}.tar.gz
-
https://github.com/swiftlang/swift-testing/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-testing-${PV}.tar.gz
-
https://github.com/swiftlang/swift-tools-support-core/archive/refs/tags/${P}-RELEASE.tar.gz
-> swift-tools-support-core-${PV}.tar.gz
-
https://github.com/swiftlang/swift/archive/refs/tags/${P}-RELEASE.tar.gz ->
${P}.tar.gz
-"
-
-PATCHES=(
- "${FILESDIR}/${PF}/backtracing-noexecstack.patch"
- "${FILESDIR}/${PF}/disable-libdispatch-werror.patch"
- "${FILESDIR}/${PF}/gentoo-build-preset.patch"
- "${FILESDIR}/${PF}/link-ncurses-tinfo.patch"
- "${FILESDIR}/${PF}/link-with-lld.patch"
-)
-
-S="${WORKDIR}"
-LICENSE="Apache-2.0"
-SLOT="6/0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="libcxx"
-
-RESTRICT="strip"
-
-RDEPEND="
- ${PYTHON_DEPS}
- !~dev-lang/swift-5.10.1:0
- >=app-arch/zstd-1.5
- >=dev-db/sqlite-3
- >=dev-libs/icu-69
- >=dev-libs/libedit-20221030
- >=dev-libs/libxml2-2.11.5
- >=net-misc/curl-8.4
- >=sys-libs/ncurses-6
- >=virtual/zlib-1.3:=
- app-eselect/eselect-swift
- dev-lang/python
- $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}=')
-"
-
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-build/cmake-3.24.2
- >=dev-build/ninja-1.11.1
- >=dev-db/sqlite-3
- >=dev-libs/icu-69
- >=dev-libs/libedit-20221030
- >=dev-libs/libxml2-2.11.5
- >=dev-util/patchelf-0.18
- >=dev-vcs/git-2.39
- >=sys-apps/coreutils-9
- >=sys-devel/gcc-11
- >=sys-libs/ncurses-6
- >=virtual/zlib-1.3:=
- || (
- dev-lang/swift
- dev-lang/swift-bootstrap
- )
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}=
- llvm-core/lld:${LLVM_SLOT}=
- ')
- dev-lang/python
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ' python3_{12..13})
-"
-
-# Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
-# (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
-clang-ldflags() {
- local flag input="$@"
- [[ -z ${input} ]] && input=${LDFLAGS}
- set --
- for flag in ${input//,/ } ; do
- case ${flag} in
- -Wl) ;;
- *) set -- "$@" "-Xlinker ${flag}" ;;
- esac
- done
- echo "$@"
-}
-
-pkg_setup() {
- # Sets `${EPYTHON}` according to `PYTHON_SINGLE_TARGET`, sets up
- # `${T}/${EPYTHON}` with that version, and adds it to the `PATH`.
- python_setup
-
- # Sets up `PATH` to point to the appropriate LLVM toolchain, and ensure
- # we're using the toolchain for compilation.
- llvm-r1_pkg_setup
- CC="$(type -P clang)"
- CXX="$(type -P clang++)"
- LD="$(type -P ld.lld)"
-
- # Swift builds with CMake, which picks up `LDFLAGS` from the
environment and
- # populates `CMAKE_EXE_LINKER_FLAGS` with them. `LDFLAGS` are typically
- # given as GCC-style flags (), which Clang understands;
- # unfortunately, CMake passes these flags to all compilers under the
- # assumption they support the same syntax, but `swiftc` _only_
understands
- # Clang-style flags (`-Xlinker -foo`). In order to pass `LDFLAGS` in, we
- # have to turn them into a format that `swiftc` will understand.
- #
- # We can do this because we know we're compiling with Clang
specifically.
- export LDFLAGS="$(clang-ldflags)"
-}
-
-src_unpack() {
- default
-
- # The Swift project expects a specific directory structure that we have
to
- # match. For most directories, it's enough to trim the version number
at the
- # end:
- find "${S}" \
- -mindepth 1 -maxdepth 1 \
- -execdir sh -c \
- "mv '{}' \"\$(echo '{}' | sed -e
's_-\(swift-${PV}-RELEASE\|\([0-9]\+\.\)*[0-9]\+\)\$__' | tr '[:upper:]'
'[:lower:]')\"" ';' \
- || die
-
- # Some one-off fixups:
- pushd "${S}" \
- && mv 'swift-cmark' 'cmark' \
- && mv 'swift-llbuild' 'llbuild' \
- && mv 'swift-package-manager' 'swiftpm' \
- && popd \
- || die
-}
-
-src_compile() {
- # Building swift-driver writes to this directory for some reason, but
the
- # contents are irrelevant.
- addpredict /var/lib/portage/home/.swiftpm
-
- # Versions of Swift 6.0 and later require an existing Swift compiler to
- # bootstrap from. We can use any version from 5.10.1 and on.
- local swift_version="$(best_version -b "${CATEGORY}/${PN}")"
- swift_version="${swift_version#${CATEGORY}/}" # reduce to ${PVR} form
- swift_version="${swift_version%-r[[:digit:]]*}" # reduce to ${P} form
-
- local swift_preset='gentoo'
-
- if use libcxx; then
- swift_preset='gentoo,libcxx'
- fi
-
- local original_path="${PATH}"
- export PATH="/usr/lib64/${swift_version}/usr/bin:${original_path}"
- "${S}/swift/utils/build-script" \
- --preset="${swift_preset}" \
- install_destdir="${S}/${P}" \
- installable_package="" \
- || die
-
- export PATH="${original_path}"
-}
-
-src_install() {
- # `libTesting` as built has its RPATH set to the absolute path to its
- # containing dir, which is in the build sandbox. This directory won't
exist
- # after installation, and is the same as '$ORIGIN'.
- patchelf --set-rpath '$ORIGIN'
"${S}/${P}/usr/lib/swift/linux/libTesting.so" || die
-
- # The Swift build output is intended to be self-contained, and is
- # _significantly_ easier to leave as-is than attempt to splat onto the
- # filesystem; we'll install the output versioned into `/usr/lib64` and
- # expose the relevant binaries via linking.
- local dest_dir="/usr/lib64/${P}"
- mkdir -p "${ED}/${dest_dir}" \
- && cp -pPR "${S}/${P}/." "${ED}/${dest_dir}" \
- || die
-
- # Swift ships with its own `clang`, `lldb`, etc.; we don't want these
to be
- # exposed externally, so we'll just symlink Swift-specific binaries into
- # `/usr/bin`. (The majority of executables don't need to be exposed as
- # `swift <command>` calls `swift-<command>` directly.)
- local bin
- for bin in swift swiftc sourcekit-lsp; do
- # We only install versioned symlinks; non-versioned links are
maanged
- # via `eselect swift`.
- dosym -r "${dest_dir}/usr/bin/${bin}" "/usr/bin/${bin}-${PV}"
- done
-}
-
-pkg_postinst() {
- # If we're installing the latest version of Swift, then update symlinks
to
- # it. (We don't want to call `eselect swift update` unconditionally in
case
- # we're installing an older version of Swift, and the user has
intentionally
- # selected a version other than the latest.)
- if ! has_version ">${CATEGORY}/${P}"; then
- eselect swift update
- fi
-}
-
-pkg_postrm() {
- # We don't want to leave behind symlinks pointing to this Swift version
on
- # removal.
- local eselect_swift_version="$(eselect swift show)"
- if [[ "${eselect_swift_version}" == *"${P}" ]]; then
- eselect swift update
- fi
-}
