From 5daba4d2ef38bcaf77b9965daf5e5986be895a90 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 5 Oct 2022 19:59:35 +0100 Subject: [PATCH] app-admin/bitwarden-desktop-bin: use || ( ... ) dep for dev-libs/atk Forcing migration to at-spi2-atk right now leads to nasty conflicts for stable users. Signed-off-by: Sam James --- ...6.0.ebuild => bitwarden-desktop-bin-2022.6.0-r1.ebuild} | 7 ++++--- ...9.1.ebuild => bitwarden-desktop-bin-2022.9.1-r1.ebuild} | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) rename app-admin/bitwarden-desktop-bin/{bitwarden-desktop-bin-2022.6.0.ebuild => bitwarden-desktop-bin-2022.6.0-r1.ebuild} (94%) rename app-admin/bitwarden-desktop-bin/{bitwarden-desktop-bin-2022.9.1.ebuild => bitwarden-desktop-bin-2022.9.1-r1.ebuild} (94%) diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild similarity index 94% rename from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild rename to app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild index 6803b000b970c..37c4e935a975d 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild @@ -17,10 +17,11 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) app-crypt/libsecret - dev-libs/atk dev-libs/expat dev-libs/glib sys-libs/glibc diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild similarity index 94% rename from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild rename to app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild index 6803b000b970c..37c4e935a975d 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild @@ -17,10 +17,11 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) app-crypt/libsecret - dev-libs/atk dev-libs/expat dev-libs/glib sys-libs/glibc