1 |
commit: 1fe26fad623252aae3888e2ff908c7922ff5cd01 |
2 |
Author: Yury Martynov <email <AT> linxon <DOT> ru> |
3 |
AuthorDate: Fri Apr 10 09:51:17 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 23 17:59:10 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe26fad |
7 |
|
8 |
app-text/cherrytree: bump to 0.99.0_p20200523 and drop 0.39.2 (C++ version) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/716874 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Yury Martynov <email <AT> linxon.ru> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/15285 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
app-text/cherrytree/Manifest | 2 +- |
17 |
app-text/cherrytree/cherrytree-0.39.2.ebuild | 96 --------------------- |
18 |
.../cherrytree/cherrytree-0.99.0_p20200523.ebuild | 97 ++++++++++++++++++++++ |
19 |
app-text/cherrytree/cherrytree-9999.ebuild | 97 ++++++++++++++++++++++ |
20 |
4 files changed, 195 insertions(+), 97 deletions(-) |
21 |
|
22 |
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest |
23 |
index 9b9b8ef3fbf..762a81d7baf 100644 |
24 |
--- a/app-text/cherrytree/Manifest |
25 |
+++ b/app-text/cherrytree/Manifest |
26 |
@@ -1,3 +1,3 @@ |
27 |
DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5 |
28 |
DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b |
29 |
-DIST cherrytree-0.39.2.tar.gz 10044337 BLAKE2B 352b6b709e62487015eccf817c4aec799586f64b9e07e38f1eab5e1491b36d8e2ae2f62f55f32248ca1f5cc0c0f610282493de2f3d4cf4e128ecb66acb895668 SHA512 46a02753f02f17e9696e21510ad93222843734a8be271e3a20d7a038856ad99ff2c8316d559e56567e877e419324fe3b254882bb1578a3c8d85c902169cb0e26 |
30 |
+DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54 |
31 |
|
32 |
diff --git a/app-text/cherrytree/cherrytree-0.39.2.ebuild b/app-text/cherrytree/cherrytree-0.39.2.ebuild |
33 |
deleted file mode 100644 |
34 |
index 0c4f473d9b8..00000000000 |
35 |
--- a/app-text/cherrytree/cherrytree-0.39.2.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,96 +0,0 @@ |
38 |
-# Copyright 1999-2020 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=7 |
42 |
- |
43 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
44 |
- |
45 |
-inherit autotools desktop python-any-r1 xdg-utils |
46 |
- |
47 |
-DESCRIPTION="A hierarchical note taking application" |
48 |
-HOMEPAGE="https://www.giuspen.com/cherrytree" |
49 |
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="GPL-3" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="~amd64 ~x86" |
54 |
-IUSE="nls test" |
55 |
- |
56 |
-RESTRICT="!test? ( test )" |
57 |
- |
58 |
-RDEPEND=" |
59 |
- dev-cpp/gtkmm:3.0 |
60 |
- dev-cpp/gtksourceviewmm:3.0 |
61 |
- dev-cpp/libxmlpp:2.6 |
62 |
- dev-cpp/pangomm |
63 |
- dev-db/sqlite:3 |
64 |
- dev-libs/libxml2:2" |
65 |
-DEPEND="${RDEPEND}" |
66 |
-BDEPEND="${PYTHON_DEPS} |
67 |
- dev-util/intltool |
68 |
- virtual/pkgconfig |
69 |
- nls? ( sys-devel/gettext ) |
70 |
- test? ( dev-util/cpputest )" |
71 |
- |
72 |
-S="${S}/future" |
73 |
- |
74 |
-pkg_setup() { |
75 |
- python-any-r1_pkg_setup |
76 |
-} |
77 |
- |
78 |
-src_prepare() { |
79 |
- default |
80 |
- |
81 |
- python_fix_shebang "${S}" |
82 |
- |
83 |
- sed -i \ |
84 |
- -e "s|\(CT_VERSION.*{\)\(.*\)\(};\)$|\1\"${PV}\"\3|" \ |
85 |
- src/ct/ct_const.cc || die |
86 |
- |
87 |
- if ! use test; then |
88 |
- sed -i \ |
89 |
- -e '/^PKG_CHECK_MODULES/s|\(\[.*\)cpputest\(.*\]\)|\1\2|' \ |
90 |
- configure.ac || die |
91 |
- fi |
92 |
- |
93 |
- eautoreconf |
94 |
-} |
95 |
- |
96 |
-src_configure() { |
97 |
- econf $(use_enable nls) |
98 |
-} |
99 |
- |
100 |
-src_install() { |
101 |
- default |
102 |
- pushd ../ >/dev/null || die |
103 |
- |
104 |
- insinto /usr/share/mime/packages |
105 |
- doins linux/cherrytree.xml |
106 |
- |
107 |
- insinto /usr/share/mime-info |
108 |
- doins linux/cherrytree.{mime,keys} |
109 |
- |
110 |
- insinto /usr/share/metainfo |
111 |
- doins linux/cherrytree.appdata.xml |
112 |
- |
113 |
- insinto /usr/share/application-registry |
114 |
- doins linux/cherrytree.applications |
115 |
- |
116 |
- doicon -s scalable future/icons/cherrytree.svg |
117 |
- domenu linux/cherrytree.desktop |
118 |
- doman linux/cherrytree.1 |
119 |
- |
120 |
- popd >/dev/null || die |
121 |
-} |
122 |
- |
123 |
-pkg_postinst() { |
124 |
- xdg_icon_cache_update |
125 |
- xdg_mimeinfo_database_update |
126 |
- xdg_desktop_database_update |
127 |
-} |
128 |
- |
129 |
-pkg_postrm() { |
130 |
- xdg_icon_cache_update |
131 |
- xdg_mimeinfo_database_update |
132 |
- xdg_desktop_database_update |
133 |
-} |
134 |
|
135 |
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild b/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild |
136 |
new file mode 100644 |
137 |
index 00000000000..9599c94f496 |
138 |
--- /dev/null |
139 |
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild |
140 |
@@ -0,0 +1,97 @@ |
141 |
+# Copyright 1999-2020 Gentoo Authors |
142 |
+# Distributed under the terms of the GNU General Public License v2 |
143 |
+ |
144 |
+EAPI=7 |
145 |
+ |
146 |
+PYTHON_COMPAT=( python3_{6..8} ) |
147 |
+ |
148 |
+inherit cmake python-any-r1 xdg-utils |
149 |
+ |
150 |
+DESCRIPTION="A hierarchical note taking application (C++ version)" |
151 |
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree" |
152 |
+ |
153 |
+if [[ ${PV} == *9999 ]]; then |
154 |
+ inherit git-r3 |
155 |
+ EGIT_REPO_URI="https://github.com/giuspen/cherrytree" |
156 |
+ S="${WORKDIR}/${P}/future" |
157 |
+else |
158 |
+ COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523 |
159 |
+ SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
160 |
+ KEYWORDS="~amd64 ~x86" |
161 |
+ S="${WORKDIR}/${PN}-${COMMIT}/future" |
162 |
+fi |
163 |
+ |
164 |
+# GPL-3 — future/src/ct (CherryTree) |
165 |
+# LGPL-2.1 — future/src/7za (7zip) |
166 |
+# MIT — future/src/fmt (libfmt) |
167 |
+LICENSE="GPL-3 LGPL-2.1 MIT" |
168 |
+SLOT="0" |
169 |
+IUSE="nls test" |
170 |
+ |
171 |
+RESTRICT="!test? ( test )" |
172 |
+ |
173 |
+RDEPEND=" |
174 |
+ app-text/gspell:= |
175 |
+ dev-libs/glib:2 |
176 |
+ >=dev-cpp/glibmm-2.64.2:2 |
177 |
+ dev-cpp/gtkmm:3.0 |
178 |
+ dev-cpp/gtksourceviewmm:3.0 |
179 |
+ dev-libs/libxml2:2 |
180 |
+ dev-cpp/libxmlpp:2.6 |
181 |
+ dev-cpp/pangomm |
182 |
+ dev-db/sqlite:3" |
183 |
+DEPEND="${RDEPEND} |
184 |
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')" |
185 |
+BDEPEND="${PYTHON_DEPS} |
186 |
+ virtual/pkgconfig |
187 |
+ nls? ( |
188 |
+ dev-util/intltool |
189 |
+ sys-devel/gettext |
190 |
+ ) |
191 |
+ test? ( dev-util/cpputest )" |
192 |
+ |
193 |
+pkg_setup() { |
194 |
+ python-any-r1_pkg_setup |
195 |
+} |
196 |
+ |
197 |
+python_check_deps() { |
198 |
+ has_version "dev-python/lxml[${PYTHON_USEDEP}]" |
199 |
+} |
200 |
+ |
201 |
+src_prepare() { |
202 |
+ # disable compress man pages |
203 |
+ sed -i -e \ |
204 |
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \ |
205 |
+ CMakeLists.txt || die |
206 |
+ |
207 |
+ if [[ ${PV} != *9999 ]]; then |
208 |
+ sed -i \ |
209 |
+ -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \ |
210 |
+ CMakeLists.txt || die |
211 |
+ fi |
212 |
+ |
213 |
+ python_fix_shebang . |
214 |
+ cmake_src_prepare |
215 |
+} |
216 |
+ |
217 |
+src_configure() { |
218 |
+ local mycmakeargs=( |
219 |
+ -DPYTHON_EXEC="${PYTHON}" |
220 |
+ -DUSE_NLS=$(usex nls) |
221 |
+ -DBUILD_TESTING=$(usex test) |
222 |
+ ) |
223 |
+ |
224 |
+ cmake_src_configure |
225 |
+} |
226 |
+ |
227 |
+pkg_postinst() { |
228 |
+ xdg_icon_cache_update |
229 |
+ xdg_mimeinfo_database_update |
230 |
+ xdg_desktop_database_update |
231 |
+} |
232 |
+ |
233 |
+pkg_postrm() { |
234 |
+ xdg_icon_cache_update |
235 |
+ xdg_mimeinfo_database_update |
236 |
+ xdg_desktop_database_update |
237 |
+} |
238 |
|
239 |
diff --git a/app-text/cherrytree/cherrytree-9999.ebuild b/app-text/cherrytree/cherrytree-9999.ebuild |
240 |
new file mode 100644 |
241 |
index 00000000000..9599c94f496 |
242 |
--- /dev/null |
243 |
+++ b/app-text/cherrytree/cherrytree-9999.ebuild |
244 |
@@ -0,0 +1,97 @@ |
245 |
+# Copyright 1999-2020 Gentoo Authors |
246 |
+# Distributed under the terms of the GNU General Public License v2 |
247 |
+ |
248 |
+EAPI=7 |
249 |
+ |
250 |
+PYTHON_COMPAT=( python3_{6..8} ) |
251 |
+ |
252 |
+inherit cmake python-any-r1 xdg-utils |
253 |
+ |
254 |
+DESCRIPTION="A hierarchical note taking application (C++ version)" |
255 |
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree" |
256 |
+ |
257 |
+if [[ ${PV} == *9999 ]]; then |
258 |
+ inherit git-r3 |
259 |
+ EGIT_REPO_URI="https://github.com/giuspen/cherrytree" |
260 |
+ S="${WORKDIR}/${P}/future" |
261 |
+else |
262 |
+ COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523 |
263 |
+ SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
264 |
+ KEYWORDS="~amd64 ~x86" |
265 |
+ S="${WORKDIR}/${PN}-${COMMIT}/future" |
266 |
+fi |
267 |
+ |
268 |
+# GPL-3 — future/src/ct (CherryTree) |
269 |
+# LGPL-2.1 — future/src/7za (7zip) |
270 |
+# MIT — future/src/fmt (libfmt) |
271 |
+LICENSE="GPL-3 LGPL-2.1 MIT" |
272 |
+SLOT="0" |
273 |
+IUSE="nls test" |
274 |
+ |
275 |
+RESTRICT="!test? ( test )" |
276 |
+ |
277 |
+RDEPEND=" |
278 |
+ app-text/gspell:= |
279 |
+ dev-libs/glib:2 |
280 |
+ >=dev-cpp/glibmm-2.64.2:2 |
281 |
+ dev-cpp/gtkmm:3.0 |
282 |
+ dev-cpp/gtksourceviewmm:3.0 |
283 |
+ dev-libs/libxml2:2 |
284 |
+ dev-cpp/libxmlpp:2.6 |
285 |
+ dev-cpp/pangomm |
286 |
+ dev-db/sqlite:3" |
287 |
+DEPEND="${RDEPEND} |
288 |
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')" |
289 |
+BDEPEND="${PYTHON_DEPS} |
290 |
+ virtual/pkgconfig |
291 |
+ nls? ( |
292 |
+ dev-util/intltool |
293 |
+ sys-devel/gettext |
294 |
+ ) |
295 |
+ test? ( dev-util/cpputest )" |
296 |
+ |
297 |
+pkg_setup() { |
298 |
+ python-any-r1_pkg_setup |
299 |
+} |
300 |
+ |
301 |
+python_check_deps() { |
302 |
+ has_version "dev-python/lxml[${PYTHON_USEDEP}]" |
303 |
+} |
304 |
+ |
305 |
+src_prepare() { |
306 |
+ # disable compress man pages |
307 |
+ sed -i -e \ |
308 |
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \ |
309 |
+ CMakeLists.txt || die |
310 |
+ |
311 |
+ if [[ ${PV} != *9999 ]]; then |
312 |
+ sed -i \ |
313 |
+ -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \ |
314 |
+ CMakeLists.txt || die |
315 |
+ fi |
316 |
+ |
317 |
+ python_fix_shebang . |
318 |
+ cmake_src_prepare |
319 |
+} |
320 |
+ |
321 |
+src_configure() { |
322 |
+ local mycmakeargs=( |
323 |
+ -DPYTHON_EXEC="${PYTHON}" |
324 |
+ -DUSE_NLS=$(usex nls) |
325 |
+ -DBUILD_TESTING=$(usex test) |
326 |
+ ) |
327 |
+ |
328 |
+ cmake_src_configure |
329 |
+} |
330 |
+ |
331 |
+pkg_postinst() { |
332 |
+ xdg_icon_cache_update |
333 |
+ xdg_mimeinfo_database_update |
334 |
+ xdg_desktop_database_update |
335 |
+} |
336 |
+ |
337 |
+pkg_postrm() { |
338 |
+ xdg_icon_cache_update |
339 |
+ xdg_mimeinfo_database_update |
340 |
+ xdg_desktop_database_update |
341 |
+} |