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/knotes/
Date: Wed, 31 Aug 2016 14:34:35
Message-Id: 1472654009.12f5fac67ad85dd1775aacf6a10f5dffb17a3508.kensington@gentoo
1 commit: 12f5fac67ad85dd1775aacf6a10f5dffb17a3508
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 30 13:19:06 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=12f5fac6
7
8 kde-apps/knotes: Moved to its own repository
9
10 Fix DESCRIPTION.
11
12 Package-Manager: portage-2.2.28
13
14 kde-apps/knotes/knotes-16.08.0.ebuild | 12 +-----------
15 kde-apps/knotes/knotes-16.08.49.9999.ebuild | 12 +-----------
16 kde-apps/knotes/knotes-9999.ebuild | 19 +------------------
17 3 files changed, 3 insertions(+), 40 deletions(-)
18
19 diff --git a/kde-apps/knotes/knotes-16.08.0.ebuild b/kde-apps/knotes/knotes-16.08.0.ebuild
20 index c70ecff..8dbb14d 100644
21 --- a/kde-apps/knotes/knotes-16.08.0.ebuild
22 +++ b/kde-apps/knotes/knotes-16.08.0.ebuild
23 @@ -10,7 +10,7 @@ KMNAME="kdepim"
24 VIRTUALX_REQUIRED="test"
25 inherit kde5
26
27 -DESCRIPTION="KDE Notes application"
28 +DESCRIPTION="Note taking application"
29 HOMEPAGE="https://www.kde.org/"
30 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
31 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
32 @@ -77,13 +77,3 @@ EOF
33
34 kde5_src_prepare
35 }
36 -
37 -src_configure() {
38 -# local mycmakeargs=(
39 -# # FIXME: Does not build (last checked 2016-02-17)
40 -# $(cmake-utils_use_find_package X Qt5X11Extras)
41 -# $(cmake-utils_use_find_package X X11)
42 -# )
43 -
44 - kde5_src_configure
45 -}
46
47 diff --git a/kde-apps/knotes/knotes-16.08.49.9999.ebuild b/kde-apps/knotes/knotes-16.08.49.9999.ebuild
48 index 555c02c..ee83c36 100644
49 --- a/kde-apps/knotes/knotes-16.08.49.9999.ebuild
50 +++ b/kde-apps/knotes/knotes-16.08.49.9999.ebuild
51 @@ -10,7 +10,7 @@ KMNAME="kdepim"
52 VIRTUALX_REQUIRED="test"
53 inherit kde5
54
55 -DESCRIPTION="KDE Notes application"
56 +DESCRIPTION="Note taking application"
57 HOMEPAGE="https://www.kde.org/"
58 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
59 KEYWORDS=""
60 @@ -77,13 +77,3 @@ EOF
61
62 kde5_src_prepare
63 }
64 -
65 -src_configure() {
66 -# local mycmakeargs=(
67 -# # FIXME: Does not build (last checked 2016-02-17)
68 -# $(cmake-utils_use_find_package X Qt5X11Extras)
69 -# $(cmake-utils_use_find_package X X11)
70 -# )
71 -
72 - kde5_src_configure
73 -}
74
75 diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
76 index 02c2add..96b5cc8 100644
77 --- a/kde-apps/knotes/knotes-9999.ebuild
78 +++ b/kde-apps/knotes/knotes-9999.ebuild
79 @@ -6,11 +6,10 @@ EAPI=6
80
81 KDE_HANDBOOK="forceoptional"
82 KDE_TEST="forceoptional"
83 -KMNAME="kdepim"
84 VIRTUALX_REQUIRED="test"
85 inherit kde5
86
87 -DESCRIPTION="KDE Notes application"
88 +DESCRIPTION="Note taking application"
89 HOMEPAGE="https://www.kde.org/"
90 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
91 KEYWORDS=""
92 @@ -60,22 +59,6 @@ DEPEND="
93 "
94 RDEPEND="${DEPEND}"
95
96 -src_prepare() {
97 - # knotes subproject does not contain doc
98 - # at least until properly split upstream
99 - echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
100 -
101 - mkdir doc || die "Failed to create doc dir"
102 - mv ../doc/${PN} doc || die "Failed to move handbook"
103 - mv ../doc/akonadi_notes_agent doc || die "Failed to move handbook"
104 - cat <<-EOF > doc/CMakeLists.txt
105 -add_subdirectory(${PN})
106 -add_subdirectory(akonadi_notes_agent)
107 -EOF
108 -
109 - kde5_src_prepare
110 -}
111 -
112 src_configure() {
113 # local mycmakeargs=(
114 # # FIXME: Does not build (last checked 2016-02-17)