Gentoo Archives: gentoo-commits

From: Aaron Swenson <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/, app-office/gnucash/files/
Date: Sun, 07 Oct 2018 10:19:09
Message-Id: 1538907446.271f77dca714091958915902161c731e1476ddba.titanofold@gentoo
1 commit: 271f77dca714091958915902161c731e1476ddba
2 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 7 10:17:03 2018 +0000
4 Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 7 10:17:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271f77dc
7
8 app-office/gnucash: Cleanup old
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.11
11 Signed-off-by: Aaron Swenson <titanofold <AT> gentoo.org>
12
13 app-office/gnucash/Manifest | 1 -
14 .../gnucash/files/gnucash-2.7.4-double_free.patch | 12 --
15 ...ucash-2.7.4-fix-tests-for-32bit-platforms.patch | 56 -------
16 app-office/gnucash/gnucash-2.7.4-r1.ebuild | 165 ---------------------
17 app-office/gnucash/gnucash-3.2.ebuild | 160 --------------------
18 5 files changed, 394 deletions(-)
19
20 diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
21 index 0cd972338cb..c2508be7720 100644
22 --- a/app-office/gnucash/Manifest
23 +++ b/app-office/gnucash/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
26 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
27 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
28 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
29
30 diff --git a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
31 deleted file mode 100644
32 index 9d82e72f96b..00000000000
33 --- a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
34 +++ /dev/null
35 @@ -1,12 +0,0 @@
36 -diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c
37 -index 5a8cd5c50..a702a56aa 100644
38 ---- a/libgnucash/core-utils/test/test-userdata-dir.c
39 -+++ b/libgnucash/core-utils/test/test-userdata-dir.c
40 -@@ -338,7 +338,6 @@ main(int argc, char **argv)
41 -
42 - /* Clean up the temporaries that were created for the GNC_DATA_HOME test run */
43 - g_free (home_dir);
44 -- g_free (tmp_dir);
45 - tmp_dir = g_build_filename(gnc_data_home_dir, "data", (gchar *)NULL);
46 - g_rmdir (tmp_dir);
47 - g_free (tmp_dir);
48
49 diff --git a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
50 deleted file mode 100644
51 index ec0e83a80bf..00000000000
52 --- a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
53 +++ /dev/null
54 @@ -1,56 +0,0 @@
55 -From 3a0d2009741cdf825492020acab7c85867a60589 Mon Sep 17 00:00:00 2001
56 -From: Thomas Deutschmann <whissi@g.o>
57 -Date: Thu, 22 Feb 2018 12:27:36 +0100
58 -Subject: [PATCH] tests: Skip tests for dates on 32-bit platforms which cannot
59 - be representated
60 -
61 -Tests "test_IANA_Perth_tz" and "test_IANA_Minsk_tz" are failing on 32-bit
62 -platforms because the earliest timestamp which can be representated on a
63 -32-bit platform is "1901-12-13 20:45:52" but the test ranges start before
64 -that date.
65 -
66 -To be safe, this commit will add code to skip tests before year 1902 on
67 -32-bit platforms.
68 -
69 -Bug: https://bugs.gentoo.org/647596
70 ----
71 - libgnucash/engine/test/gtest-gnc-timezone.cpp | 16 ++++++++++++++++
72 - 1 file changed, 16 insertions(+)
73 -
74 -diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
75 -index 5c46b2618..298220f6e 100644
76 ---- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
77 -+++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp
78 -@@ -154,6 +154,14 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
79 - }
80 - else if (year < 1916)
81 - #else
82 -+ if (year < 1902)
83 -+ {
84 -+ // Earliest timestamp which can be represented on a 32-bit
85 -+ // system is "1901-12-13 20:45:52" -- so skip tests until we
86 -+ // reach a year >1901 to be safe
87 -+ continue;
88 -+ }
89 -+
90 - if (year < 1916)
91 - #endif
92 - {
93 -@@ -216,6 +224,14 @@ TEST(gnc_timezone_constructors, test_IANA_Minsk_tz)
94 - }
95 - else if (year < 1924)
96 - #else
97 -+ if (year < 1902)
98 -+ {
99 -+ // Earliest timestamp which can be represented on a 32-bit
100 -+ // system is "1901-12-13 20:45:52" -- so skip tests until we
101 -+ // reach a year >1901 to be safe
102 -+ continue;
103 -+ }
104 -+
105 - if (year < 1924)
106 - #endif
107 - {
108 ---
109 -2.16.2
110 -
111
112 diff --git a/app-office/gnucash/gnucash-2.7.4-r1.ebuild b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
113 deleted file mode 100644
114 index 770723b97a1..00000000000
115 --- a/app-office/gnucash/gnucash-2.7.4-r1.ebuild
116 +++ /dev/null
117 @@ -1,165 +0,0 @@
118 -# Copyright 1999-2018 Gentoo Foundation
119 -# Distributed under the terms of the GNU General Public License v2
120 -
121 -EAPI=6
122 -
123 -# google{test,mock} version
124 -GV="1.8.0"
125 -PYTHON_COMPAT=( python2_7 )
126 -
127 -inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
128 -
129 -DESCRIPTION="A personal finance manager"
130 -HOMEPAGE="http://www.gnucash.org/"
131 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
132 - https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
133 -
134 -SLOT="0"
135 -LICENSE="GPL-2"
136 -KEYWORDS="amd64 ~ppc ~ppc64 x86"
137 -
138 -# Add doc back in for 3.0 and bump app-doc/gnucash-docs
139 -IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres
140 - python quotes -register2 sqlite"
141 -REQUIRED_USE="
142 - chipcard? ( aqbanking )
143 - python? ( ${PYTHON_REQUIRED_USE} )"
144 -
145 -# libdbi version requirement for sqlite taken from bug #455134
146 -#
147 -# dev-libs/boost must always be built with nls enabled.
148 -RDEPEND="
149 - >=dev-libs/glib-2.40.0:2
150 - >=dev-libs/libxml2-2.7.0:2
151 - >=dev-scheme/guile-2.0.0:12=[regex]
152 - >=sys-libs/zlib-1.1.4
153 - >=x11-libs/gtk+-3.14.0:3
154 - dev-libs/boost:=[icu,nls]
155 - dev-libs/icu:=
156 - dev-libs/libxslt
157 - gnome-base/dconf
158 - net-libs/webkit-gtk:4=
159 - aqbanking? (
160 - >=net-libs/aqbanking-5[gtk,ofx?]
161 - sys-libs/gwenhywfar[gtk]
162 - chipcard? ( sys-libs/libchipcard )
163 - )
164 - gnome-keyring? ( >=app-crypt/libsecret-0.18 )
165 - mysql? (
166 - dev-db/libdbi
167 - dev-db/libdbi-drivers[mysql]
168 - )
169 - ofx? ( >=dev-libs/libofx-0.9.1 )
170 - postgres? (
171 - dev-db/libdbi
172 - dev-db/libdbi-drivers[postgres]
173 - )
174 - python? ( ${PYTHON_DEPS} )
175 - quotes? (
176 - >=dev-perl/Finance-Quote-1.11
177 - dev-perl/Date-Manip
178 - dev-perl/HTML-TableExtract
179 - )
180 - sqlite? (
181 - >=dev-db/libdbi-0.9.0
182 - >=dev-db/libdbi-drivers-0.9.0[sqlite]
183 - )
184 -"
185 -
186 -DEPEND="${RDEPEND}
187 - ~dev-cpp/gtest-${GV}
188 - dev-lang/perl
189 - dev-perl/XML-Parser
190 - dev-util/intltool
191 - gnome-base/gnome-common
192 - sys-devel/libtool
193 - virtual/pkgconfig
194 -"
195 -
196 -# Uncomment for 3.0
197 -# PDEPEND="doc? (
198 -# ~app-doc/gnucash-docs-${PV}
199 -# gnome-extra/yelp
200 -# )"
201 -
202 -PATCHES=(
203 - "${FILESDIR}"/${P}-double_free.patch
204 - "${FILESDIR}"/${P}-fix-tests-for-32bit-platforms.patch
205 -)
206 -
207 -pkg_setup() {
208 - use python && python-single-r1_pkg_setup
209 - xdg_environment_reset
210 -}
211 -
212 -src_configure() {
213 - local sql_on_off="OFF"
214 - if use mysql || use postgres || use sqlite ; then
215 - sql_on_off="ON"
216 - fi
217 -
218 - local mycmakeargs=(
219 - -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
220 - -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
221 -
222 - -DDISABLE_NLS=$(usex !nls)
223 - -DENABLE_REGISTER2=$(usex register2)
224 - -DWITH_AQBANKING=$(usex aqbanking)
225 - -DWITH_OFX=$(usex ofx)
226 - -DWITH_PYTHON=$(usex python)
227 - -DWITH_SQL=${sql_on_off}
228 - )
229 -
230 - cmake-utils_src_configure
231 -}
232 -
233 -src_test() {
234 - if use python ; then
235 - cp common/test-core/unittest_support.py \
236 - "${BUILD_DIR}"/common/test-core/ || die
237 - fi
238 -
239 - cd "${BUILD_DIR}" || die
240 - XDG_DATA_HOME="${T}/$(whoami)" emake check
241 -}
242 -
243 -src_install() {
244 - cmake-utils_src_install
245 -
246 - rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
247 - rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
248 -
249 - if use examples ; then
250 - mv "${ED%/}"/usr/share/doc/gnucash \
251 - "${ED%/}"/usr/share/doc/${PF}/examples || die
252 - pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
253 - rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
254 - *win32-bin.txt || die
255 - popd > /dev/null || die
256 - docompress -x /usr/share/doc/${PF}/examples/
257 - else
258 - rm -r "${ED%/}"/usr/share/doc/gnucash || die
259 - fi
260 -
261 - use aqbanking && dodoc doc/README.HBCI
262 - use ofx && dodoc doc/README.OFX
263 -}
264 -
265 -pkg_postinst() {
266 - gnome2_icon_cache_update
267 - gnome2_schemas_update
268 - xdg_desktop_database_update
269 - xdg_mimeinfo_database_update
270 -
271 - ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
272 - ewarn
273 - ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
274 - ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
275 -}
276 -
277 -pkg_postrm() {
278 - gnome2_icon_cache_update
279 - gnome2_schemas_update
280 - xdg_desktop_database_update
281 - xdg_mimeinfo_database_update
282 -}
283
284 diff --git a/app-office/gnucash/gnucash-3.2.ebuild b/app-office/gnucash/gnucash-3.2.ebuild
285 deleted file mode 100644
286 index 7d93329d001..00000000000
287 --- a/app-office/gnucash/gnucash-3.2.ebuild
288 +++ /dev/null
289 @@ -1,160 +0,0 @@
290 -# Copyright 1999-2018 Gentoo Foundation
291 -# Distributed under the terms of the GNU General Public License v2
292 -
293 -EAPI=6
294 -
295 -# google{test,mock} version
296 -GV="1.8.0"
297 -PYTHON_COMPAT=( python3_{4,5,6} )
298 -
299 -inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
300 -
301 -DESCRIPTION="A personal finance manager"
302 -HOMEPAGE="http://www.gnucash.org/"
303 -SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
304 - https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
305 -
306 -SLOT="0"
307 -LICENSE="GPL-2"
308 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
309 -
310 -IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
311 - python quotes -register2 sqlite"
312 -REQUIRED_USE="
313 - chipcard? ( aqbanking )
314 - python? ( ${PYTHON_REQUIRED_USE} )"
315 -
316 -# libdbi version requirement for sqlite taken from bug #455134
317 -#
318 -# dev-libs/boost must always be built with nls enabled.
319 -RDEPEND="
320 - >=dev-libs/glib-2.40.0:2
321 - >=dev-libs/libxml2-2.7.0:2
322 - >=dev-scheme/guile-2.0.0:12=[regex]
323 - >=sys-libs/zlib-1.1.4
324 - >=x11-libs/gtk+-3.14.0:3
325 - dev-libs/boost:=[icu,nls]
326 - dev-libs/icu:=
327 - dev-libs/libxslt
328 - gnome-base/dconf
329 - net-libs/webkit-gtk:4=
330 - aqbanking? (
331 - >=net-libs/aqbanking-5[gtk,ofx?]
332 - sys-libs/gwenhywfar[gtk]
333 - chipcard? ( sys-libs/libchipcard )
334 - )
335 - gnome-keyring? ( >=app-crypt/libsecret-0.18 )
336 - mysql? (
337 - dev-db/libdbi
338 - dev-db/libdbi-drivers[mysql]
339 - )
340 - ofx? ( >=dev-libs/libofx-0.9.1 )
341 - postgres? (
342 - dev-db/libdbi
343 - dev-db/libdbi-drivers[postgres]
344 - )
345 - python? ( ${PYTHON_DEPS} )
346 - quotes? (
347 - >=dev-perl/Finance-Quote-1.11
348 - dev-perl/Date-Manip
349 - dev-perl/HTML-TableExtract
350 - )
351 - sqlite? (
352 - >=dev-db/libdbi-0.9.0
353 - >=dev-db/libdbi-drivers-0.9.0[sqlite]
354 - )
355 -"
356 -
357 -DEPEND="${RDEPEND}
358 - ~dev-cpp/gtest-${GV}
359 - >=sys-devel/gettext-0.19.6
360 - dev-lang/perl
361 - dev-perl/XML-Parser
362 - gnome-base/gnome-common
363 - sys-devel/libtool
364 - virtual/pkgconfig
365 -"
366 -
367 -PDEPEND="doc? (
368 - ~app-doc/gnucash-docs-${PV}
369 - gnome-extra/yelp
370 -)"
371 -
372 -#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
373 -
374 -pkg_setup() {
375 - use python && python-single-r1_pkg_setup
376 - xdg_environment_reset
377 -}
378 -
379 -src_configure() {
380 - local sql_on_off="OFF"
381 - if use mysql || use postgres || use sqlite ; then
382 - sql_on_off="ON"
383 - fi
384 -
385 - local mycmakeargs=(
386 - -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
387 - -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
388 -
389 - -DDISABLE_NLS=$(usex !nls)
390 - -DENABLE_REGISTER2=$(usex register2)
391 - -DWITH_AQBANKING=$(usex aqbanking)
392 - -DWITH_OFX=$(usex ofx)
393 - -DWITH_PYTHON=$(usex python)
394 - -DWITH_SQL=${sql_on_off}
395 - )
396 -
397 - cmake-utils_src_configure
398 -}
399 -
400 -src_test() {
401 - if use python ; then
402 - cp common/test-core/unittest_support.py \
403 - "${BUILD_DIR}"/common/test-core/ || die
404 - fi
405 -
406 - cd "${BUILD_DIR}" || die
407 - XDG_DATA_HOME="${T}/$(whoami)" emake check
408 -}
409 -
410 -src_install() {
411 - cmake-utils_src_install
412 -
413 - rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
414 - rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
415 -
416 - if use examples ; then
417 - mv "${ED%/}"/usr/share/doc/gnucash \
418 - "${ED%/}"/usr/share/doc/${PF}/examples || die
419 - pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
420 - rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
421 - *win32-bin.txt || die
422 - popd > /dev/null || die
423 - docompress -x /usr/share/doc/${PF}/examples/
424 - else
425 - rm -r "${ED%/}"/usr/share/doc/gnucash || die
426 - fi
427 -
428 - use aqbanking && dodoc doc/README.HBCI
429 - use ofx && dodoc doc/README.OFX
430 -}
431 -
432 -pkg_postinst() {
433 - gnome2_icon_cache_update
434 - gnome2_schemas_update
435 - xdg_desktop_database_update
436 - xdg_mimeinfo_database_update
437 -
438 - ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
439 - ewarn
440 - ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
441 - ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
442 -}
443 -
444 -pkg_postrm() {
445 - gnome2_icon_cache_update
446 - gnome2_schemas_update
447 - xdg_desktop_database_update
448 - xdg_mimeinfo_database_update
449 -}