From 857bdf46b9764c2751eb28b8f5ab213113300558 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 13 Dec 2019 00:46:43 +0100 Subject: [PATCH] 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 --- ....12.0.ebuild => dolphin-plugins-bazaar-19.12.0-r1.ebuild} | 5 +++++ ...12.0.ebuild => dolphin-plugins-dropbox-19.12.0-r1.ebuild} | 5 +++++ ...-19.12.0.ebuild => dolphin-plugins-git-19.12.0-r1.ebuild} | 5 +++++ ....0.ebuild => dolphin-plugins-mercurial-19.12.0-r1.ebuild} | 5 +++++ ...0.ebuild => dolphin-plugins-subversion-19.12.0-r1.ebuild} | 5 +++++ 5 files changed, 25 insertions(+) rename kde-apps/dolphin-plugins-bazaar/{dolphin-plugins-bazaar-19.12.0.ebuild => dolphin-plugins-bazaar-19.12.0-r1.ebuild} (91%) rename kde-apps/dolphin-plugins-dropbox/{dolphin-plugins-dropbox-19.12.0.ebuild => dolphin-plugins-dropbox-19.12.0-r1.ebuild} (91%) rename kde-apps/dolphin-plugins-git/{dolphin-plugins-git-19.12.0.ebuild => dolphin-plugins-git-19.12.0-r1.ebuild} (92%) rename kde-apps/dolphin-plugins-mercurial/{dolphin-plugins-mercurial-19.12.0.ebuild => dolphin-plugins-mercurial-19.12.0-r1.ebuild} (93%) rename kde-apps/dolphin-plugins-subversion/{dolphin-plugins-subversion-19.12.0.ebuild => dolphin-plugins-subversion-19.12.0-r1.ebuild} (92%) 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 828944d24e2f..594aafcd89ca 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 1f450f8a3d86..419a6c9fb354 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 e8ad6928e174..faf12875607c 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 d414c2203a2b..377f98447cf7 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 c6ceea2d42b5..45e0ff88cec7 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 +} -- 2.26.2