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/ktnef/
Date: Wed, 31 Aug 2016 14:34:23
Message-Id: 1472654009.596eb1de8840ea0a6aac9d5ec21b56db22bedb20.kensington@gentoo
1 commit: 596eb1de8840ea0a6aac9d5ec21b56db22bedb20
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 30 14:14:14 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=596eb1de
7
8 kde-apps/ktnef: Upstream repository changed (kdepim -> kmail)
9
10 Therefore, source dir needs extra care. Fix DESCRIPTION.
11
12 Package-Manager: portage-2.2.28
13
14 kde-apps/ktnef/ktnef-16.08.0.ebuild | 2 +-
15 kde-apps/ktnef/ktnef-16.08.49.9999.ebuild | 2 +-
16 kde-apps/ktnef/ktnef-9999.ebuild | 18 +++---------------
17 3 files changed, 5 insertions(+), 17 deletions(-)
18
19 diff --git a/kde-apps/ktnef/ktnef-16.08.0.ebuild b/kde-apps/ktnef/ktnef-16.08.0.ebuild
20 index c638861..2be31dd 100644
21 --- a/kde-apps/ktnef/ktnef-16.08.0.ebuild
22 +++ b/kde-apps/ktnef/ktnef-16.08.0.ebuild
23 @@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
24 KMNAME="kdepim"
25 inherit kde5
26
27 -DESCRIPTION="A viewer for TNEF attachments"
28 +DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)"
29 HOMEPAGE="https://www.kde.org/"
30 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
31 KEYWORDS="~amd64 ~x86"
32
33 diff --git a/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild b/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
34 index 17cbc58..d6f7e6f 100644
35 --- a/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
36 +++ b/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
37 @@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
38 KMNAME="kdepim"
39 inherit kde5
40
41 -DESCRIPTION="A viewer for TNEF attachments"
42 +DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)"
43 HOMEPAGE="https://www.kde.org/"
44 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
45 KEYWORDS=""
46
47 diff --git a/kde-apps/ktnef/ktnef-9999.ebuild b/kde-apps/ktnef/ktnef-9999.ebuild
48 index 17cbc58..b1bb0e1 100644
49 --- a/kde-apps/ktnef/ktnef-9999.ebuild
50 +++ b/kde-apps/ktnef/ktnef-9999.ebuild
51 @@ -5,10 +5,10 @@
52 EAPI=6
53
54 KDE_HANDBOOK="forceoptional"
55 -KMNAME="kdepim"
56 +KMNAME="kmail"
57 inherit kde5
58
59 -DESCRIPTION="A viewer for TNEF attachments"
60 +DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)"
61 HOMEPAGE="https://www.kde.org/"
62 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
63 KEYWORDS=""
64 @@ -31,16 +31,4 @@ DEPEND="
65 "
66 RDEPEND="${DEPEND}"
67
68 -src_prepare() {
69 - # ktnef subproject does not contain doc nor searches for DocTools
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 - cat <<-EOF > doc/CMakeLists.txt
76 -find_package(KF5DocTools)
77 -add_subdirectory(${PN})
78 -EOF
79 - kde5_src_prepare
80 -}
81 +S="${S}/${PN}"