Renamed msteams -> teams and msteams-insiders -> teams-insiders. Much easier to maintain this way.

Signed-off-by: Sven Eden <yamakuzure@gmx.net>

6 files changed, 15 insertions, 13 deletions

diff --git a/app-office/msteams-insiders/Manifest b/app-office/teams-insiders/Manifest
index 19eb303..19eb303 100644
--- a/app-office/msteams-insiders/Manifest
+++ b/app-office/teams-insiders/Manifest
diff --git a/app-office/msteams-insiders/metadata.xml b/app-office/teams-insiders/metadata.xml
index cd5ba9e..cd5ba9e 100644
--- a/app-office/msteams-insiders/metadata.xml
+++ b/app-office/teams-insiders/metadata.xml
diff --git a/app-office/msteams-insiders/msteams-insiders-1.3.00.14051.ebuild b/app-office/teams-insiders/teams-insiders-1.3.00.14051.ebuild
index 3bcbf73..2bf3f41 100644
--- a/app-office/msteams-insiders/msteams-insiders-1.3.00.14051.ebuild
+++ b/app-office/teams-insiders/teams-insiders-1.3.00.14051.ebuild
@@ -9,13 +9,13 @@ IUSE="gnome"
 
 DESCRIPTION="Microsoft Teams Linux Client (Insiders Build)"
 HOMEPAGE="https://teams.microsoft.com/"
-SRC_URI="https://packages.microsoft.com/yumrepos/ms-teams/teams-insiders-${PV}-1.x86_64.rpm"
+SRC_URI="https://packages.microsoft.com/yumrepos/ms-teams/${P}-1.x86_64.rpm"
 LICENSE="GitHub"
 SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	!app-office/msteams
+	!app-office/teams
 	app-accessibility/at-spi2-atk
 	app-crypt/libsecret
 	dev-libs/atk
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-libs/glib
 	dev-libs/nspr
 	dev-libs/nss
+	gnome-base/libgnome-keyring
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	net-print/cups
@@ -60,13 +61,13 @@ src_install() {
 	insinto /usr/share
 	doins -r "${S}"/usr/share/applications
 	doins -r "${S}"/usr/share/pixmaps
-	doins -r "${S}"/usr/share/teams
+	doins -r "${S}"/usr/share/${PN}
 
 	exeinto /usr/bin
-	doexe "${S}"/usr/bin/teams
+	doexe "${S}"/usr/bin/${PN}
 
-	exeinto /usr/share/teams
-	doexe "${S}"/usr/share/teams/teams
+	exeinto /usr/share/${PN}
+	doexe "${S}"/usr/share/${PN}/${PN}
 }
 
 pkg_preinst() {
diff --git a/app-office/msteams/Manifest b/app-office/teams/Manifest
index 9343af7..9343af7 100644
--- a/app-office/msteams/Manifest
+++ b/app-office/teams/Manifest
diff --git a/app-office/msteams/metadata.xml b/app-office/teams/metadata.xml
index cd5ba9e..cd5ba9e 100644
--- a/app-office/msteams/metadata.xml
+++ b/app-office/teams/metadata.xml
diff --git a/app-office/msteams/msteams-1.3.00.5153-r1.ebuild b/app-office/teams/teams-1.3.00.5153.ebuild
index 3caa3f8..de139d4 100644
--- a/app-office/msteams/msteams-1.3.00.5153-r1.ebuild
+++ b/app-office/teams/teams-1.3.00.5153.ebuild
@@ -9,13 +9,13 @@ IUSE="gnome"
 
 DESCRIPTION="Microsoft Teams Linux Client"
 HOMEPAGE="https://teams.microsoft.com/"
-SRC_URI="https://packages.microsoft.com/yumrepos/ms-teams/teams-${PV}-1.x86_64.rpm"
+SRC_URI="https://packages.microsoft.com/yumrepos/ms-teams/${P}-1.x86_64.rpm"
 LICENSE="GitHub"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 RDEPEND="
-	!app-office/msteams-insiders
+	!app-office/teams-insiders
 	app-accessibility/at-spi2-atk
 	app-crypt/libsecret
 	dev-libs/atk
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-libs/glib
 	dev-libs/nspr
 	dev-libs/nss
+	gnome-base/libgnome-keyring
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	net-print/cups
@@ -60,13 +61,13 @@ src_install() {
 	insinto /usr/share
 	doins -r "${S}"/usr/share/applications
 	doins -r "${S}"/usr/share/pixmaps
-	doins -r "${S}"/usr/share/teams
+	doins -r "${S}"/usr/share/${PN}
 
 	exeinto /usr/bin
-	doexe "${S}"/usr/bin/teams
+	doexe "${S}"/usr/bin/${PN}
 
-	exeinto /usr/share/teams
-	doexe "${S}"/usr/share/teams/teams
+	exeinto /usr/share/${PN}
+	doexe "${S}"/usr/share/${PN}/${PN}
 }
 
 pkg_preinst() {