commit: 5effb421f474f5ca8fa5c5c9741753179d3769d4
Author: Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Thu Oct 31 01:05:43 2024 +0000
Commit: Itai Ferber <itai <AT> itaiferber <DOT> net>
CommitDate: Thu Oct 31 15:11:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5effb421
dev-lang/swift: move patches into versioned subdirs
Signed-off-by: Itai Ferber <itai <AT> itaiferber.net>
dev-lang/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/files/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(-)
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 000000000..bc80c967a
--- /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 000000000..daf9eebb1
--- /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 000000000..b0161946b
--- /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 ee233f3bb..a1a0e9da1 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 5cf5bf187..0e335fd68 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 6b4aaa42c..d222ce5dc 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}"
