summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Schridde <devurandom@gmx.net>2014-03-23 12:52:17 +0100
committerDennis Schridde <devurandom@gmx.net>2014-03-23 12:52:17 +0100
commit3a3291a65b0fa52fac190d3801d276e886c3abd5 (patch)
tree3060ad5260ba5ca8827cd65817d11c0f0612c196
parent348050d50ef6759190a51e227cad77c52879243d (diff)
downloadkde-3a3291a65b0fa52fac190d3801d276e886c3abd5.tar.gz
kde-3a3291a65b0fa52fac190d3801d276e886c3abd5.tar.bz2
kde-3a3291a65b0fa52fac190d3801d276e886c3abd5.zip
[kde-base/kdepim-common-libs-4.12.95] folderarchiveagent.desktop belongs to kde-base/kmail, so do not install it here (bug #505212)
Package-Manager: portage-HEAD
-rw-r--r--kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch8
-rw-r--r--kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild3
2 files changed, 9 insertions, 2 deletions
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch
new file mode 100644
index 00000000000..2e7600f52ca
--- /dev/null
+++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch
@@ -0,0 +1,8 @@
+--- a/agents/CMakeLists.txt 2014-03-20 23:18:57.934117532 +0100
++++ b/agents/CMakeLists.txt 2014-03-20 23:39:40.801138867 +0100
+@@ -8,4 +8,3 @@
+ #DONOTCOMPILE add_subdirectory(notesagent)
+ #comment until 4.13
+ #add_subdirectory(followupreminderagent)
+-install(FILES folderarchiveagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
+
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
index ddf8f3d8f75..ea564422a27 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
@@ -62,7 +62,6 @@ KMEXTRA="
templateparser/
"
KMEXTRACTONLY="
- agents/folderarchiveagent.desktop
kleopatra/
kmail/
knode/org.kde.knode.xml
@@ -72,4 +71,4 @@ KMEXTRACTONLY="
"
KMSAVELIBS="true"
-PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
+PATCHES=( "${FILESDIR}/install-composereditorng.patch" "${FILESDIR}/${P}-dont-install-folderarchiveagent.patch" )