[gentoo-commits] proj/kde:master commit in: kde-apps/kfmclient/

[Manuel Rüger]

commit:     5c21a0c591ac0371c49beb76243490a26797330a
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  2 17:44:27 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 17:44:27 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c21a0c5

[kde-apps/kfmclient] Fix file collision with kde-apps/konqueror

Package-Manager: portage-2.2.14

---
 .../{kfmclient-14.11.97.ebuild => kfmclient-14.11.97-r1.ebuild}       | 4 ++--
 kde-apps/kfmclient/kfmclient-9999.ebuild                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kfmclient/kfmclient-14.11.97.ebuild 
b/kde-apps/kfmclient/kfmclient-14.11.97-r1.ebuild
similarity index 91%
rename from kde-apps/kfmclient/kfmclient-14.11.97.ebuild
rename to kde-apps/kfmclient/kfmclient-14.11.97-r1.ebuild
index 03d15dd..4936eda 100644
--- a/kde-apps/kfmclient/kfmclient-14.11.97.ebuild
+++ b/kde-apps/kfmclient/kfmclient-14.11.97-r1.ebuild
@@ -13,7 +13,6 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"
 
 KMEXTRACTONLY="
-       konqueror/konqueror.appdata.xml
        konqueror/kfmclient.desktop
        konqueror/kfmclient_dir.desktop
        konqueror/kfmclient_html.desktop
@@ -29,6 +28,7 @@ src_prepare() {
        sed -e "/konqbrowser\.desktop/d" \
                -e "/konqueror\.desktop/s/^/#DONOTWANT/" \
                -e "/install(FILES profile/s/^/#DONOTWANT/" \
+               -e "/install(FILES konqueror.appdata.xml/s/^/#DONOTWANT/" \
                -i konqueror/CMakeLists.txt \
-               || die "Failed to omit .desktop files"
+               || die
 }

diff --git a/kde-apps/kfmclient/kfmclient-9999.ebuild 
b/kde-apps/kfmclient/kfmclient-9999.ebuild
index 81e3777..b1bbfef 100644
--- a/kde-apps/kfmclient/kfmclient-9999.ebuild
+++ b/kde-apps/kfmclient/kfmclient-9999.ebuild
@@ -13,7 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 KMEXTRACTONLY="
-       konqueror/konqueror.appdata.xml
        konqueror/kfmclient.desktop
        konqueror/kfmclient_dir.desktop
        konqueror/kfmclient_html.desktop
@@ -29,6 +28,7 @@ src_prepare() {
        sed -e "/konqbrowser\.desktop/d" \
                -e "/konqueror\.desktop/s/^/#DONOTWANT/" \
                -e "/install(FILES profile/s/^/#DONOTWANT/" \
+               -e "/install(FILES konqueror.appdata.xml/s/^/#DONOTWANT/" \
                -i konqueror/CMakeLists.txt \
                || die "Failed to omit .desktop files"
 }