[gentoo-commits] repo/gentoo:master commit in: www-client/microsoft-edge-beta/

["Stephan Hartmann" <sultan@gentoo.org>]

commit:     343bec8e7dce104835ef260287cf9f2abf323c20
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 19:57:33 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:57:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343bec8e

www-client/microsoft-edge-beta: fix dependencies

Closes: https://bugs.gentoo.org/880895
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 ...build => microsoft-edge-beta-108.0.1462.42-r1.ebuild} | 16 +++++++++++-----
 ...build => microsoft-edge-beta-109.0.1518.14-r1.ebuild} | 16 +++++++++++-----
 ...build => microsoft-edge-beta-109.0.1518.23-r1.ebuild} | 16 +++++++++++-----
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild
similarity index 92%
rename from www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild
rename to www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild
index 873f8ce87360..9c041a631485 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild
@@ -23,13 +23,10 @@ SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_
 LICENSE="microsoft-edge"
 SLOT="0"
 RESTRICT="bindist mirror strip"
-IUSE="+mip"
+IUSE="+mip qt5"
 
 RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@@ -59,6 +56,11 @@ RDEPEND="
 	x11-libs/pango
 	x11-misc/xdg-utils
 	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
 "
 
 QA_PREBUILT="*"
@@ -113,5 +115,9 @@ src_install() {
 		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
 	fi
 
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+
 	pax-mark m "${EDGE_HOME}/msedge"
 }

diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild
similarity index 92%
rename from www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild
rename to www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild
index 873f8ce87360..9c041a631485 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild
@@ -23,13 +23,10 @@ SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_
 LICENSE="microsoft-edge"
 SLOT="0"
 RESTRICT="bindist mirror strip"
-IUSE="+mip"
+IUSE="+mip qt5"
 
 RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@@ -59,6 +56,11 @@ RDEPEND="
 	x11-libs/pango
 	x11-misc/xdg-utils
 	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
 "
 
 QA_PREBUILT="*"
@@ -113,5 +115,9 @@ src_install() {
 		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
 	fi
 
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+
 	pax-mark m "${EDGE_HOME}/msedge"
 }

diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild
similarity index 92%
rename from www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild
rename to www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild
index 873f8ce87360..9c041a631485 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild
@@ -23,13 +23,10 @@ SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_
 LICENSE="microsoft-edge"
 SLOT="0"
 RESTRICT="bindist mirror strip"
-IUSE="+mip"
+IUSE="+mip qt5"
 
 RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@@ -59,6 +56,11 @@ RDEPEND="
 	x11-libs/pango
 	x11-misc/xdg-utils
 	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
 "
 
 QA_PREBUILT="*"
@@ -113,5 +115,9 @@ src_install() {
 		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
 	fi
 
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+
 	pax-mark m "${EDGE_HOME}/msedge"
 }