[patch] Patch for sys-libs/libcxxabi

libcxxabi.patch (text/plain), 7.95 KB, created by Arfrever Frehtes Taifersar Arahesis on 2021-06-17 10:59:54 UTC

From 0062a4e0fdd8f328832c3d005f5f9bc3947d697f Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Thu, 1 Apr 2021 00:00:00 +0000
Subject: [PATCH] sys-libs/libcxxabi: Add "llvm-libunwind" USE flag.

Closes: https://bugs.gentoo.org/722992
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild      | 10 ++++------
 sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild      | 10 ++++------
 sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild      | 10 ++++------
 sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild | 10 ++++------
 sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild  | 10 ++++------
 sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild | 10 ++++------
 6 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
index 7aa13e0d8e6..087802bbc9a 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
@@ -9,22 +9,20 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
-# libcxx is needed uncondtionally for the headers
+# libcxx is needed unconditionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libunwind static-libs test elibc_musl"
+IUSE="+libunwind llvm-libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
index fa0f31dbb56..a5063181096 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
@@ -13,15 +13,13 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="+libunwind static-libs test elibc_musl"
+IUSE="+libunwind llvm-libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
@@ -31,7 +29,7 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
+# libcxx is needed unconditionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} )
 LLVM_TEST_COMPONENTS=( llvm/cmake )
 llvm.org_set_globals
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild
index b8fb739a6ec..cf471b1e65b 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild
@@ -13,15 +13,13 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="+libunwind static-libs test elibc_musl"
+IUSE="+libunwind llvm-libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
@@ -31,7 +29,7 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
+# libcxx is needed unconditionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
 llvm.org_set_globals
 
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild
index 8c24d969111..a03a5c720fa 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild
@@ -13,15 +13,13 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind static-libs test elibc_musl"
+IUSE="+libunwind llvm-libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
@@ -31,7 +29,7 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
+# libcxx is needed unconditionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
 llvm.org_set_globals
 
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild
index 8c24d969111..a03a5c720fa 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild
@@ -13,15 +13,13 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind static-libs test elibc_musl"
+IUSE="+libunwind llvm-libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
@@ -31,7 +29,7 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
+# libcxx is needed unconditionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
 llvm.org_set_globals
 
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
index 8c24d969111..a03a5c720fa 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
@@ -13,15 +13,13 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind static-libs test elibc_musl"
+IUSE="+libunwind llvm-libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[static-libs?,${MULTILIB_USEDEP}] )
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
@@ -31,7 +29,7 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
+# libcxx is needed unconditionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
 llvm.org_set_globals
 
-- 
2.31.1