Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/
Date: Sat, 02 Jul 2016 10:43:56
Message-Id: 1467456163.29f814d41ac74fecc625718185a27f89b60f7fce.pacho@gentoo
1 commit: 29f814d41ac74fecc625718185a27f89b60f7fce
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 2 09:56:16 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 2 10:42:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f814d4
7
8 app-office/gnucash: Drop old
9
10 Package-Manager: portage-2.3.0_rc1
11
12 app-office/gnucash/Manifest | 1 -
13 .../files/gnucash-2.6.9-automagic-guile.patch | 88 ----------------
14 app-office/gnucash/gnucash-2.6.11.ebuild | 114 ---------------------
15 3 files changed, 203 deletions(-)
16
17 diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
18 index 4c13ee7..122d901 100644
19 --- a/app-office/gnucash/Manifest
20 +++ b/app-office/gnucash/Manifest
21 @@ -1,2 +1 @@
22 -DIST gnucash-2.6.11.tar.bz2 13626927 SHA256 516d97afa61971ca0a16f56319f3f7129db2da1a9d2c77ab7d8b4e6e9e018ac6 SHA512 f3708018f85d17377e11ce55452be7cedd6041da12f66e00047e3cdafb0190da850eb4cbb5699f01cbd79c540af7ef75b44b93c2d5929e13c2a47484741e6a7e WHIRLPOOL 3a5d78835a89718ee539a4c8a62e963172f2e41b8ce1c01ead2425f24529edc8ebc76f41f84596bf8f1438c81e687cc13ed2a4cbd72e87ca35725d88fcdf7d7f
23 DIST gnucash-2.6.12.tar.bz2 13549926 SHA256 371fe9af3ec4b5d6839722b07c9064a51cfe247511edaa6286fc82710f700475 SHA512 3abf6f27413e087b2d4242772cdae87c9f13c1c952ccc0b79cb262baa0c076ee4fe227458346ece3967d1e1158aa38db3ec5dfb20db27050e4580e7762854993 WHIRLPOOL fd6a0c66e394e1e80fe95630dae930c86d05e18aa89b298d862089802438080ac1997d9edb1d159868efd664f839158edc4eeb99e6484cbb142ca97b6ac94a9d
24
25 diff --git a/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch b/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
26 deleted file mode 100644
27 index a871233..0000000
28 --- a/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
29 +++ /dev/null
30 @@ -1,88 +0,0 @@
31 -From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
32 -From: Gilles Dartiguelongue <eva@g.o>
33 -Date: Wed, 11 Nov 2015 13:35:46 +0100
34 -Subject: [PATCH] Make guile support selectable
35 -
36 ----
37 - configure.ac | 55 +++++++++++++++++++++++++++++++++++++------------------
38 - 1 file changed, 37 insertions(+), 18 deletions(-)
39 -
40 -diff --git a/configure.ac b/configure.ac
41 -index 48ab828..ce7ba74 100644
42 ---- a/configure.ac
43 -+++ b/configure.ac
44 -@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
45 - ### --------------------------------------------------------------------------
46 - ### Guile version checks
47 -
48 -+GUILE_EFFECTIVE_VERSION=0
49 - # - check minimum version
50 - # - determine GUILE_CFLAGS and GUILE_LIBS
51 --gnc_have_guile_2=no
52 --gnc_have_guile_www=no
53 --PKG_CHECK_MODULES(GUILE,
54 -- [guile-2.0 >= 2.0.0],
55 -- [gnc_have_guile_2=yes
56 -- GUILE_EFFECTIVE_VERSION=2.0
57 -- AC_PATH_PROG([GUILD], guild)],
58 -- [PKG_CHECK_MODULES(GUILE,
59 -- [guile-1.8 >= 1.8.5],
60 -- [GUILE_EFFECTIVE_VERSION=1.8],
61 -- [AC_MSG_ERROR([
62 -- guile does not appear to be installed correctly, or is not in the
63 -- correct version range. Perhaps you have not installed the guile
64 -- development packages? Gnucash requires at least version 1.8.5 to build.
65 -- ])])
66 --])
67 -
68 --AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
69 -+AC_ARG_WITH([guile],
70 -+ AS_HELP_STRING([--with-guile=1.8|2.0|auto],
71 -+ [which guile version to compile against @<:@default: auto@:>@]),
72 -+ [],
73 -+ [with_guile=auto]
74 -+)
75 -+
76 -+AS_IF([test "$with_guile" = "2.0"],
77 -+ [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
78 -+ [GUILE_EFFECTIVE_VERSION=2.0
79 -+ AC_PATH_PROG([GUILD], guild)])],
80 -+ [test "$with_guile" = "1.8"],
81 -+ [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
82 -+ [GUILE_EFFECTIVE_VERSION=1.8])],
83 -+ [test "$with_guile" = "auto"],
84 -+ [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
85 -+ [GUILE_EFFECTIVE_VERSION=2.0
86 -+ AC_PATH_PROG([GUILD], guild)],
87 -+ [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
88 -+ [GUILE_EFFECTIVE_VERSION=1.8],
89 -+ [GUILE_EFFECTIVE_VERSION=0])
90 -+ ])],
91 -+ # else
92 -+ [AC_MSG_ERROR([invalid guile version specified])]
93 -+)
94 -+
95 -+AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
96 -+ [AC_MSG_ERROR([
97 -+ guile does not appear to be installed correctly, or is not in the
98 -+ correct version range. Perhaps you have not installed the guile
99 -+ development packages? Gnucash requires at least version 1.8.5 to build.
100 -+ ])]
101 -+)
102 -+
103 -+AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
104 - AC_SUBST(GUILE_EFFECTIVE_VERSION)
105 - AC_SUBST(GUILE, [`pwd`/gnc-guile])
106 -
107 -@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
108 - then
109 - AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
110 -
111 -- if test "${gnc_have_guile_2}" = yes
112 -+ if test "${GUILE_EFFECTIVE_VERSION}" = "2.0"
113 - then
114 - if test "${gnc_have_swig_2_0_10}" = no
115 - then
116 ---
117 -2.6.3
118 -
119
120 diff --git a/app-office/gnucash/gnucash-2.6.11.ebuild b/app-office/gnucash/gnucash-2.6.11.ebuild
121 deleted file mode 100644
122 index 08fbbe2..0000000
123 --- a/app-office/gnucash/gnucash-2.6.11.ebuild
124 +++ /dev/null
125 @@ -1,114 +0,0 @@
126 -# Copyright 1999-2016 Gentoo Foundation
127 -# Distributed under the terms of the GNU General Public License v2
128 -# $Id$
129 -
130 -EAPI="5"
131 -GCONF_DEBUG="no"
132 -GNOME2_LA_PUNT="yes"
133 -PYTHON_COMPAT=( python2_7 )
134 -
135 -inherit autotools eutils gnome2 python-single-r1
136 -
137 -DESCRIPTION="A personal finance manager"
138 -HOMEPAGE="http://www.gnucash.org/"
139 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
140 -
141 -SLOT="0"
142 -LICENSE="GPL-2"
143 -KEYWORDS="amd64 ~ppc ~ppc64 x86"
144 -IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
145 -
146 -# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
147 -# libdbi version requirement for sqlite taken from bug #455134
148 -RDEPEND="
149 - >=dev-libs/glib-2.32.0:2
150 - >=dev-libs/popt-1.5
151 - >=dev-libs/libxml2-2.5.10:2
152 - dev-libs/libxslt
153 - >=dev-scheme/guile-1.8.3:12[deprecated,regex]
154 - dev-scheme/guile-www
155 - gnome-base/libgnomecanvas
156 - >=net-libs/webkit-gtk-1.2:2
157 - >=sys-libs/zlib-1.1.4
158 - >=x11-libs/gtk+-2.24:2
159 - >=x11-libs/goffice-0.7.0:0.8[gnome]
160 - x11-libs/pango
161 - gnome-keyring? ( >=app-crypt/libsecret-0.18 )
162 - ofx? ( >=dev-libs/libofx-0.9.1 )
163 - hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
164 - sys-libs/gwenhywfar[gtk]
165 - chipcard? ( sys-libs/libchipcard )
166 - )
167 - python? ( ${PYTHON_DEPS} )
168 - quotes? ( dev-perl/Date-Manip
169 - >=dev-perl/Finance-Quote-1.11
170 - dev-perl/HTML-TableExtract )
171 - sqlite? ( >=dev-db/libdbi-0.9.0
172 - >=dev-db/libdbi-drivers-0.9.0[sqlite] )
173 - postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
174 - mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
175 -"
176 -DEPEND="${RDEPEND}
177 - dev-util/intltool
178 - gnome-base/gnome-common
179 - sys-devel/libtool
180 - virtual/pkgconfig
181 -"
182 -PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
183 -
184 -pkg_setup() {
185 - use python && python-single-r1_pkg_setup
186 -}
187 -
188 -src_prepare() {
189 - # Skip test that needs some locales to be present
190 - sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
191 -
192 - # Fix automagic on guile detection
193 - # https://bugzilla.gnome.org/show_bug.cgi?id=760015
194 - epatch "${FILESDIR}"/${PN}-2.6.9-automagic-guile.patch
195 -
196 - eautoreconf
197 - gnome2_src_prepare
198 -}
199 -
200 -src_configure() {
201 - local myconf
202 -
203 - DOCS="doc/README.OFX doc/README.HBCI"
204 -
205 - if use sqlite || use mysql || use postgres ; then
206 - myconf+=" --enable-dbi"
207 - else
208 - myconf+=" --disable-dbi"
209 - fi
210 -
211 - # gtkmm is experimental and shouldn't be enabled, upstream bug #684166
212 - gnome2_src_configure \
213 - $(use_enable debug) \
214 - $(use_enable gnome-keyring password-storage) \
215 - $(use_enable ofx) \
216 - $(use_enable hbci aqbanking) \
217 - $(use_enable python) \
218 - --with-guile=1.8 \
219 - --disable-doxygen \
220 - --disable-gtkmm \
221 - --enable-locale-specific-tax \
222 - --disable-error-on-warning \
223 - ${myconf}
224 -}
225 -
226 -src_test() {
227 - GUILE_WARN_DEPRECATED=no \
228 - GNC_DOT_DIR="${T}"/.gnucash \
229 - emake check
230 -}
231 -
232 -src_install() {
233 - # Parallel installation fails from time to time, bug #359123
234 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
235 -
236 - rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
237 - mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
238 - dodoc "${T}"/cantuseprepalldocs/*
239 -}