[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2023-12-14 Thread Sam James 
commit: d1e624948a832c4c6518a90ed33d9b5ba4be44f1
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Dec 14 07:40:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 14 07:55:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e62494

app-office/gnucash: fix python finding

* Also require dev-python/setuptools with python3.12 due to distutils
  getting removed.

Closes: https://bugs.gentoo.org/919859
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34282
Signed-off-by: Sam James  gentoo.org>

 .../files/gnucash-5.4-fix-python-finding.patch | 49 ++
 .../{gnucash-5.4.ebuild => gnucash-5.4-r1.ebuild}  |  9 
 2 files changed, 58 insertions(+)

diff --git a/app-office/gnucash/files/gnucash-5.4-fix-python-finding.patch 
b/app-office/gnucash/files/gnucash-5.4-fix-python-finding.patch
new file mode 100644
index ..26de7a7ad154
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-5.4-fix-python-finding.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/919859
+https://github.com/Gnucash/gnucash/commit/3782eed56785adaca02cf2bd4766d3825a6f6ca7
+
+From 3782eed56785adaca02cf2bd4766d3825a6f6ca7 Mon Sep 17 00:00:00 2001
+From: Simon Arlott 
+Date: Wed, 4 Oct 2023 21:15:11 +0100
+Subject: [PATCH] Use the default version of Python 3
+
+Python scripts that run with the default version of Python 3 by executing
+with /usr/bin/python3 that try to import gnucash can't find it if it has
+been built for a different version.
+
+Instead of using other installed versions of Python 3 that happen to be
+present, default to using the default "unversioned" version.
+
+It doesn't look like CMake are going to fix the default behaviour, so every
+project has to do this:
+https://gitlab.kitware.com/cmake/cmake/-/issues/24878
+https://gitlab.kitware.com/cmake/cmake/-/issues/24126
+https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8287
+
+This is only supported on CMake 3.20 or newer, so users of older versions
+will still get the broken behaviour.
+
+Use the newer default Python3_FIND_STRATEGY=LOCATION (CMP0094).
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -2,6 +2,11 @@
+ 
+ cmake_minimum_required (VERSION 3.14.5)
+ 
++# CMake 3.15+ Python3_FIND_STRATEGY=LOCATION
++if (POLICY CMP0094)
++  cmake_policy(SET CMP0094 NEW)
++endif()
++
+ project (gnucash
+ VERSION 5.4
+ )
+@@ -492,6 +497,9 @@ endif()
+ 
+ if (WITH_PYTHON)
+   set (PYTHON_MIN_VERSION 3.6.0)
++  if (NOT DEFINED Python3_FIND_UNVERSIONED_NAMES)
++set (Python3_FIND_UNVERSIONED_NAMES FIRST)
++  endif()
+   find_package (Python3 ${PYTHON_MIN_VERSION} COMPONENTS Interpreter 
Development)
+   if (NOT Python3_FOUND)
+ message(SEND_ERROR "Python support enabled, but Python3 interpreter 
and/or libaries not found.")

diff --git a/app-office/gnucash/gnucash-5.4.ebuild 
b/app-office/gnucash/gnucash-5.4-r1.ebuild
similarity index 95%
rename from app-office/gnucash/gnucash-5.4.ebuild
rename to app-office/gnucash/gnucash-5.4-r1.ebuild
index af69f8b7f715..f3e77efe5302 100644
--- a/app-office/gnucash/gnucash-5.4.ebuild
+++ b/app-office/gnucash/gnucash-5.4-r1.ebuild
@@ -90,10 +90,16 @@ DEPEND="
sys-devel/libtool
>=dev-cpp/gtest-1.8.0
 "
+# distutils is not available in python3.12, but it is still in setuptools
 BDEPEND="
dev-lang/swig
>=dev-util/cmake-3.10
virtual/pkgconfig
+   python? (
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ')
+   )
 "
 
 PDEPEND="
@@ -111,6 +117,9 @@ PATCHES=(
# This is only to prevent webkit2gtk-4 from being selected.
# https://bugs.gentoo.org/893676
"${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch"
+
+   # bug #919859
+   "${FILESDIR}/${PN}-5.4-fix-python-finding.patch"
 )
 
 # guile generates ELF files without use of C or machine code

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2023-09-23 Thread Aaron W. Swenson 
commit: 6c5bb6f8f954e3164ffdb615ed6cf6d7975defea
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Sep 23 21:08:12 2023 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sat Sep 23 21:08:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5bb6f8

app-office/gnucash: add 5.3

Signed-off-by: Aaron W. Swenson  gentoo.org>

 app-office/gnucash/Manifest|   1 +
 .../gnucash/files/gnucash-5.3-no-werror.patch  |  29 +++
 app-office/gnucash/gnucash-5.3.ebuild  | 223 +
 app-office/gnucash/metadata.xml|   2 +-
 4 files changed, 254 insertions(+), 1 deletion(-)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index c677c031322f..68256c619a2f 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1,3 @@
 DIST gnucash-4.13.tar.bz2 14658572 BLAKE2B 
027151a800194b854ad8bbe5175b24c99e924331f2b0a35745870542c2ade1e7347d2cbc3e400f621c6b5c1bb708633609a1891e729f8923d0c717537f884ca9
 SHA512 
7f1f5a6c6e537aca7e88c806461c58e90256954842026d801dba48586fa5817519220f532b9e460bc34751c94e6be4a80aac06325b7bada716616a735e2de3d3
 DIST gnucash-5.1.tar.bz2 14794000 BLAKE2B 
dd9465277e9df82cc4029b95b2c8488fcb382a38e850ac7a3644bcdf5f423fafe522fcf22b996abed035465e54c1326859cd7c434df0569dffa11a8c911f1267
 SHA512 
c7e336d4d54407ea14bd8c10bbb7cedf9d1fdb13e2bda214169d1755b8103e4c37550b9c75244b91cf151ee30299664e8655d3c6fc4119241b7a97abcfd2e8e6
+DIST gnucash-5.3.tar.bz2 14928584 BLAKE2B 
9778efa9b77f16f784eaffe1f4338a20cc42e4e767e3dcb3b29e8dc011e538912d59c21e23d3d63e031a1b558c9faaa8bc5853141ae4d2764de4c9ae949668ff
 SHA512 
f811ed66144f8689255970c6d925047eeb8d47dbefc862f42ab54ff3342e4710d822288a2d34ed1e7e873c7a7c5db0f95bdaa233787cd6828ff448af0eea325e

diff --git a/app-office/gnucash/files/gnucash-5.3-no-werror.patch 
b/app-office/gnucash/files/gnucash-5.3-no-werror.patch
new file mode 100644
index ..896a41f1284d
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-5.3-no-werror.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -603,12 +603,12 @@
+ set(CMAKE_C_EXTENSIONS ON)
+ 
+ if (UNIX)
+-  set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes 
-Wmissing-declarations ${CMAKE_C_FLAGS}")
+-  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations 
${CMAKE_CXX_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wall -Wmissing-prototypes -Wmissing-declarations 
${CMAKE_C_FLAGS}")
++  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations ${CMAKE_CXX_FLAGS}")
+   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 
${CMAKE_C_FLAGS}")
+ endif()
+ if (MINGW)
+-  set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes 
-Wmissing-declarations ${CMAKE_C_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wall -Wmissing-prototypes -Wmissing-declarations 
${CMAKE_C_FLAGS}")
+   set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 
${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see 
https://github.com/google/googletest/issues/893 and 
https://github.com/google/googletest/issues/920
+ endif()
+ 
+--- a/common/cmake_modules/GncAddSwigCommand.cmake
 b/common/cmake_modules/GncAddSwigCommand.cmake
+@@ -70,7 +70,7 @@
+ 
+ set (DEFAULT_SWIG_PYTHON_FLAGS
+ -python -py3
+--Wall -Werror
++-Wall
+ ${SWIG_ARGS}
+ )
+ set (DEFAULT_SWIG_PYTHON_C_INCLUDES

diff --git a/app-office/gnucash/gnucash-5.3.ebuild 
b/app-office/gnucash/gnucash-5.3.ebuild
new file mode 100644
index ..cb0d6819a793
--- /dev/null
+++ b/app-office/gnucash/gnucash-5.3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-doc/gnucash-docs
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit cmake gnome2-utils python-single-r1
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="https://www.gnucash.org/;
+SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres 
python quotes smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+   examples? ( gui )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   smartcard? ( aqbanking )
+"
+
+# dev-libs/boost must always be built with nls enabled.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+# dependency, we just rely on that.
+RDEPEND="
+   >=dev-libs/glib-2.56.1:2
+   >=dev-scheme/guile-2.2.0:=[regex]
+   >=sys-libs/zlib-1.1.4
+   dev-libs/boost:=[icu,nls]
+   dev-libs/icu:=
+   dev-libs/libxml2:2
+   dev-libs/libxslt
+   aqbanking? (
+   >=net-libs/aqbanking-6[ofx?]
+   >=sys-libs/gwenhywfar-5.6.0:=
+   smartcard? ( sys-libs/libchipcard )
+

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2023-03-17 Thread Sam James 
commit: bb04b47145e309e8f7950900cd0c378d4ba66771
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 16:02:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 16:03:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb04b471

app-office/gnucash: drop -Werror

Closes: https://bugs.gentoo.org/901485
Signed-off-by: Sam James  gentoo.org>

 .../gnucash/files/gnucash-4.13-no-werror.patch   | 20 
 app-office/gnucash/gnucash-4.13.ebuild   |  1 +
 2 files changed, 21 insertions(+)

diff --git a/app-office/gnucash/files/gnucash-4.13-no-werror.patch 
b/app-office/gnucash/files/gnucash-4.13-no-werror.patch
new file mode 100644
index ..5b45898eacc1
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.13-no-werror.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -578,14 +578,14 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
+ set(CMAKE_C_EXTENSIONS ON)
+ 
+ if (UNIX)
+-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign 
-Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall 
-Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
+   set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations 
-Wno-error=parentheses ${CMAKE_C_FLAGS}")
+-  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused 
-Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
++  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused 
-Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
+   set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations 
${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}")
+   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 
${CMAKE_C_FLAGS}")
+ endif()
+ if (MINGW)
+-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign 
-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused 
-Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall 
-Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused 
-Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
+   set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 
${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see 
https://github.com/google/googletest/issues/893 and 
https://github.com/google/googletest/issues/920
+ endif()
+ 

diff --git a/app-office/gnucash/gnucash-4.13.ebuild 
b/app-office/gnucash/gnucash-4.13.ebuild
index f1335eb5330f..42de933a3330 100644
--- a/app-office/gnucash/gnucash-4.13.ebuild
+++ b/app-office/gnucash/gnucash-4.13.ebuild
@@ -101,6 +101,7 @@ PDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-3.8-exclude-license.patch"
"${FILESDIR}/${PN}-4.12-drop-broken-test.patch"
+   "${FILESDIR}/${PN}-4.13-no-werror.patch"
 
# This is only to prevent webkit2gtk-4 from being selected.
# https://bugs.gentoo.org/893676

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2023-03-16 Thread Aaron W. Swenson 
commit: 6715bfa117329c514519522bce6804eddfb2cef6
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Mar 16 12:43:48 2023 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Thu Mar 16 12:44:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6715bfa1

app-office/gnucash: add 4.13

Drops detecting 4.0 and only looks for 4.1 to satisfy webkit-gtk requirement.

Bug: https://bugs.gentoo.org/893676

Signed-off-by: Aaron W. Swenson  gentoo.org>

 app-office/gnucash/Manifest|   1 +
 .../files/gnucash-4.13-webkit2gtk-4.1.patch|  16 ++
 app-office/gnucash/gnucash-4.13.ebuild | 221 +
 3 files changed, 238 insertions(+)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 7cd1d60f1a24..f9528018322d 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1 +1,2 @@
 DIST gnucash-4.12.tar.bz2 14552115 BLAKE2B 
6d5faf2fa1d096315bd6c346e0291109669fd9df4bc0404f4dbc2fc56c8a361aeff57e3535fea862f21ff59391319010b7f28c9bd7df658a1b0c518894862585
 SHA512 
4c930dfc9a10dfd06d3c52874a61e533ddc39deb1c334162dc3a096d998dbdfcac61520ae94dedbc6742b7807e250ff92d26067a70c4ab156e46bed333bbfd37
+DIST gnucash-4.13.tar.bz2 14658572 BLAKE2B 
027151a800194b854ad8bbe5175b24c99e924331f2b0a35745870542c2ade1e7347d2cbc3e400f621c6b5c1bb708633609a1891e729f8923d0c717537f884ca9
 SHA512 
7f1f5a6c6e537aca7e88c806461c58e90256954842026d801dba48586fa5817519220f532b9e460bc34751c94e6be4a80aac06325b7bada716616a735e2de3d3

diff --git a/app-office/gnucash/files/gnucash-4.13-webkit2gtk-4.1.patch 
b/app-office/gnucash/files/gnucash-4.13-webkit2gtk-4.1.patch
new file mode 100644
index ..1e2197737613
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.13-webkit2gtk-4.1.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -211,10 +211,7 @@
+ pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkitgtk-3.0)
+ set(WEBKIT1 1 CACHE INTERNAL "WebKitGtk")
+   else()
+-pkg_check_modules (WEBKIT IMPORTED_TARGET webkit2gtk-4.0>=2.14.0)
+-if (NOT WEBKIT_FOUND)
+-  pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
+-endif()
++pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
+ set(WEBKIT2 1 CACHE INTERNAL "WebKit2Gtk4")
+   endif()
+ 
+
+Diff finished.  Thu Mar  9 08:21:53 2023

diff --git a/app-office/gnucash/gnucash-4.13.ebuild 
b/app-office/gnucash/gnucash-4.13.ebuild
new file mode 100644
index ..f1335eb5330f
--- /dev/null
+++ b/app-office/gnucash/gnucash-4.13.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-doc/gnucash-docs
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="https://www.gnucash.org/;
+SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres 
python quotes register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+   examples? ( gui )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   smartcard? ( aqbanking )
+"
+
+# dev-libs/boost must always be built with nls enabled.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+# dependency, we just rely on that.
+RDEPEND="
+   >=dev-libs/glib-2.56.1:2
+   >=dev-scheme/guile-2.2.0:=[regex]
+   >=sys-libs/zlib-1.1.4
+   dev-libs/boost:=[icu,nls]
+   dev-libs/icu:=
+   dev-libs/libxml2:2
+   dev-libs/libxslt
+   aqbanking? (
+   >=net-libs/aqbanking-6[ofx?]
+   >=sys-libs/gwenhywfar-4.20.0:=
+   smartcard? ( sys-libs/libchipcard )
+   )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gui? (
+   >=x11-libs/gtk+-3.22.30:3
+   gnome-base/dconf
+   net-libs/webkit-gtk:4.1=
+   aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
+   )
+   mysql? (
+   dev-db/libdbi
+   dev-db/libdbi-drivers[mysql]
+   )
+   ofx? ( >=dev-libs/libofx-0.9.12:= )
+   postgres? (
+   dev-db/libdbi
+   dev-db/libdbi-drivers[postgres]
+   )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject[${PYTHON_USEDEP}]
+   ')
+   )
+   quotes? (
+   >=dev-perl/Finance-Quote-1.11
+   dev-perl/Date-Manip
+   dev-perl/HTML-TableExtract
+   )
+   sqlite? (
+   dev-db/libdbi
+   dev-db/libdbi-drivers[sqlite]
+   )
+"
+
+# gtest is a required dep
+# see

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2022-12-06 Thread Sam James 
commit: c418a02ed3285e2c08c109e207ba9d48f005cac8
Author: Marco Scardovi  icloud  com>
AuthorDate: Thu Nov 24 23:10:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  6 11:57:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c418a02e

app-office/gnucash: make tests working

Signed-off-by: Marco Scardovi  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/28349
Signed-off-by: Sam James  gentoo.org>

 .../files/gnucash-4.12-drop-broken-test.patch  | 30 ++
 .../gnucash/files/gnucash-4.12-fix-test.patch  | 24 +
 app-office/gnucash/gnucash-4.12.ebuild | 25 +-
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch 
b/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
new file mode 100644
index ..c2b396bcf04f
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
@@ -0,0 +1,30 @@
+From a52795b022e040d7a93bb4dc352780d832c55390 Mon Sep 17 00:00:00 2001
+From: Marco Scardovi 
+Date: Sat, 26 Nov 2022 22:38:02 +0100
+Subject: [PATCH] Fix test
+
+Signed-off-by: Marco Scardovi 
+---
+ libgnucash/core-utils/test/CMakeLists.txt | 5 +
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/libgnucash/core-utils/test/CMakeLists.txt 
b/libgnucash/core-utils/test/CMakeLists.txt
+index 3b724c7c632..07add8b8699 100644
+--- a/libgnucash/core-utils/test/CMakeLists.txt
 b/libgnucash/core-utils/test/CMakeLists.txt
+@@ -19,9 +19,6 @@ endmacro()
+ add_core_utils_test(test-gnc-glib-utils test-gnc-glib-utils.c)
+ add_core_utils_test(test-resolve-file-path test-resolve-file-path.c)
+ add_core_utils_test(test-userdata-dir test-userdata-dir.c)
+-if (NOT MAC_INTEGRATION AND NOT WIN32)
+-  add_core_utils_test(test-userdata-dir-invalid-home 
test-userdata-dir-invalid-home.c)
+-endif()
+ if (MAC_INTEGRATION)
+   target_compile_options(test-userdata-dir PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
+   target_compile_definitions(test-userdata-dir PRIVATE 
${GTK_MAC_CFLAGS_OTHER})
+@@ -53,4 +50,4 @@ gnc_add_test(test-gnc-path-util 
"${test_gnc_path_util_SOURCES}"
+ 
+ set_dist_list(test_core_utils_DIST CMakeLists.txt
+   test-gnc-glib-utils.c test-resolve-file-path.c test-userdata-dir.c
+-  test-userdata-dir-invalid-home.c gtest-path-utilities.cpp)
++  gtest-path-utilities.cpp)

diff --git a/app-office/gnucash/files/gnucash-4.12-fix-test.patch 
b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
new file mode 100644
index ..e80c712214e6
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
@@ -0,0 +1,24 @@
+From 6fe2028bca49f455b7841d178a712baec8f72919 Mon Sep 17 00:00:00 2001
+From: Marco Scardovi 
+Date: Thu, 24 Nov 2022 23:20:07 +0100
+Subject: [PATCH] Fix test
+
+Signed-off-by: Marco Scardovi 
+---
+ libgnucash/engine/mocks/fake-qofquery.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnucash/engine/mocks/fake-qofquery.cpp 
b/libgnucash/engine/mocks/fake-qofquery.cpp
+index 15341189aa8..a82dadebf02 100644
+--- a/libgnucash/engine/mocks/fake-qofquery.cpp
 b/libgnucash/engine/mocks/fake-qofquery.cpp
+@@ -59,8 +59,8 @@ static class QofFakeQueryPool
+ {
+ ASSERT_TRUE(query_used((QofQuery*)query));
+ auto it = std::find(m_queriesUsed.begin(), m_queriesUsed.end(), 
query);
+-m_queriesUsed.erase(it);
+ m_queriesConsumed.push_back(*it);
++m_queriesUsed.erase(it);
+ }
+ 
+ /* Remove a formerly added QofFakeQueryObject from the pool */

diff --git a/app-office/gnucash/gnucash-4.12.ebuild 
b/app-office/gnucash/gnucash-4.12.ebuild
index 15c424472fbc..d19d9983eb5e 100644
--- a/app-office/gnucash/gnucash-4.12.ebuild
+++ b/app-office/gnucash/gnucash-4.12.ebuild
@@ -78,11 +78,11 @@ RDEPEND="
 
 DEPEND="
${RDEPEND}
-   >=dev-cpp/gtest-1.8.0
>=sys-devel/gettext-0.20
dev-lang/perl
dev-perl/XML-Parser
sys-devel/libtool
+   test? ( >=dev-cpp/gtest-1.8.0 )
 "
 
 BDEPEND="
@@ -106,16 +106,15 @@ PDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}"-3.8-examples-subdir.patch
"${FILESDIR}/${PN}"-3.8-exclude-license.patch
+   "${FILESDIR}/${P}"-drop-broken-test.patch
+   # will be fixed on future version, see
+   # https://github.com/Gnucash/gnucash/pull/1472
+   "${FILESDIR}/${P}"-fix-test.patch
 )
 
-S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
-
-# scardracs: 2022-11-21
-# I don't like that solution but actually these QA warnings
-# are false positives. If You are able to find a better
-# solution feel free to fix it.
-# bugs #734044 #814134
-QA_FLAGS_IGNORED=".*"
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
 
 pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -124,6 +123,9 @@ pkg_setup() {
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2022-12-06 Thread Sam James 
commit: e8193b177eb10c32899f3819af0f5c6d48122453
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  6 12:01:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  6 12:02:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8193b17

app-office/gnucash: style fixes

Signed-off-by: Sam James  gentoo.org>

 .../files/gnucash-4.12-drop-broken-test.patch  |  8 ++-
 .../gnucash/files/gnucash-4.12-fix-test.patch  |  8 ++-
 app-office/gnucash/gnucash-4.12.ebuild | 26 --
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch 
b/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
index c2b396bcf04f..970d423c7b31 100644
--- a/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
+++ b/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
@@ -1,15 +1,11 @@
+https://github.com/Gnucash/gnucash/pull/1472
+
 From a52795b022e040d7a93bb4dc352780d832c55390 Mon Sep 17 00:00:00 2001
 From: Marco Scardovi 
 Date: Sat, 26 Nov 2022 22:38:02 +0100
 Subject: [PATCH] Fix test
 
 Signed-off-by: Marco Scardovi 

- libgnucash/core-utils/test/CMakeLists.txt | 5 +
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/libgnucash/core-utils/test/CMakeLists.txt 
b/libgnucash/core-utils/test/CMakeLists.txt
-index 3b724c7c632..07add8b8699 100644
 --- a/libgnucash/core-utils/test/CMakeLists.txt
 +++ b/libgnucash/core-utils/test/CMakeLists.txt
 @@ -19,9 +19,6 @@ endmacro()

diff --git a/app-office/gnucash/files/gnucash-4.12-fix-test.patch 
b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
index e80c712214e6..03b4bba29c24 100644
--- a/app-office/gnucash/files/gnucash-4.12-fix-test.patch
+++ b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
@@ -1,15 +1,11 @@
+https://github.com/Gnucash/gnucash/pull/1472
+
 From 6fe2028bca49f455b7841d178a712baec8f72919 Mon Sep 17 00:00:00 2001
 From: Marco Scardovi 
 Date: Thu, 24 Nov 2022 23:20:07 +0100
 Subject: [PATCH] Fix test
 
 Signed-off-by: Marco Scardovi 

- libgnucash/engine/mocks/fake-qofquery.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgnucash/engine/mocks/fake-qofquery.cpp 
b/libgnucash/engine/mocks/fake-qofquery.cpp
-index 15341189aa8..a82dadebf02 100644
 --- a/libgnucash/engine/mocks/fake-qofquery.cpp
 +++ b/libgnucash/engine/mocks/fake-qofquery.cpp
 @@ -59,8 +59,8 @@ static class QofFakeQueryPool

diff --git a/app-office/gnucash/gnucash-4.12.ebuild 
b/app-office/gnucash/gnucash-4.12.ebuild
index d19d9983eb5e..702eadfdd4b6 100644
--- a/app-office/gnucash/gnucash-4.12.ebuild
+++ b/app-office/gnucash/gnucash-4.12.ebuild
@@ -75,7 +75,6 @@ RDEPEND="
dev-db/libdbi-drivers[sqlite]
)
 "
-
 DEPEND="
${RDEPEND}
>=sys-devel/gettext-0.20
@@ -84,36 +83,29 @@ DEPEND="
sys-devel/libtool
test? ( >=dev-cpp/gtest-1.8.0 )
 "
-
 BDEPEND="
dev-lang/swig
dev-util/cmake
virtual/pkgconfig
-   || (
-   >=sys-devel/gcc-8:*
-   >=sys-devel/clang-6:*
-   )
 "
-
-# For 4.10, they released gnucash-docs-4.10.1 to fix an issue.
 PDEPEND="
doc? (
-   ~app-doc/gnucash-docs-"${PV}"
+   ~app-doc/gnucash-docs-${PV}
gnome-extra/yelp
)
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}"-3.8-examples-subdir.patch
-   "${FILESDIR}/${PN}"-3.8-exclude-license.patch
-   "${FILESDIR}/${P}"-drop-broken-test.patch
+   "${FILESDIR}"/${PN}-3.8-examples-subdir.patch
+   "${FILESDIR}"/${PN}-3.8-exclude-license.patch
+   "${FILESDIR}"/${P}-drop-broken-test.patch
# will be fixed on future version, see
# https://github.com/Gnucash/gnucash/pull/1472
-   "${FILESDIR}/${P}"-fix-test.patch
+   "${FILESDIR}"/${P}-fix-test.patch
 )
 
 # guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
+# It's a portage false positive, bug #677600
 QA_PREBUILT='*[.]go'
 
 pkg_setup() {
@@ -161,7 +153,7 @@ src_configure() {
-DWITH_AQBANKING=$(usex aqbanking)
-DWITH_OFX=$(usex ofx)
-DWITH_PYTHON=$(usex python)
-   -DWITH_SQL="${sql_on_off}"
+   -DWITH_SQL=${sql_on_off}
-DWITH_GNUCASH=$(usex gui)
)
 
@@ -198,9 +190,9 @@ src_install() {
cmake_src_install
 
if use examples ; then
-   docompress -x /usr/share/doc/"${PF}"/examples
+   docompress -x /usr/share/doc/${PF}/examples
else
-   rm -r "${ED}"/usr/share/doc/"${PF}"/examples
+   rm -r "${ED}"/usr/share/doc/${PF}/examples
fi
 
if use python ; then

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2020-03-28 Thread Aaron W. Swenson 
commit: 7a445dde57a57fd7eecd4ddf7939c541f2bba085
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Mar 28 21:39:40 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sat Mar 28 21:46:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a445dde

app-office/gnucash: Bump to 3.8b

Bump to EAPI 7. Switch to ninja to run tests instead of GNU make.

Install example files into their own directory.

No longer install redundant license file. This also prevents a sandbox
violation.

Because net-libs/aqbanking dropped the gtk USE flag, we've increased the version
requirement, and trigger the gtk USE flag on sys-libs/gwenhywfar directly. Also,
make the >dev-libs/libofx dependent on the subslot as well.

Bug: https://bugs.gentoo.org/714920
Bug: https://bugs.gentoo.org/704632
Bug: https://bugs.gentoo.org/692626

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Aaron W. Swenson  gentoo.org>

 app-office/gnucash/Manifest|   1 +
 .../files/gnucash-3.8-examples-subdir.patch|  10 +
 .../files/gnucash-3.8-exclude-license.patch|  32 
 app-office/gnucash/gnucash-3.8b.ebuild | 206 +
 4 files changed, 249 insertions(+)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index d1c408c2e40..d3dca297cfe 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -4,4 +4,5 @@ DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 
478d8e2e4acbd0725ceaf997a1e62ba3875e9d
 DIST gnucash-3.5.tar.bz2 13766397 BLAKE2B 
b840fa6af719e1d21daabd8e26f7026a12ca9cefe8c0f644a8382b42c34a6dec2dfc67350645437c2f12792518f289f446824a8c99ea83453e69d976c3cd5c9c
 SHA512 
76230d2fe1ba4cc605d0d58976ed3214b10a2549fc7eaa1e327bbf85c861baa082523c70ed088a59bb56deb6af9a7808752fc719eda0df3e9209cec05c9c8d13
 DIST gnucash-3.6.tar.bz2 13811045 BLAKE2B 
aa722755e168b6096a8ad0bb05d3c67be9525d5e9e6fcf076c0b6bdc3188815017c2b1bcb308a6f8a7581315f7d9ab67f85b24486214ebbe7ea5a0428e552ea7
 SHA512 
3d99235a6171e7189dbb15fed11e7f3acb4f49ef8dc6124b26807e74ce4326ac5ae6e23e693a34947604ecb0253ecbcd80f669803a629eb7d236fd3444dbfe82
 DIST gnucash-3.7.tar.bz2 13896595 BLAKE2B 
d0f0cc9d407677c8b09eab5c1613a0eec80bc54984aebd10915f2f2247ea30c26104cea57c87dd6e46ade9225c9df20c583da21de15f79d50509e63186b682fe
 SHA512 
41275b8d6abba54e95c00d746a2d50305fb7a0490b5486af1472a5d50d2de5973d1ec4de98dd10991325062e61498de020496b59d8548b5a4de9db9d23dee159
+DIST gnucash-3.8b.tar.bz2 14285584 BLAKE2B 
304d73b04883b61b8a4e174f458206769483ca0f6d28d284c760397e0bc4061dbdb379ff3cca35e80d6736516549a8733bf36895a11c2202fb9f8f25e591e1d9
 SHA512 
e0529934e9ccafbef2b724f5fca9a0e300c78cf21596f0dcd4b5c11ff300c06a963b68eff1efe00834dc488ced604b86011075bb22480488ddf31d2d4c94ddca
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B 
ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb75e018f0171c2fdaeb4de3bb339548265e50de79e6
 SHA512 
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d

diff --git a/app-office/gnucash/files/gnucash-3.8-examples-subdir.patch 
b/app-office/gnucash/files/gnucash-3.8-examples-subdir.patch
new file mode 100644
index 000..b271be896c0
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.8-examples-subdir.patch
@@ -0,0 +1,10 @@
+--- a/doc/examples/CMakeLists.txt
 b/doc/examples/CMakeLists.txt
+@@ -21,6 +21,6 @@
+   web.qif
+ )
+ 
+-install(FILES ${examples_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
++install(FILES ${examples_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR}/examples)
+ 
+ set_dist_list(examples_DIST ${examples_DATA} CMakeLists.txt )

diff --git a/app-office/gnucash/files/gnucash-3.8-exclude-license.patch 
b/app-office/gnucash/files/gnucash-3.8-exclude-license.patch
new file mode 100644
index 000..553fb2a10f8
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.8-exclude-license.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -660,7 +660,6 @@
+ ChangeLog.2018
+ DOCUMENTERS
+ HACKING
+-LICENSE
+ NEWS
+ README.dependencies
+ )
+@@ -932,21 +931,6 @@
+   )
+ endif()
+ 
+-#Link LICENSE to COPYING so that people expecting to find it,
+-#will. COPYING is normally linked by autogen.sh to the latest
+-#automake-provided version.
+-set (_CMD create_symlink)
+-if (WIN32)
+-  set(_CMD copy)
+-endif()
+-
+-install(CODE
+-" execute_process(
+-  COMMAND ${CMAKE_COMMAND} -E ${_CMD} LICENSE COPYING
+-  WORKING_DIRECTORY ${CMAKE_INSTALL_DOCDIR}
+-  )"
+-)
+-
+ #For windows, copy in some DLLs from Mingw
+ 
+ if (WIN32)

diff --git a/app-office/gnucash/gnucash-3.8b.ebuild 
b/app-office/gnucash/gnucash-3.8b.ebuild
new file mode 100644
index 000..2742a73f8ca
--- /dev/null
+++ b/app-office/gnucash/gnucash-3.8b.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2019-01-09 Thread Aaron W. Swenson 
commit: 935fed447ee5a63e63e6a82ab5889be407de30b4
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Wed Jan  9 13:05:16 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Wed Jan  9 13:06:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935fed44

app-office/gnucash: Bump to 3.4

Manually insert test-stress-options.scm as it is missing from the
source tarball, which causes the test-stress-options unit test to fail.

Add patch to fix test-transaction unit test failure.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 app-office/gnucash/Manifest|   1 +
 .../files/gnucash-3.4-test-stress-options.scm  | 315 +
 .../files/gnucash-3.4-test-transaction.patch   |  25 ++
 app-office/gnucash/gnucash-3.4.ebuild  | 178 
 4 files changed, 519 insertions(+)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index c2508be7720..6bd42515824 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,3 +1,4 @@
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B 
ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434
 SHA512 
ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B 
a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b
 SHA512 
4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
+DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 
478d8e2e4acbd0725ceaf997a1e62ba3875e9d4a003e8a3e69111a9d29118447fb2da8ef3e5dd5274d83a3adef1ee9f4a153cdfd17cabe69864b53bab8c7e813
 SHA512 
4cebef0ba70e59a82d3b2b7b0b138ddb22e8866dc761e156ff1f15920145d12923719effef21ad4c65ccd62fbd14a1529cf0bfcaab70c5b33d103761d08062e0
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B 
ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb75e018f0171c2fdaeb4de3bb339548265e50de79e6
 SHA512 
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d

diff --git a/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm 
b/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm
new file mode 100644
index 000..e85cd61a8ef
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm
@@ -0,0 +1,315 @@
+(use-modules (ice-9 textual-ports))
+(use-modules (ice-9 popen))
+(use-modules (gnucash utilities))
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash engine test test-extras))
+(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report business-reports))
+(use-modules (gnucash report view-column))
+(use-modules (gnucash report stylesheets))
+(use-modules (gnucash report taxinvoice))
+(use-modules (gnucash report report-system))
+(use-modules (gnucash report report-system test test-extras))
+(use-modules (srfi srfi-64))
+(use-modules (srfi srfi-98))
+(use-modules (gnucash engine test srfi64-extras))
+(use-modules (sxml simple))
+(use-modules (sxml xpath))
+
+;; NOTE
+;; 
+;; SIMPLE stress tests by default
+;;
+;; PAIRWISE COMBINATORICS are enabled by setting environment variable 
COMBINATORICS
+;; to the fullpath for the compiled jenny from 
http://burtleburtle.net/bob/math/jenny.html
+;;
+;; e.g. COMBINATORICS=/home/user/jenny/jenny ninja check
+
+(define optionslist '())
+
+(define (generate-optionslist)
+  (gnc:report-templates-for-each
+   (lambda (report-id template)
+ (let* ((options-generator (gnc:report-template-options-generator 
template))
+(name (gnc:report-template-name template))
+(options (options-generator)))
+   (set! optionslist
+ (cons (list (cons 'report-id report-id)
+ (cons 'report-name (gnc:report-template-name template))
+ (cons 'options (let ((report-options-tested '()))
+  (gnc:options-for-each
+   (lambda (option)
+ (when (memq (gnc:option-type option)
+ '(multichoice boolean))
+   (set! report-options-tested
+ (cons (vector
+(gnc:option-section option)
+(gnc:option-name option)
+(gnc:option-type option)
+(case (gnc:option-type 
option)
+

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2018-02-23 Thread Aaron Swenson 
commit: 0924e0af0e078bcca0a38df4b628acd7eb0a0b7e
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Fri Feb 23 11:25:56 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Fri Feb 23 11:25:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0924e0af

app-office/gnucash: Small cleanup

Closes: https://bugs.gentoo.org/643566
Closes: https://bugs.gentoo.org/627010
Closes: https://bugs.gentoo.org/639786
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/gnucash/Manifest|   2 -
 .../gnucash/files/gnucash-2.7.3-no-gtest-src.patch |  15 --
 app-office/gnucash/gnucash-2.6.15-r1.ebuild| 111 ---
 app-office/gnucash/gnucash-2.6.15.ebuild   | 112 ---
 app-office/gnucash/gnucash-2.7.3.ebuild| 153 
 app-office/gnucash/gnucash-2.7.4.ebuild| 155 -
 6 files changed, 548 deletions(-)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 5492a6517aa..346d1dee9a1 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,5 +1,3 @@
-DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 
927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92
 SHA512 
6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6
 DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B 
cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae
 SHA512 
0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
-DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 
352c7bd9fe11b3b1b039acedb43be6f48960fac7ef6e4eaca5ca1ce944808d2d36c3a22b15b7150b8026bad10bfa0766fd19ac8d1b4f5f2cb2bcb8c112ee87bc
 SHA512 
78c482eb3146406d561320866c480101cf35c51d8ab789e8d2688c7f7e16d1870b33feb7bcdb3cd8feaca300ce9bcf9fa05ba8e1804b221526d181763dcea611
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 
0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61
 SHA512 
d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B 
ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb75e018f0171c2fdaeb4de3bb339548265e50de79e6
 SHA512 
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d

diff --git a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch 
b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
deleted file mode 100644
index 66c1f9fec85..000
--- a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://bugs.gentoo.org/643566
-
 a/common/test-core/Makefile.am
-+++ b/common/test-core/Makefile.am
-@@ -80,9 +80,9 @@
- libgmock.a
- nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc
- libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC}
--endif
- nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc
- libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC}
-+endif
- 
- gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
- gncscmmod_DATA = unittest-support.scm

diff --git a/app-office/gnucash/gnucash-2.6.15-r1.ebuild 
b/app-office/gnucash/gnucash-2.6.15-r1.ebuild
deleted file mode 100644
index 9cf0d0ea6d3..000
--- a/app-office/gnucash/gnucash-2.6.15-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes 
sqlite"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see 
configure.ac)
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-   >=dev-libs/glib-2.32.0:2
-   >=dev-libs/popt-1.5
-   >=dev-libs/libxml2-2.5.10:2
-   dev-libs/libxslt
-   >=dev-scheme/guile-2.0.0:12=[deprecated,regex]
-   dev-scheme/guile-www
-   gnome-base/libgnomecanvas
-   >=net-libs/webkit-gtk-1.2:2
-   >=sys-libs/zlib-1.1.4
-   >=x11-libs/gtk+-2.24:2
-   >=x11-libs/goffice-0.7.0:0.8[gnome]
-   x11-libs/pango
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   ofx? ( >=dev-libs/libofx-0.9.1 )
-

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2018-02-22 Thread Thomas Deutschmann 
commit: 432f3f5e66e510ae29429064071ce83465ad6bb5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Feb 22 11:44:00 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Feb 22 11:44:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432f3f5e

app-office/gnucash: Add patch to address test failures on 32-bit platforms

Bug: https://bugs.gentoo.org/647596
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...ucash-2.7.4-fix-tests-for-32bit-platforms.patch | 56 ++
 app-office/gnucash/gnucash-2.7.4-r1.ebuild |  5 +-
 2 files changed, 60 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..ec0e83a80bf
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
@@ -0,0 +1,56 @@
+From 3a0d2009741cdf825492020acab7c85867a60589 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Thu, 22 Feb 2018 12:27:36 +0100
+Subject: [PATCH] tests: Skip tests for dates on 32-bit platforms which cannot
+ be representated
+
+Tests "test_IANA_Perth_tz" and "test_IANA_Minsk_tz" are failing on 32-bit
+platforms because the earliest timestamp which can be representated on a
+32-bit platform is "1901-12-13 20:45:52" but the test ranges start before
+that date.
+
+To be safe, this commit will add code to skip tests before year 1902 on
+32-bit platforms.
+
+Bug: https://bugs.gentoo.org/647596
+---
+ libgnucash/engine/test/gtest-gnc-timezone.cpp | 16 
+ 1 file changed, 16 insertions(+)
+
+diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp 
b/libgnucash/engine/test/gtest-gnc-timezone.cpp
+index 5c46b2618..298220f6e 100644
+--- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
 b/libgnucash/engine/test/gtest-gnc-timezone.cpp
+@@ -154,6 +154,14 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
+ }
+ else if (year < 1916)
+ #else
++if (year < 1902)
++{
++// Earliest timestamp which can be represented on a 32-bit
++// system is "1901-12-13 20:45:52" -- so skip tests until we
++// reach a year >1901 to be safe
++continue;
++}
++
+ if (year < 1916)
+ #endif
+ {
+@@ -216,6 +224,14 @@ TEST(gnc_timezone_constructors, test_IANA_Minsk_tz)
+ }
+ else if (year < 1924)
+ #else
++if (year < 1902)
++{
++// Earliest timestamp which can be represented on a 32-bit
++// system is "1901-12-13 20:45:52" -- so skip tests until we
++// reach a year >1901 to be safe
++continue;
++}
++
+ if (year < 1924)
+ #endif
+ {
+-- 
+2.16.2
+

diff --git a/app-office/gnucash/gnucash-2.7.4-r1.ebuild 
b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
index b51571b500e..3e3690ce231 100644
--- a/app-office/gnucash/gnucash-2.7.4-r1.ebuild
+++ b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
@@ -82,7 +82,10 @@ DEPEND="${RDEPEND}
 #  gnome-extra/yelp
 # )"
 
-PATCHES=( "${FILESDIR}"/gnucash-2.7.4-double_free.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-double_free.patch
+   "${FILESDIR}"/${P}-fix-tests-for-32bit-platforms.patch
+)
 
 pkg_setup() {
use python && python-single-r1_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2018-01-15 Thread Aaron Swenson 
commit: d5e2aea57f0e218ee8601bdaa4965e5202b0e79a
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Mon Jan 15 10:13:02 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Mon Jan 15 10:36:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e2aea5

app-office/gnucash: Bump to 2.7.3

Read your news items! This introduces breaking changes in data
schemas. Back up your data!

No longer uses insecure net-libs/webkit-gtk.

Bug: https://bugs.gentoo.org/629114
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-office/gnucash/Manifest|   1 +
 .../gnucash/files/gnucash-2.7.3-no-gtest-src.patch |  15 ++
 app-office/gnucash/gnucash-2.7.3.ebuild| 151 +
 app-office/gnucash/metadata.xml|   2 +
 4 files changed, 169 insertions(+)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index d00db65c5a5..f32abd8c022 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1,3 @@
 DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 
927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92
 SHA512 
6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6
 DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B 
cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae
 SHA512 
0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
+DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 
352c7bd9fe11b3b1b039acedb43be6f48960fac7ef6e4eaca5ca1ce944808d2d36c3a22b15b7150b8026bad10bfa0766fd19ac8d1b4f5f2cb2bcb8c112ee87bc
 SHA512 
78c482eb3146406d561320866c480101cf35c51d8ab789e8d2688c7f7e16d1870b33feb7bcdb3cd8feaca300ce9bcf9fa05ba8e1804b221526d181763dcea611

diff --git a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch 
b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
new file mode 100644
index 000..66c1f9fec85
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
@@ -0,0 +1,15 @@
+Bug: https://bugs.gentoo.org/643566
+
+--- a/common/test-core/Makefile.am
 b/common/test-core/Makefile.am
+@@ -80,9 +80,9 @@
+ libgmock.a
+ nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc
+ libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC}
+-endif
+ nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc
+ libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC}
++endif
+ 
+ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
+ gncscmmod_DATA = unittest-support.scm

diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild 
b/app-office/gnucash/gnucash-2.7.3.ebuild
new file mode 100644
index 000..9bf87b6b715
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.7.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# We need to run eautoreconf to prevent linking against system libs,
+# this can be noticed, for example, when updating an old version
+# compiled against guile-1.8 to a newer one relying on 2.0
+# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
+# https://bugzilla.gnome.org/show_bug.cgi?id=775634
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# Add doc back in for 3.0 and bump app-doc/gnucash-docs
+IUSE="aqbanking chipcard debug gnome-keyring mysql nls ofx postgres python
+ quotes -register2 sqlite"
+REQUIRED_USE="
+   chipcard? ( aqbanking )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+RDEPEND="
+   >=dev-libs/glib-2.40.0:2
+   >=dev-libs/libxml2-2.7.0:2
+   >=dev-scheme/guile-2.0.0:12=[regex]
+   >=sys-libs/zlib-1.1.4
+   >=x11-libs/gtk+-3.14.0:3
+   dev-libs/boost:=[icu,nls]
+   dev-libs/icu:=
+   dev-libs/libxslt
+   gnome-base/dconf
+   net-libs/webkit-gtk:4=
+   aqbanking? (
+   >=net-libs/aqbanking-5[gtk,ofx?]
+   sys-libs/gwenhywfar[gtk]
+   chipcard? ( sys-libs/libchipcard )
+   )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   mysql? (
+   dev-db/libdbi
+   dev-db/libdbi-drivers[mysql]
+   )
+   ofx? ( >=dev-libs/libofx-0.9.1 )
+   postgres? (
+   dev-db/libdbi
+   dev-db/libdbi-drivers[postgres]
+   )
+   python? ( ${PYTHON_DEPS} )
+   quotes?

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2016-07-02 Thread Pacho Ramos 
commit: 29f814d41ac74fecc625718185a27f89b60f7fce
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul  2 09:56:16 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul  2 10:42:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f814d4

app-office/gnucash: Drop old

Package-Manager: portage-2.3.0_rc1

 app-office/gnucash/Manifest|   1 -
 .../files/gnucash-2.6.9-automagic-guile.patch  |  88 
 app-office/gnucash/gnucash-2.6.11.ebuild   | 114 -
 3 files changed, 203 deletions(-)

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 4c13ee7..122d901 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1 @@
-DIST gnucash-2.6.11.tar.bz2 13626927 SHA256 
516d97afa61971ca0a16f56319f3f7129db2da1a9d2c77ab7d8b4e6e9e018ac6 SHA512 
f3708018f85d17377e11ce55452be7cedd6041da12f66e00047e3cdafb0190da850eb4cbb5699f01cbd79c540af7ef75b44b93c2d5929e13c2a47484741e6a7e
 WHIRLPOOL 
3a5d78835a89718ee539a4c8a62e963172f2e41b8ce1c01ead2425f24529edc8ebc76f41f84596bf8f1438c81e687cc13ed2a4cbd72e87ca35725d88fcdf7d7f
 DIST gnucash-2.6.12.tar.bz2 13549926 SHA256 
371fe9af3ec4b5d6839722b07c9064a51cfe247511edaa6286fc82710f700475 SHA512 
3abf6f27413e087b2d4242772cdae87c9f13c1c952ccc0b79cb262baa0c076ee4fe227458346ece3967d1e1158aa38db3ec5dfb20db27050e4580e7762854993
 WHIRLPOOL 
fd6a0c66e394e1e80fe95630dae930c86d05e18aa89b298d862089802438080ac1997d9edb1d159868efd664f839158edc4eeb99e6484cbb142ca97b6ac94a9d

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
deleted file mode 100644
index a871233..000
--- a/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Wed, 11 Nov 2015 13:35:46 +0100
-Subject: [PATCH] Make guile support selectable
-

- configure.ac | 55 +--
- 1 file changed, 37 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 48ab828..ce7ba74 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
- ### --
- ### Guile version checks
- 
-+GUILE_EFFECTIVE_VERSION=0
- # - check minimum version
- # - determine GUILE_CFLAGS and GUILE_LIBS
--gnc_have_guile_2=no
--gnc_have_guile_www=no
--PKG_CHECK_MODULES(GUILE,
--  [guile-2.0 >= 2.0.0],
--[gnc_have_guile_2=yes
--GUILE_EFFECTIVE_VERSION=2.0
--AC_PATH_PROG([GUILD], guild)],
--   [PKG_CHECK_MODULES(GUILE,
--  [guile-1.8 >= 1.8.5],
--[GUILE_EFFECTIVE_VERSION=1.8],
--  [AC_MSG_ERROR([
--guile does not appear to be installed correctly, or is not in the
--correct version range.  Perhaps you have not installed the guile
--development packages?  Gnucash requires at least version 1.8.5 to build.
--  ])])
--])
- 
--AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
-+AC_ARG_WITH([guile],
-+AS_HELP_STRING([--with-guile=1.8|2.0|auto],
-+   [which guile version to compile against @<:@default: 
auto@:>@]),
-+[],
-+[with_guile=auto]
-+)
-+
-+AS_IF([test "$with_guile" = "2.0"],
-+  [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
-+ [GUILE_EFFECTIVE_VERSION=2.0
-+  AC_PATH_PROG([GUILD], guild)])],
-+  [test "$with_guile" = "1.8"],
-+  [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
-+ [GUILE_EFFECTIVE_VERSION=1.8])],
-+  [test "$with_guile" = "auto"],
-+  [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
-+  [GUILE_EFFECTIVE_VERSION=2.0
-+   AC_PATH_PROG([GUILD], guild)],
-+  [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
-+ [GUILE_EFFECTIVE_VERSION=1.8],
-+ [GUILE_EFFECTIVE_VERSION=0])
-+  ])],
-+  # else
-+  [AC_MSG_ERROR([invalid guile version specified])]
-+)
-+
-+AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
-+  [AC_MSG_ERROR([
-+   guile does not appear to be installed correctly, or is not in the
-+   correct version range.  Perhaps you have not installed the guile
-+   development packages?  Gnucash requires at least version 1.8.5 to 
build.
-+   ])]
-+)
-+
-+AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
- AC_SUBST(GUILE_EFFECTIVE_VERSION)
- AC_SUBST(GUILE, [`pwd`/gnc-guile])
- 
-@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
- then
- AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
- 
--if test "${gnc_have_guile_2}" = yes
-+if

[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/files/, app-office/gnucash/

2015-11-11 Thread Gilles Dartiguelongue 
commit: 6f770d63013f1e530faccfa7286168d273010d30
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Wed Nov 11 13:02:59 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Wed Nov 11 13:04:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f770d63

app-office/gnucash: remove guile automagic detection

This problem only affects users trying out lisp overlay or masked
ebuilds in gentoo-x86 but it gets old. gnucash builds fine with
guile-2.0 but we have no scheme herd to push it forward currently.

 .../files/gnucash-2.6.9-automagic-guile.patch  | 88 ++
 app-office/gnucash/gnucash-2.6.9.ebuild|  4 +
 2 files changed, 92 insertions(+)

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
new file mode 100644
index 000..a871233
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
@@ -0,0 +1,88 @@
+From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Wed, 11 Nov 2015 13:35:46 +0100
+Subject: [PATCH] Make guile support selectable
+
+---
+ configure.ac | 55 +--
+ 1 file changed, 37 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48ab828..ce7ba74 100644
+--- a/configure.ac
 b/configure.ac
+@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
+ ### --
+ ### Guile version checks
+ 
++GUILE_EFFECTIVE_VERSION=0
+ # - check minimum version
+ # - determine GUILE_CFLAGS and GUILE_LIBS
+-gnc_have_guile_2=no
+-gnc_have_guile_www=no
+-PKG_CHECK_MODULES(GUILE,
+-  [guile-2.0 >= 2.0.0],
+-[gnc_have_guile_2=yes
+-GUILE_EFFECTIVE_VERSION=2.0
+-AC_PATH_PROG([GUILD], guild)],
+-   [PKG_CHECK_MODULES(GUILE,
+-  [guile-1.8 >= 1.8.5],
+-[GUILE_EFFECTIVE_VERSION=1.8],
+-  [AC_MSG_ERROR([
+-guile does not appear to be installed correctly, or is not in the
+-correct version range.  Perhaps you have not installed the guile
+-development packages?  Gnucash requires at least version 1.8.5 to build.
+-  ])])
+-])
+ 
+-AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
++AC_ARG_WITH([guile],
++AS_HELP_STRING([--with-guile=1.8|2.0|auto],
++   [which guile version to compile against @<:@default: 
auto@:>@]),
++[],
++[with_guile=auto]
++)
++
++AS_IF([test "$with_guile" = "2.0"],
++  [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
++ [GUILE_EFFECTIVE_VERSION=2.0
++  AC_PATH_PROG([GUILD], guild)])],
++  [test "$with_guile" = "1.8"],
++  [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
++ [GUILE_EFFECTIVE_VERSION=1.8])],
++  [test "$with_guile" = "auto"],
++  [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
++  [GUILE_EFFECTIVE_VERSION=2.0
++   AC_PATH_PROG([GUILD], guild)],
++  [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
++ [GUILE_EFFECTIVE_VERSION=1.8],
++ [GUILE_EFFECTIVE_VERSION=0])
++  ])],
++  # else
++  [AC_MSG_ERROR([invalid guile version specified])]
++)
++
++AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
++  [AC_MSG_ERROR([
++   guile does not appear to be installed correctly, or is not in the
++   correct version range.  Perhaps you have not installed the guile
++   development packages?  Gnucash requires at least version 1.8.5 to 
build.
++   ])]
++)
++
++AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
+ AC_SUBST(GUILE_EFFECTIVE_VERSION)
+ AC_SUBST(GUILE, [`pwd`/gnc-guile])
+ 
+@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
+ then
+ AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
+ 
+-if test "${gnc_have_guile_2}" = yes
++if test "${GUILE_EFFECTIVE_VERSION}" = "2.0"
+ then
+ if test "${gnc_have_swig_2_0_10}" = no
+ then
+-- 
+2.6.3
+

diff --git a/app-office/gnucash/gnucash-2.6.9.ebuild 
b/app-office/gnucash/gnucash-2.6.9.ebuild
index 4daf665..d06c27b 100644
--- a/app-office/gnucash/gnucash-2.6.9.ebuild
+++ b/app-office/gnucash/gnucash-2.6.9.ebuild
@@ -64,6 +64,9 @@ src_prepare() {
# Skip test that needs some locales to be present
sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
 
+   # Fix automagic on guile detection
+   epatch "${FILESDIR}"/${PN}-2.6.9-automagic-guile.patch
+
eautoreconf
gnome2_src_prepare
 }
@@ -86,6 +89,7 @@ src_configure() {
$(use_enable ofx) \
$(use_enable hbci aqbanking) \
$(use_enable python)