diff options
author | Sam James <sam@gentoo.org> | 2022-10-05 19:59:35 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-10-05 19:59:35 +0100 |
commit | 5daba4d2ef38bcaf77b9965daf5e5986be895a90 (patch) | |
tree | a146eed8071becc2e1406fac37cb48e411eec7eb | |
parent | dev-java/hamcrest-generator: Stabilize 1.3-r4 ppc64, #875398 (diff) | |
download | gentoo-5daba4d2ef38bcaf77b9965daf5e5986be895a90.tar.gz gentoo-5daba4d2ef38bcaf77b9965daf5e5986be895a90.tar.bz2 gentoo-5daba4d2ef38bcaf77b9965daf5e5986be895a90.zip |
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 <sam@gentoo.org>
-rw-r--r-- | app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild (renamed from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild) | 7 | ||||
-rw-r--r-- | app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild (renamed from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild) | 7 |
2 files changed, 8 insertions, 6 deletions
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 index 6803b000b970..37c4e935a975 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 index 6803b000b970..37c4e935a975 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 |