From 8f475bdc80a25ff7fc5b631afa9f5392126c7e43 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 1 May 2023 07:10:35 -0400 Subject: [PATCH] app-emulation/wine-vanilla: allow dosbox-staging alternative Albeit considered removing this USE altogether before (optfeature). Kept it mostly because of how long it's been there, may revisit this eventually (in wine-proton it's already gone and is not even mentioned given Wine itself will advertise it if attempt to use dos). Not really worth a revbump, ultimately a user could just USE=-dos and install whichever they want too. Signed-off-by: Ionen Wolkens --- app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild | 7 ++++++- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 7 ++++++- 8 files changed, 48 insertions(+), 8 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild index df0b0a5acf857..36c592c409345 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild @@ -98,7 +98,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild index b598b2d226b2e..c87fdf73c0310 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -98,7 +98,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild index 8324d426aadbd..b751fa3114b25 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild @@ -94,7 +94,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild index 2d1ceabcfd5b1..6860494930986 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild @@ -94,7 +94,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild index d31d47a758328..0d6f8fb38727a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild @@ -97,7 +97,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild index 12a5764467f83..5196146bf81a0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild @@ -97,7 +97,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild index 9d33f21d96459..b8ac1a27c65a5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild @@ -97,7 +97,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} ) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 9d33f21d96459..b8ac1a27c65a5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -97,7 +97,12 @@ WINE_COMMON_DEPEND=" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) + dos? ( + || ( + games-emulation/dosbox + games-emulation/dosbox-staging + ) + ) gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) mono? ( app-emulation/wine-mono:${WINE_MONO} )