From 5effb421f474f5ca8fa5c5c9741753179d3769d4 Mon Sep 17 00:00:00 2001 From: Itai Ferber Date: Wed, 30 Oct 2024 21:05:43 -0400 Subject: [PATCH] dev-lang/swift: move patches into versioned subdirs Signed-off-by: Itai Ferber --- .../swift/files/swift-5.10.1-r1/link-ncurses-tinfo.patch | 1 + dev-lang/swift/files/swift-5.10.1-r1/link-with-lld.patch | 1 + .../swift-5.10.1-r1/lldb-cmake-minimum-version.patch | 1 + .../link-ncurses-tinfo.patch} | 0 .../link-with-lld.patch} | 0 .../lldb-cmake-minimum-version.patch} | 0 .../backtracing-noexecstack.patch} | 0 .../gentoo-build-preset.patch} | 0 .../link-ncurses-tinfo.patch} | 0 .../link-with-lld.patch} | 0 dev-lang/swift/swift-5.10.1-r1.ebuild | 6 +++--- dev-lang/swift/swift-5.10.1.ebuild | 6 +++--- dev-lang/swift/swift-6.0.1.ebuild | 8 ++++---- 13 files changed, 13 insertions(+), 10 deletions(-) create mode 120000 dev-lang/swift/files/swift-5.10.1-r1/link-ncurses-tinfo.patch create mode 120000 dev-lang/swift/files/swift-5.10.1-r1/link-with-lld.patch create mode 120000 dev-lang/swift/files/swift-5.10.1-r1/lldb-cmake-minimum-version.patch rename dev-lang/swift/files/{swift-5.10.1-llbuild-link-ncurses-tinfo-gentoo.patch => swift-5.10.1/link-ncurses-tinfo.patch} (100%) rename dev-lang/swift/files/{swift-5.10.1-link-with-lld.patch => swift-5.10.1/link-with-lld.patch} (100%) rename dev-lang/swift/files/{swift-5.10.1-lldb-cmake-minimum-version.patch => swift-5.10.1/lldb-cmake-minimum-version.patch} (100%) rename dev-lang/swift/files/{swift-6.0.1-swift-backtracing-noexecstack-gentoo.patch => swift-6.0.1/backtracing-noexecstack.patch} (100%) rename dev-lang/swift/files/{swift-6.0.1-swift-build-preset-gentoo.patch => swift-6.0.1/gentoo-build-preset.patch} (100%) rename dev-lang/swift/files/{swift-6.0.1-swift-link-ncurses-tinfo-gentoo.patch => swift-6.0.1/link-ncurses-tinfo.patch} (100%) rename dev-lang/swift/files/{swift-6.0.1-link-with-lld.patch => swift-6.0.1/link-with-lld.patch} (100%) diff --git a/dev-lang/swift/files/swift-5.10.1-r1/link-ncurses-tinfo.patch b/dev-lang/swift/files/swift-5.10.1-r1/link-ncurses-tinfo.patch new file mode 120000 index 0000000000..bc80c967a9 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r1/link-ncurses-tinfo.patch @@ -0,0 +1 @@ +../swift-5.10.1/link-ncurses-tinfo.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-5.10.1-r1/link-with-lld.patch b/dev-lang/swift/files/swift-5.10.1-r1/link-with-lld.patch new file mode 120000 index 0000000000..daf9eebb16 --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r1/link-with-lld.patch @@ -0,0 +1 @@ +../swift-5.10.1/link-with-lld.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-5.10.1-r1/lldb-cmake-minimum-version.patch b/dev-lang/swift/files/swift-5.10.1-r1/lldb-cmake-minimum-version.patch new file mode 120000 index 0000000000..b0161946ba --- /dev/null +++ b/dev-lang/swift/files/swift-5.10.1-r1/lldb-cmake-minimum-version.patch @@ -0,0 +1 @@ +../swift-5.10.1/lldb-cmake-minimum-version.patch \ No newline at end of file diff --git a/dev-lang/swift/files/swift-5.10.1-llbuild-link-ncurses-tinfo-gentoo.patch b/dev-lang/swift/files/swift-5.10.1/link-ncurses-tinfo.patch similarity index 100% rename from dev-lang/swift/files/swift-5.10.1-llbuild-link-ncurses-tinfo-gentoo.patch rename to dev-lang/swift/files/swift-5.10.1/link-ncurses-tinfo.patch diff --git a/dev-lang/swift/files/swift-5.10.1-link-with-lld.patch b/dev-lang/swift/files/swift-5.10.1/link-with-lld.patch similarity index 100% rename from dev-lang/swift/files/swift-5.10.1-link-with-lld.patch rename to dev-lang/swift/files/swift-5.10.1/link-with-lld.patch diff --git a/dev-lang/swift/files/swift-5.10.1-lldb-cmake-minimum-version.patch b/dev-lang/swift/files/swift-5.10.1/lldb-cmake-minimum-version.patch similarity index 100% rename from dev-lang/swift/files/swift-5.10.1-lldb-cmake-minimum-version.patch rename to dev-lang/swift/files/swift-5.10.1/lldb-cmake-minimum-version.patch diff --git a/dev-lang/swift/files/swift-6.0.1-swift-backtracing-noexecstack-gentoo.patch b/dev-lang/swift/files/swift-6.0.1/backtracing-noexecstack.patch similarity index 100% rename from dev-lang/swift/files/swift-6.0.1-swift-backtracing-noexecstack-gentoo.patch rename to dev-lang/swift/files/swift-6.0.1/backtracing-noexecstack.patch diff --git a/dev-lang/swift/files/swift-6.0.1-swift-build-preset-gentoo.patch b/dev-lang/swift/files/swift-6.0.1/gentoo-build-preset.patch similarity index 100% rename from dev-lang/swift/files/swift-6.0.1-swift-build-preset-gentoo.patch rename to dev-lang/swift/files/swift-6.0.1/gentoo-build-preset.patch diff --git a/dev-lang/swift/files/swift-6.0.1-swift-link-ncurses-tinfo-gentoo.patch b/dev-lang/swift/files/swift-6.0.1/link-ncurses-tinfo.patch similarity index 100% rename from dev-lang/swift/files/swift-6.0.1-swift-link-ncurses-tinfo-gentoo.patch rename to dev-lang/swift/files/swift-6.0.1/link-ncurses-tinfo.patch diff --git a/dev-lang/swift/files/swift-6.0.1-link-with-lld.patch b/dev-lang/swift/files/swift-6.0.1/link-with-lld.patch similarity index 100% rename from dev-lang/swift/files/swift-6.0.1-link-with-lld.patch rename to dev-lang/swift/files/swift-6.0.1/link-with-lld.patch diff --git a/dev-lang/swift/swift-5.10.1-r1.ebuild b/dev-lang/swift/swift-5.10.1-r1.ebuild index ee233f3bb5..a1a0e9da11 100644 --- a/dev-lang/swift/swift-5.10.1-r1.ebuild +++ b/dev-lang/swift/swift-5.10.1-r1.ebuild @@ -50,9 +50,9 @@ SRC_URI=" " PATCHES=( - "${FILESDIR}/${P}-link-with-lld.patch" - "${FILESDIR}/${P}-llbuild-link-ncurses-tinfo-gentoo.patch" - "${FILESDIR}/${P}-lldb-cmake-minimum-version.patch" + "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" + "${FILESDIR}/${PF}/link-with-lld.patch" + "${FILESDIR}/${PF}/lldb-cmake-minimum-version.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-5.10.1.ebuild b/dev-lang/swift/swift-5.10.1.ebuild index 5cf5bf1871..0e335fd686 100644 --- a/dev-lang/swift/swift-5.10.1.ebuild +++ b/dev-lang/swift/swift-5.10.1.ebuild @@ -49,9 +49,9 @@ SRC_URI=" " PATCHES=( - "${FILESDIR}/${P}-link-with-lld.patch" - "${FILESDIR}/${P}-llbuild-link-ncurses-tinfo-gentoo.patch" - "${FILESDIR}/${P}-lldb-cmake-minimum-version.patch" + "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" + "${FILESDIR}/${PF}/link-with-lld.patch" + "${FILESDIR}/${PF}/lldb-cmake-minimum-version.patch" ) S="${WORKDIR}" diff --git a/dev-lang/swift/swift-6.0.1.ebuild b/dev-lang/swift/swift-6.0.1.ebuild index 6b4aaa42c8..d222ce5dcf 100644 --- a/dev-lang/swift/swift-6.0.1.ebuild +++ b/dev-lang/swift/swift-6.0.1.ebuild @@ -52,10 +52,10 @@ SRC_URI=" " PATCHES=( - "${FILESDIR}/${P}-link-with-lld.patch" - "${FILESDIR}/${P}-swift-backtracing-noexecstack-gentoo.patch" - "${FILESDIR}/${P}-swift-build-preset-gentoo.patch" - "${FILESDIR}/${P}-swift-link-ncurses-tinfo-gentoo.patch" + "${FILESDIR}/${PF}/backtracing-noexecstack.patch" + "${FILESDIR}/${PF}/gentoo-build-preset.patch" + "${FILESDIR}/${PF}/link-ncurses-tinfo.patch" + "${FILESDIR}/${PF}/link-with-lld.patch" ) S="${WORKDIR}"