Gentoo Archives: gentoo-commits

From: Dennis Schridde <devurandom@×××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/, kde-base/kdepim-common-libs/files/
Date: Sun, 23 Mar 2014 11:53:51
Message-Id: 1395575537.3a3291a65b0fa52fac190d3801d276e886c3abd5.devurandom@gentoo
1 commit: 3a3291a65b0fa52fac190d3801d276e886c3abd5
2 Author: Dennis Schridde <devurandom <AT> gmx <DOT> net>
3 AuthorDate: Sun Mar 23 11:52:17 2014 +0000
4 Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net>
5 CommitDate: Sun Mar 23 11:52:17 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a3291a6
7
8 [kde-base/kdepim-common-libs-4.12.95] folderarchiveagent.desktop belongs to kde-base/kmail, so do not install it here (bug #505212)
9
10 Package-Manager: portage-HEAD
11
12 ---
13 ...epim-common-libs-4.12.95-dont-install-folderarchiveagent.patch | 8 ++++++++
14 kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild | 3 +--
15 2 files changed, 9 insertions(+), 2 deletions(-)
16
17 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
18 new file mode 100644
19 index 0000000..2e7600f
20 --- /dev/null
21 +++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.12.95-dont-install-folderarchiveagent.patch
22 @@ -0,0 +1,8 @@
23 +--- a/agents/CMakeLists.txt 2014-03-20 23:18:57.934117532 +0100
24 ++++ b/agents/CMakeLists.txt 2014-03-20 23:39:40.801138867 +0100
25 +@@ -8,4 +8,3 @@
26 + #DONOTCOMPILE add_subdirectory(notesagent)
27 + #comment until 4.13
28 + #add_subdirectory(followupreminderagent)
29 +-install(FILES folderarchiveagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
30 +
31
32 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
33 index ddf8f3d..ea56442 100644
34 --- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
35 +++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.95.ebuild
36 @@ -62,7 +62,6 @@ KMEXTRA="
37 templateparser/
38 "
39 KMEXTRACTONLY="
40 - agents/folderarchiveagent.desktop
41 kleopatra/
42 kmail/
43 knode/org.kde.knode.xml
44 @@ -72,4 +71,4 @@ KMEXTRACTONLY="
45 "
46 KMSAVELIBS="true"
47
48 -PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
49 +PATCHES=( "${FILESDIR}/install-composereditorng.patch" "${FILESDIR}/${P}-dont-install-folderarchiveagent.patch" )