net-im/teams: 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>

4 files changed, 16 insertions, 11 deletions

diff --git a/net-im/teams/teams-1.4.00.13653-r2.ebuild b/net-im/teams/teams-1.4.00.13653-r3.ebuild
index 72061e149b76..46c746a8d637 100644
--- a/net-im/teams/teams-1.4.00.13653-r2.ebuild
+++ b/net-im/teams/teams-1.4.00.13653-r3.ebuild
@@ -27,10 +27,11 @@ QA_PREBUILT="*"
 # libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6,
 # apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
 RDEPEND="
-	app-accessibility/at-spi2-core:2
-	app-accessibility/at-spi2-atk: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
 	dev-libs/nspr
diff --git a/net-im/teams/teams-1.4.00.26453-r1.ebuild b/net-im/teams/teams-1.4.00.26453-r2.ebuild
index e36b1a4ffb84..d8f3285bf66f 100644
--- a/net-im/teams/teams-1.4.00.26453-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.26453-r2.ebuild
@@ -27,10 +27,11 @@ QA_PREBUILT="*"
 # libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18),
 # libstdc++6 (>= 4.8.1)
 RDEPEND="
-	app-accessibility/at-spi2-core:2
-	app-accessibility/at-spi2-atk: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
 	dev-libs/nspr
diff --git a/net-im/teams/teams-1.4.00.7556-r1.ebuild b/net-im/teams/teams-1.4.00.7556-r2.ebuild
index e65aa23e4688..16c36bbc7330 100644
--- a/net-im/teams/teams-1.4.00.7556-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.7556-r2.ebuild
@@ -23,9 +23,11 @@ QA_PREBUILT="*"
 # libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
 # libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
 RDEPEND="
-	app-accessibility/at-spi2-atk
+	|| (
+		>=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
 	dev-libs/nspr
diff --git a/net-im/teams/teams-1.5.00.10453.ebuild b/net-im/teams/teams-1.5.00.10453-r1.ebuild
index 86ffec1e63a0..f792495ae547 100644
--- a/net-im/teams/teams-1.5.00.10453.ebuild
+++ b/net-im/teams/teams-1.5.00.10453-r1.ebuild
@@ -27,10 +27,11 @@ QA_PREBUILT="*"
 # libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18),
 # libstdc++6 (>= 4.8.1)
 RDEPEND="
-	app-accessibility/at-spi2-core:2
-	app-accessibility/at-spi2-atk: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
 	dev-libs/nspr