Revert "net-im/teams-insiders: Add gnome-keyring USE flag to make libsecret dependency optional."

This reverts commit 3518e1b5bffa246664535523f4c0a67c01618a60.

The resulting client no longer starts up.

Signed-off-by: Sven Eden <sven.eden@prydeworx.com>

2 files changed, 4 insertions, 14 deletions

diff --git a/net-im/teams-insiders/teams-insiders-1.3.00.30857-r1.ebuild b/net-im/teams-insiders/teams-insiders-1.3.00.30857.ebuild
index 62aebf9..b3f52ef 100644
--- a/net-im/teams-insiders/teams-insiders-1.3.00.30857-r1.ebuild
+++ b/net-im/teams-insiders/teams-insiders-1.3.00.30857.ebuild
@@ -13,13 +13,14 @@ LICENSE="ms-teams-pre"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror splitdebug test"
-IUSE="+gnome-keyring system-ffmpeg system-mesa"
+IUSE="system-ffmpeg system-mesa"
 
 QA_PREBUILT="*"
 
 RDEPEND="
 	!net-im/teams
 	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
 	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib
@@ -47,7 +48,6 @@ RDEPEND="
 	x11-libs/libxcb
 	x11-libs/libxkbfile
 	x11-libs/pango
-	gnome-keyring? ( app-crypt/libsecret )
 	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
 	system-mesa? ( media-libs/mesa[egl,gles2] )
 "
@@ -69,11 +69,6 @@ src_install() {
 	# Remove keytar3, it needs libgnome-keyring. keytar4 uses libsecret and is used instead
 	rm -rf "${WORKDIR}/usr/share/teams-insiders/resources/app.asar.unpacked/node_modules/keytar3" || die
 
-	# If the user does not want any gnome packages, they can get rid of libsecret, too
-	if ! use gnome-keyring; then
-		rm -rf "${WORKDIR}/usr/share/teams-insiders/resources/app.asar.unpacked/node_modules/keytar4" || die
-	fi
-
 	insinto ${dest}/share
 	doins -r "${S}"${dest}/share/applications
 	doins -r "${S}"${dest}/share/pixmaps
diff --git a/net-im/teams-insiders/teams-insiders-1.4.00.4855-r1.ebuild b/net-im/teams-insiders/teams-insiders-1.4.00.4855.ebuild
index 62aebf9..b3f52ef 100644
--- a/net-im/teams-insiders/teams-insiders-1.4.00.4855-r1.ebuild
+++ b/net-im/teams-insiders/teams-insiders-1.4.00.4855.ebuild
@@ -13,13 +13,14 @@ LICENSE="ms-teams-pre"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror splitdebug test"
-IUSE="+gnome-keyring system-ffmpeg system-mesa"
+IUSE="system-ffmpeg system-mesa"
 
 QA_PREBUILT="*"
 
 RDEPEND="
 	!net-im/teams
 	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
 	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib
@@ -47,7 +48,6 @@ RDEPEND="
 	x11-libs/libxcb
 	x11-libs/libxkbfile
 	x11-libs/pango
-	gnome-keyring? ( app-crypt/libsecret )
 	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
 	system-mesa? ( media-libs/mesa[egl,gles2] )
 "
@@ -69,11 +69,6 @@ src_install() {
 	# Remove keytar3, it needs libgnome-keyring. keytar4 uses libsecret and is used instead
 	rm -rf "${WORKDIR}/usr/share/teams-insiders/resources/app.asar.unpacked/node_modules/keytar3" || die
 
-	# If the user does not want any gnome packages, they can get rid of libsecret, too
-	if ! use gnome-keyring; then
-		rm -rf "${WORKDIR}/usr/share/teams-insiders/resources/app.asar.unpacked/node_modules/keytar4" || die
-	fi
-
 	insinto ${dest}/share
 	doins -r "${S}"${dest}/share/applications
 	doins -r "${S}"${dest}/share/pixmaps