[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin-plugins-bazaar/, kde-apps/dolphin-plugins-git/, ...

[gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin-plugins-bazaar/, kde-apps/dolphin-plugins-git/, ...

[Andreas Sturmlechner]

commit:     857bdf46b9764c2751eb28b8f5ab213113300558
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 23:46:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:48:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857bdf46

kde-apps/dolphin-plugins-*: Fix file collision between split packages

Closes: https://bugs.gentoo.org/702626
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...azaar-19.12.0.ebuild => dolphin-plugins-bazaar-19.12.0-r1.ebuild} | 5 +++++
 ...pbox-19.12.0.ebuild => dolphin-plugins-dropbox-19.12.0-r1.ebuild} | 5 +++++
 ...gins-git-19.12.0.ebuild => dolphin-plugins-git-19.12.0-r1.ebuild} | 5 +++++
 ...al-19.12.0.ebuild => dolphin-plugins-mercurial-19.12.0-r1.ebuild} | 5 +++++
 ...n-19.12.0.ebuild => dolphin-plugins-subversion-19.12.0-r1.ebuild} | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0-r1.ebuild
similarity index 91%
rename from kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0.ebuild
rename to kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0-r1.ebuild
index 828944d24e2..594aafcd89c 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0-r1.ebuild
@@ -54,3 +54,8 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}

diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
similarity index 91%
rename from kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0.ebuild
rename to kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
index 1f450f8a3d8..419a6c9fb35 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
@@ -53,3 +53,8 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}

diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0-r1.ebuild
similarity index 92%
rename from kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0.ebuild
rename to kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0-r1.ebuild
index e8ad6928e17..faf12875607 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0-r1.ebuild
@@ -56,3 +56,8 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}

diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
similarity index 93%
rename from kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0.ebuild
rename to kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
index d414c2203a2..377f98447cf 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
@@ -59,3 +59,8 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}

diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0-r1.ebuild
similarity index 92%
rename from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0.ebuild
rename to kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0-r1.ebuild
index c6ceea2d42b..45e0ff88cec 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0-r1.ebuild
@@ -55,3 +55,8 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}