Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmail/
Date: Wed, 31 Aug 2016 14:34:30
Message-Id: 1472654009.f0e93f5b870eb814228571638ed64c3762e4753a.kensington@gentoo
1 commit: f0e93f5b870eb814228571638ed64c3762e4753a
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 30 13:06:52 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 14:33:29 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f0e93f5b
7
8 kde-apps/kmail: Moved to its own repository
9
10 Fix DESCRIPTION.
11
12 Package-Manager: portage-2.2.28
13
14 kde-apps/kmail/kmail-16.08.0.ebuild | 2 +-
15 kde-apps/kmail/kmail-16.08.49.9999.ebuild | 2 +-
16 kde-apps/kmail/kmail-9999.ebuild | 23 +----------------------
17 3 files changed, 3 insertions(+), 24 deletions(-)
18
19 diff --git a/kde-apps/kmail/kmail-16.08.0.ebuild b/kde-apps/kmail/kmail-16.08.0.ebuild
20 index ac69a40..f99dfaf 100644
21 --- a/kde-apps/kmail/kmail-16.08.0.ebuild
22 +++ b/kde-apps/kmail/kmail-16.08.0.ebuild
23 @@ -10,7 +10,7 @@ KMNAME="kdepim"
24 VIRTUALX_REQUIRED="test"
25 inherit kde5
26
27 -DESCRIPTION="Email component of Kontact, the integrated personal information manager by KDE"
28 +DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
29 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
30 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
31 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
32
33 diff --git a/kde-apps/kmail/kmail-16.08.49.9999.ebuild b/kde-apps/kmail/kmail-16.08.49.9999.ebuild
34 index 447a4b0..5dba7cb 100644
35 --- a/kde-apps/kmail/kmail-16.08.49.9999.ebuild
36 +++ b/kde-apps/kmail/kmail-16.08.49.9999.ebuild
37 @@ -10,7 +10,7 @@ KMNAME="kdepim"
38 VIRTUALX_REQUIRED="test"
39 inherit kde5
40
41 -DESCRIPTION="Email component of Kontact, the integrated personal information manager by KDE"
42 +DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
43 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
44 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
45 KEYWORDS=""
46
47 diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
48 index 447a4b0..b048106 100644
49 --- a/kde-apps/kmail/kmail-9999.ebuild
50 +++ b/kde-apps/kmail/kmail-9999.ebuild
51 @@ -6,11 +6,10 @@ EAPI=6
52
53 KDE_HANDBOOK="forceoptional"
54 KDE_TEST="forceoptional"
55 -KMNAME="kdepim"
56 VIRTUALX_REQUIRED="test"
57 inherit kde5
58
59 -DESCRIPTION="Email component of Kontact, the integrated personal information manager by KDE"
60 +DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
61 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
62 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
63 KEYWORDS=""
64 @@ -80,26 +79,6 @@ RDEPEND="${COMMON_DEPEND}
65 !kde-apps/kdepim-common-libs:4
66 "
67
68 -src_prepare() {
69 - # kmail subproject does not contain doc
70 - # at least until properly split upstream
71 - echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
72 -
73 - mkdir doc || die "Failed to create doc dir"
74 - mv ../doc/${PN} doc || die "Failed to move handbook"
75 - mv ../doc/akonadi_archivemail_agent doc || die "Failed to move handbook"
76 - mv ../doc/akonadi_followupreminder_agent doc || die "Failed to move handbook"
77 - mv ../doc/akonadi_sendlater_agent doc || die "Failed to move handbook"
78 - cat <<-EOF > doc/CMakeLists.txt
79 -add_subdirectory(${PN})
80 -add_subdirectory(akonadi_archivemail_agent)
81 -add_subdirectory(akonadi_followupreminder_agent)
82 -add_subdirectory(akonadi_sendlater_agent)
83 -EOF
84 -
85 - kde5_src_prepare
86 -}
87 -
88 pkg_postinst() {
89 kde5_pkg_postinst