commit:     6c6dc8ce59847caca672cc6f9710fa168c10d787
Author:     Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Wed Mar 26 15:21:03 2025 +0000
Commit:     Itai Ferber <itai <AT> itaiferber <DOT> net>
CommitDate: Wed Mar 26 19:46:02 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6c6dc8ce

dev-lang/swift: add swift-5.10.1-r4, swift-6.0.3-r1

Swift is now set up to properly respect CFLAGS, CXXFLAGS, and LDFLAGS
from the environment by not overriding those values in the build system.
Swift 6 now also picks up on `SWIFT_EXTRA_BUILD_FLAGS` from the
environment and passes those to its build system as well.

Closes: https://bugs.gentoo.org/939764
Closes: https://bugs.gentoo.org/939766
Signed-off-by: Itai Ferber <itai <AT> itaiferber.net>

 .../swift-5.10.1-r4/backport-swift-75662.patch     |   1 +
 .../swift-5.10.1-r4/backtracing-noexecstack.patch  |   1 +
 .../swift-5.10.1-r4/clang-indexstore-exports.patch |   1 +
 .../disable-libdispatch-werror.patch               |   1 +
 .../files/swift-5.10.1-r4/link-ncurses-tinfo.patch |   1 +
 .../files/swift-5.10.1-r4/link-with-lld.patch      |   1 +
 .../lldb-cmake-minimum-version.patch               |   1 +
 .../swift-5.10.1-r4/respect-c-cxx-flags.patch      |  64 ++++
 .../swift-6.0.3-r1/backtracing-noexecstack.patch   |   1 +
 .../disable-libdispatch-werror.patch               |   1 +
 dev-lang/swift/files/swift-6.0.3-r1/gentoo.ini     |  43 +++
 .../swift-6.0.3-r1/indexstoredb-constant.patch     |  19 ++
 .../files/swift-6.0.3-r1/link-ncurses-tinfo.patch  |   1 +
 .../swift/files/swift-6.0.3-r1/link-with-lld.patch |   1 +
 .../files/swift-6.0.3-r1/respect-c-cxx-flags.patch |   1 +
 dev-lang/swift/swift-5.10.1-r4.ebuild              | 355 +++++++++++++++++++++
 dev-lang/swift/swift-6.0.3-r1.ebuild               | 277 ++++++++++++++++
 17 files changed, 770 insertions(+)

diff --git a/dev-lang/swift/files/swift-5.10.1-r4/backport-swift-75662.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/backport-swift-75662.patch
new file mode 120000
index 000000000..4819ef131
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/backport-swift-75662.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/backport-swift-75662.patch
\ No newline at end of file

diff --git a/dev-lang/swift/files/swift-5.10.1-r4/backtracing-noexecstack.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/backtracing-noexecstack.patch
new file mode 120000
index 000000000..baa1d856c
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/backtracing-noexecstack.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/backtracing-noexecstack.patch
\ No newline at end of file

diff --git 
a/dev-lang/swift/files/swift-5.10.1-r4/clang-indexstore-exports.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/clang-indexstore-exports.patch
new file mode 120000
index 000000000..9dcedcf3b
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/clang-indexstore-exports.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/clang-indexstore-exports.patch
\ No newline at end of file

diff --git 
a/dev-lang/swift/files/swift-5.10.1-r4/disable-libdispatch-werror.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/disable-libdispatch-werror.patch
new file mode 120000
index 000000000..fea7b7fe7
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/disable-libdispatch-werror.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/disable-libdispatch-werror.patch
\ No newline at end of file

diff --git a/dev-lang/swift/files/swift-5.10.1-r4/link-ncurses-tinfo.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/link-ncurses-tinfo.patch
new file mode 120000
index 000000000..7bd764820
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/link-ncurses-tinfo.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/link-ncurses-tinfo.patch
\ No newline at end of file

diff --git a/dev-lang/swift/files/swift-5.10.1-r4/link-with-lld.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/link-with-lld.patch
new file mode 120000
index 000000000..922cf831f
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/link-with-lld.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/link-with-lld.patch
\ No newline at end of file

diff --git 
a/dev-lang/swift/files/swift-5.10.1-r4/lldb-cmake-minimum-version.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/lldb-cmake-minimum-version.patch
new file mode 120000
index 000000000..c1eab17fb
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/lldb-cmake-minimum-version.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r3/lldb-cmake-minimum-version.patch
\ No newline at end of file

diff --git a/dev-lang/swift/files/swift-5.10.1-r4/respect-c-cxx-flags.patch 
b/dev-lang/swift/files/swift-5.10.1-r4/respect-c-cxx-flags.patch
new file mode 100644
index 000000000..f52d54277
--- /dev/null
+++ b/dev-lang/swift/files/swift-5.10.1-r4/respect-c-cxx-flags.patch
@@ -0,0 +1,64 @@
+# CMake automatically reads `CFLAGS`, `CXXFLAGS`, `LDFLAGS`, etc. from the
+# environment and uses them to populate its default flag variables -- but the
+# Swift build system blows away `CMAKE_C{XX}_FLAGS` without picking up the
+# environment. These need to be picked up again to not be ignored.
+
+--- a/swift/utils/build-script-impl
++++ b/swift/utils/build-script-impl
+@@ -1820,10 +1820,10 @@ for host in "${ALL_HOSTS[@]}"; do
+
+                 cmake_options=(
+                     "${cmake_options[@]}"
+-                    -DCMAKE_C_FLAGS="$(swift_c_flags ${host})"
+-                    -DCMAKE_CXX_FLAGS="$(swift_c_flags ${host})"
+-                    -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
+-                    -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
++                    -DCMAKE_C_FLAGS="${CFLAGS} $(swift_c_flags ${host})"
++                    -DCMAKE_CXX_FLAGS="${CXXFLAGS} $(swift_c_flags ${host})"
++                    -DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS} -O2 -DNDEBUG"
++                    -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${CXXFLAGS} -O2 
-DNDEBUG"
+                     -DCMAKE_BUILD_TYPE:STRING="${SWIFT_BUILD_TYPE}"
+                     -DLLVM_ENABLE_ASSERTIONS:BOOL=$(true_false 
"${SWIFT_ENABLE_ASSERTIONS}")
+                     -DBOOTSTRAPPING_MODE:STRING=$(to_bootstrapping_mode 
"${BOOTSTRAPPING}")
+@@ -2215,8 +2215,8 @@ for host in "${ALL_HOSTS[@]}"; do
+                 cmake_options=(
+                     "${cmake_options[@]}"
+                     -C${LLDB_SOURCE_DIR}/cmake/caches/${cmake_cache}
+-                    -DCMAKE_C_FLAGS="$(llvm_c_flags ${host})"
+-                    -DCMAKE_CXX_FLAGS="$(llvm_c_flags ${host})"
++                    -DCMAKE_C_FLAGS="${CFLAGS} $(llvm_c_flags ${host})"
++                    -DCMAKE_CXX_FLAGS="${CXXFLAGS} $(llvm_c_flags ${host})"
+                     -DCMAKE_BUILD_TYPE:STRING="${LLDB_BUILD_TYPE}"
+                     -DLLDB_SWIFTC:PATH=${SWIFTC_BIN}
+                     -DLLDB_SWIFT_LIBS:PATH="$(build_directory ${LOCAL_HOST} 
swift)/lib/swift"
+--- a/swift/utils/swift_build_support/swift_build_support/products/llvm.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/llvm.py
+@@ -261,10 +261,10 @@ class LLVM(cmake_product.CMakeProduct):
+         # llvm/tools, e.g. to build LLDB.
+
+         llvm_c_flags = ' '.join(self.llvm_c_flags(platform, arch))
+-        llvm_cmake_options.define('CMAKE_C_FLAGS', llvm_c_flags)
+-        llvm_cmake_options.define('CMAKE_CXX_FLAGS', llvm_c_flags)
+-        llvm_cmake_options.define('CMAKE_C_FLAGS_RELWITHDEBINFO', '-O2 
-DNDEBUG')
+-        llvm_cmake_options.define('CMAKE_CXX_FLAGS_RELWITHDEBINFO', '-O2 
-DNDEBUG')
++        llvm_cmake_options.define('CMAKE_C_FLAGS', ' 
'.join([os.environ.get('CFLAGS', ''), llvm_c_flags]))
++        llvm_cmake_options.define('CMAKE_CXX_FLAGS', ' 
'.join([os.environ.get('CXXFLAGS', ''), llvm_c_flags]))
++        llvm_cmake_options.define('CMAKE_C_FLAGS_RELWITHDEBINFO', ' 
'.join([os.environ.get('CFLAGS', ''), '-O2 -DNDEBUG']))
++        llvm_cmake_options.define('CMAKE_CXX_FLAGS_RELWITHDEBINFO', ' 
'.join([os.environ.get('CXXFLAGS', ''), '-O2 -DNDEBUG']))
+         llvm_cmake_options.define('CMAKE_BUILD_TYPE:STRING',
+                                   self.args.llvm_build_variant)
+         llvm_cmake_options.define('LLVM_TOOL_SWIFT_BUILD:BOOL', 'FALSE')
+--- a/swift/utils/swift_build_support/swift_build_support/products/product.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/product.py
+@@ -440,8 +440,8 @@ class Product(object):
+
+         (platform, arch) = host_target.split('-')
+         common_c_flags = ' '.join(self.common_cross_c_flags(platform, arch))
+-        self.cmake_options.define('CMAKE_C_FLAGS', common_c_flags)
+-        self.cmake_options.define('CMAKE_CXX_FLAGS', common_c_flags)
++        self.cmake_options.define('CMAKE_C_FLAGS', ' 
'.join([os.environ.get('CFLAGS', ''), common_c_flags]))
++        self.cmake_options.define('CMAKE_CXX_FLAGS', ' 
'.join([os.environ.get('CXXFLAGS', ''), common_c_flags]))
+
+         toolchain_file = None
+         if self.is_darwin_host(host_target):
+

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
new file mode 120000
index 000000000..2b90f491a
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/backtracing-noexecstack.patch
@@ -0,0 +1 @@
+../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
new file mode 120000
index 000000000..51c160975
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/disable-libdispatch-werror.patch
@@ -0,0 +1 @@
+../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/gentoo.ini 
b/dev-lang/swift/files/swift-6.0.3-r1/gentoo.ini
new file mode 100644
index 000000000..0d7b63b38
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/gentoo.ini
@@ -0,0 +1,43 @@
+# Individual preset options:
+#
+# 1. mixin-preset: building for Linux, without compiler assertions, and with
+#    most tests disabled
+# 2. build-ninja=0, skip-build-curl, skip-build-zlib: we'd prefer to pick these
+#    up from the system
+# 3. extra-cmake-options:
+#    * -DLLVM_USE_LINKER, -DCLANG_DEFAULT_LINKER: build LLVM, clang, Swift, et.
+#      al. to link using lld, and ensure Clang uses it as its default
+#    * -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
+
+[preset: gentoo]
+mixin-preset=buildbot_linux,no_assertions,no_test
+build-ninja=0
+extra-cmake-options=
+       -DLLVM_USE_LINKER:STRING=lld
+       -DCLANG_DEFAULT_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
+

diff --git a/dev-lang/swift/files/swift-6.0.3-r1/indexstoredb-constant.patch 
b/dev-lang/swift/files/swift-6.0.3-r1/indexstoredb-constant.patch
new file mode 100644
index 000000000..b693a0c0d
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/indexstoredb-constant.patch
@@ -0,0 +1,19 @@
+# Prior to C23, the C standard restricts enum values to the range of `int`;
+# relaxing this is a GNU extension that Clang follows. On LLVM-profile systems,
+# though, this appears to not be enabled by default, causing Clang to complain
+# that `1 << 63` is not a compile-time expression (since it overflows an `int`
+# and can't be computed at compile-time). This can be suppressed by causing the
+# enum to be interpreted explicitly as containing `unsigned long long` values
+# instead.
+
+--- a/indexstore-db/include/CIndexStoreDB/CIndexStoreDB.h
++++ b/indexstore-db/include/CIndexStoreDB/CIndexStoreDB.h
+@@ -82,7 +82,7 @@ typedef enum {
+   INDEXSTOREDB_SYMBOL_ROLE_REL_IBTYPEOF    = 1 << 17,
+   INDEXSTOREDB_SYMBOL_ROLE_REL_SPECIALIZATIONOF = 1 << 18,
+
+-  INDEXSTOREDB_SYMBOL_ROLE_CANONICAL = 1 << 63,
++  INDEXSTOREDB_SYMBOL_ROLE_CANONICAL = 1ULL << 63,
+ } indexstoredb_symbol_role_t;
+
+ typedef enum {

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
new file mode 120000
index 000000000..85087f8ba
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/link-ncurses-tinfo.patch
@@ -0,0 +1 @@
+../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
new file mode 120000
index 000000000..866615918
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/link-with-lld.patch
@@ -0,0 +1 @@
+../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-r1/respect-c-cxx-flags.patch 
b/dev-lang/swift/files/swift-6.0.3-r1/respect-c-cxx-flags.patch
new file mode 120000
index 000000000..00acdccab
--- /dev/null
+++ b/dev-lang/swift/files/swift-6.0.3-r1/respect-c-cxx-flags.patch
@@ -0,0 +1 @@
+../swift-5.10.1-r4/respect-c-cxx-flags.patch
\ No newline at end of file

diff --git a/dev-lang/swift/swift-5.10.1-r4.ebuild 
b/dev-lang/swift/swift-5.10.1-r4.ebuild
new file mode 100644
index 000000000..560efa3cf
--- /dev/null
+++ b/dev-lang/swift/swift-5.10.1-r4.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2024 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 flag-o-matic 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.0.2.tar.gz 
-> swift-atomics-1.0.2.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.0.5.tar.gz -> 
swift-collections-1.0.5.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.1.tar.gz 
-> swift-numerics-1.0.1.tar.gz
+       https://github.com/apple/swift-system/archive/refs/tags/1.1.1.tar.gz -> 
swift-system-1.1.1.tar.gz
+       
https://github.com/apple/swift-xcode-playground-support/archive/refs/tags/${P}-RELEASE.tar.gz
 -> swift-xcode-playground-support-${PV}.tar.gz
+       https://github.com/jpsim/Yams/archive/refs/tags/5.0.1.tar.gz -> 
Yams-5.0.1.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-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-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}/backport-swift-75662.patch"
+       "${FILESDIR}/${PF}/backtracing-noexecstack.patch"
+       "${FILESDIR}/${PF}/clang-indexstore-exports.patch"
+       "${FILESDIR}/${PF}/disable-libdispatch-werror.patch"
+       "${FILESDIR}/${PF}/link-ncurses-tinfo.patch"
+       "${FILESDIR}/${PF}/link-with-lld.patch"
+       "${FILESDIR}/${PF}/lldb-cmake-minimum-version.patch"
+       "${FILESDIR}/${PF}/respect-c-cxx-flags.patch"
+)
+
+S="${WORKDIR}"
+LICENSE="Apache-2.0"
+SLOT="5/10"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="strip"
+
+RDEPEND="
+       ${PYTHON_DEPS}
+       >=app-arch/zstd-1.5
+       >=app-eselect/eselect-swift-1.0
+       >=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
+       >=sys-libs/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
+       >=dev-db/sqlite-3
+       >=dev-libs/icu-69
+       >=dev-libs/libedit-20221030
+       >=dev-libs/libxml2-2.11.5
+       >=dev-vcs/git-2.39
+       >=sys-apps/coreutils-9
+       >=sys-devel/gcc-11
+       >=sys-libs/ncurses-6
+       >=sys-libs/zlib-1.3
+       $(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.
+       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-5\.10\.1-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() {
+       # `llvm-r1_pkg_setup` sets these tools to their absolute paths, but we 
need
+       # to still pick them up dynamically based on `PATH` for stage1 and 
stage2
+       # builds below (to keep all parts of the Swift toolchain compiling with 
the
+       # same internal tools).
+       export CC="clang"
+       export CXX="clang++"
+       export LD="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 (`-Wl,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)"
+
+       # Bug 949266
+       # Swift 5 requires building against `libstdc++`, but when building with
+       # `llvm-core/clang-common[default-libcxx]` (e.g., on the LLVM profile), 
LLVM
+       # and Clang default to `libc++`. This leads to some symbols getting 
picked
+       # up from `libc++` and others from `libstdc++`, leading to linker 
failures.
+       # This requires forcing the usage of `libstdc++` to build consistently.
+       append-cxxflags '-stdlib=libstdc++'
+}
+
+src_compile() {
+       # The Swift 5.10 compiler is partially written in Swift itself (the new
+       # `swift-driver` + macro support via `swift-syntax`), which requires
+       # bootstrapping with an existing Swift compiler.
+       #
+       # We don't have an existing Swift compiler, but we can bootstrap it with
+       # itself in a 3-stage process:
+       #
+       # 0. We'll build LLVM+Clang and a bare Swift compiler with the old 
C++-based
+       #    driver and no macro support
+       # 1. We'll use that bare compiler to build a base compiler with the new
+       #    Swift-based driver and macro support, with some base libs
+       # 2. We'll then use that base compiler to build a full Swift toolchain 
with
+       #    all necessary libs
+       #
+       # Build products will be intentionally shared between stages as much as
+       # possible to avoid unnecessary repeated compilation.
+
+       # Building swift-driver writes to this directory for some reason, but 
the
+       # contents are irrelevant.
+       addpredict /var/lib/portage/home/.swiftpm
+
+       local _extra_cmake_options=(
+               # BFD doesn't link Swift symbols properly, so we have to ensure 
Swift is
+               # built with LLD.
+               '-DSWIFT_USE_LINKER=lld',
+               '-DLLVM_USE_LINKER=lld',
+
+               # We don't need to build any test code or test executables, 
which Swift
+               # (and some components) does by default.
+               '-DBUILD_TESTING:BOOL=NO',
+               '-DSWIFT_INCLUDE_TESTS:BOOL=NO',
+               '-DSWIFT_INCLUDE_TEST_BINARIES:BOOL=NO',
+
+               # The Clang `compiler-rt` library builds the LLVM ORC JIT 
component by
+               # default, which we don't need; the component builds with an 
executable
+               # stack, which we'd like to avoid.
+               '-DCOMPILER_RT_BUILD_ORC:BOOL=NO',
+
+               # LLDB ships with Python bindings, and uses CMake to search for 
Python.
+               # By default, CMake tries to find the latest version of Python 
available
+               # on disk (currently `python3.13`, then `python3.12`, then...). 
This
+               # might not be the version of Python the rest of the system 
uses, or
+               # which is specified by `PYTHON_SINGLE_TARGET`.
+               #
+               # Since `python_setup` already places `${EPYTHON}` in the 
`PATH`, we can
+               # tell CMake to use the unversioned `python` rather than a 
versioned
+               # one to end up respecting `PYTHON_SINGLE_TARGET`.
+               '-DPython3_FIND_UNVERSIONED_NAMES=FIRST'
+       )
+       local extra_cmake_options="$(IFS=,; echo "${_extra_cmake_options[*]}")"
+
+       # stage0:
+       # * Bare Swift compiler (no bootstrapping; no Swift driver or macros)
+       # * LLVM+Clang; this is the only stage where these are built because as 
a
+       #   base dependency, their flags never change, and the build products 
can be
+       #   reused
+       "${S}/swift/utils/build-script" \
+               --verbose-build \
+               --release \
+               --no-assertions \
+               --build-subdir="Ninja-Release" \
+               --install-destdir="${S}/stage0" \
+               --extra-cmake-options="${extra_cmake_options}" \
+               --bootstrapping=off \
+               
--llvm-install-components='llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;lld;LTO;clang-features-file'
 \
+               --llvm-targets-to-build=host \
+               --skip-build-benchmarks \
+               --skip-early-swift-driver --skip-early-swiftsyntax \
+               --skip-test-cmark \
+               --skip-test-linux \
+               --skip-test-swift \
+               --install-all \
+               || die
+
+       # stage1:
+       # * Base Swift compiler and driver (bootstrapping from stage0; with 
macros)
+       # * Base libs: swift-driver depends on llbuild + swiftpm, which depend 
on
+       #   Foundation + libdispatch + XCTest
+       local original_path="${PATH}"
+       export PATH="${S}/stage0/usr/bin:${original_path}"
+       "${S}/swift/utils/build-script" \
+               --verbose-build \
+               --release \
+               --no-assertions \
+               --build-subdir="Ninja-Release" \
+               --install-destdir="${S}/stage1" \
+               --extra-cmake-options="${extra_cmake_options}" \
+               --cmark --skip-test-cmark \
+               --foundation --skip-test-foundation \
+               --libdispatch --skip-test-libdispatch \
+               --llbuild --skip-test-llbuild \
+               --skip-build-benchmarks \
+               --skip-build-llvm \
+               --skip-test-linux \
+               --skip-test-swift \
+               --swift-driver --skip-test-swift-driver \
+               --swiftpm --skip-test-swiftpm \
+               --xctest --skip-test-xctest \
+               --install-all \
+               || die
+
+       # stage2: full Swift toolchain (bootstrapping from stage1)
+       export PATH="${S}/stage1/usr/bin:${original_path}"
+       "${S}/swift/utils/build-script" \
+               --verbose-build \
+               --release \
+               --no-assertions \
+               --build-subdir="Ninja-Release" \
+               --install-destdir="${S}/stage2" \
+               --extra-cmake-options="${extra_cmake_options}" \
+               --foundation --skip-test-foundation \
+               --indexstore-db --skip-test-indexstore-db \
+               --libdispatch --skip-test-libdispatch \
+               --llbuild --skip-test-llbuild \
+               --lldb --skip-test-lldb \
+               --skip-build-benchmarks \
+               --skip-build-llvm \
+               --skip-test-linux \
+               --skip-test-swift \
+               --sourcekit-lsp --skip-test-sourcekit-lsp \
+               --swift-driver --skip-test-swift-driver \
+               
--swift-install-components='autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;static-mirror-lib;toolchain-tools;license;sourcekit-inproc'
 \
+               --swiftdocc --skip-test-swiftdocc \
+               --swiftpm --skip-test-swiftpm \
+               --xctest --skip-test-xctest \
+               --install-all \
+               || die
+
+       export PATH="${original_path}"
+}
+
+src_install() {
+       # 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}/stage2/." "${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
+}
+

diff --git a/dev-lang/swift/swift-6.0.3-r1.ebuild 
b/dev-lang/swift/swift-6.0.3-r1.ebuild
new file mode 100644
index 000000000..09b9b0d65
--- /dev/null
+++ b/dev-lang/swift/swift-6.0.3-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2024 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
+       >=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
+       >=sys-libs/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
+       >=sys-libs/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'
+
+# 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=()
+
+       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_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
+}


Reply via email to