From 2734d85e2e9c71a348bba127da8d0fc65c3dc123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= Date: Fri, 19 Jan 2024 13:27:33 +0000 Subject: [PATCH] app-emulation/bottles: drop 51.10, add 51.10-r1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * improve system llvm-libunwind and wine detection * add wine-proton since it was fix recently on the llvm profile * https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbf5db6fe135a9e0b51b3cd8f62f487fe8efd3b Signed-off-by: Gonçalo Negrier Duarte Closes: https://gitlab.com/src_prepare/src_prepare-overlay/-/merge_requests/394 Signed-off-by: Alfred Wingate --- ...es-51.10.ebuild => bottles-51.10-r1.ebuild} | 18 +++++------------- app-emulation/bottles/bottles-9999.ebuild | 18 +++++------------- 2 files changed, 10 insertions(+), 26 deletions(-) rename app-emulation/bottles/{bottles-51.10.ebuild => bottles-51.10-r1.ebuild} (92%) diff --git a/app-emulation/bottles/bottles-51.10.ebuild b/app-emulation/bottles/bottles-51.10-r1.ebuild similarity index 92% rename from app-emulation/bottles/bottles-51.10.ebuild rename to app-emulation/bottles/bottles-51.10-r1.ebuild index b63b250..34917f7 100644 --- a/app-emulation/bottles/bottles-51.10.ebuild +++ b/app-emulation/bottles/bottles-51.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -55,18 +55,10 @@ RDEPEND=" media-gfx/imagemagick >=sys-libs/glibc-2.32 x11-apps/xdpyinfo - llvm-libunwind? ( - || ( - app-emulation/wine-vanilla[X,llvm-libunwind] - app-emulation/wine-staging[X,llvm-libunwind] - ) - ) - !llvm-libunwind? ( - || ( - app-emulation/wine-vanilla[X,-llvm-libunwind] - app-emulation/wine-staging[X,-llvm-libunwind] - app-emulation/wine-proton[X(+),-llvm-libunwind] - ) + || ( + app-emulation/wine-vanilla[X,llvm-libunwind=] + app-emulation/wine-staging[X,llvm-libunwind=] + app-emulation/wine-proton[X(+),llvm-libunwind=] ) $(python_gen_cond_dep ' app-arch/patool[${PYTHON_USEDEP}] diff --git a/app-emulation/bottles/bottles-9999.ebuild b/app-emulation/bottles/bottles-9999.ebuild index b63b250..34917f7 100644 --- a/app-emulation/bottles/bottles-9999.ebuild +++ b/app-emulation/bottles/bottles-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -55,18 +55,10 @@ RDEPEND=" media-gfx/imagemagick >=sys-libs/glibc-2.32 x11-apps/xdpyinfo - llvm-libunwind? ( - || ( - app-emulation/wine-vanilla[X,llvm-libunwind] - app-emulation/wine-staging[X,llvm-libunwind] - ) - ) - !llvm-libunwind? ( - || ( - app-emulation/wine-vanilla[X,-llvm-libunwind] - app-emulation/wine-staging[X,-llvm-libunwind] - app-emulation/wine-proton[X(+),-llvm-libunwind] - ) + || ( + app-emulation/wine-vanilla[X,llvm-libunwind=] + app-emulation/wine-staging[X,llvm-libunwind=] + app-emulation/wine-proton[X(+),llvm-libunwind=] ) $(python_gen_cond_dep ' app-arch/patool[${PYTHON_USEDEP}]