gentoo resync : 29.08.2018

7 files changed, 48 insertions, 507 deletions

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 4add610fe69f..dbb98ee06016 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,16 +1,10 @@
 AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9
 AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b
+AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
-DIST gnucash-2.7.5.tar.bz2 13330271 BLAKE2B e06328050a2dd8e80e224cf13f51c1c7151e73f9a1c9f14581f33bfcf8bf07b273962620b7281637101eab8c5eff67a3e5e8e34d81f0c8d263ac33bf6d1eb40c SHA512 68cd6e6f61a43b8837e9efe693d22f62ebe10a8bb7d593814fb6a12d035d74ec1e444f53010ad53c6b1adf28c75aa482403c06052314a91636c2a8baa30e09af
-DIST gnucash-2.7.7.tar.bz2 13368946 BLAKE2B 06e6815af713235ea31859532911303db4fa5e8dcd50b9111aa513795963eaca29a612eeced27399441f43563753d977468dfd901a49dfa689b5d36e7b985ebf SHA512 b7d91e87c4bc4e604560f4502a86deaafa4f636e9fe2af26db53b11da9f48986c970ba0ed08cb7172ca08a5fb2da451d26976963241206c388a33555c80f28fe
-DIST gnucash-3.0.tar.bz2 13366724 BLAKE2B 4c6e87d433f203cca73f1b4ee623a4bb260bdd6812aaf24af0045384cbe8fc24cc5215b4a4bbe4f7446bfd4626ef7cf09f67f2031f49c2563784528294aae8fb SHA512 5ec13b8abe1520a7e614ceeca4c41d5dba3ebae4ec965918584963022ceb5cb3b85862289a85a72767db74a0c735214a78342a53c37e6da939ff850538174a87
-DIST gnucash-3.1-1.tar.bz2 13374530 BLAKE2B 51dcdea6b91a72288a9e9583d50edbe88303b93fe0059ea3444a0965723bb29955227df5e6eda910638f28a3eacdf367fdca1783871258b8ce396598e2b5edc0 SHA512 34d675cf1434f280345c40e6f448b3c2ac5b3cde33b15e662bbda784660ad92168e4b0d14d4fbf190cdfa6a7954806520ab4b72a7460736c78f934f803b1d5e0
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
-EBUILD gnucash-2.7.5.ebuild 3922 BLAKE2B 072fd6a6232473c97276a2a1b1988b8f3f69b6c9de963c2429150e39a444b3035e5b33fb4417bf9cea906487165bd54bcab3dd3332d429c33c411edde499cb1c SHA512 1a57b87c6c4d894e1ca4a3948916b613756e6797b1c0eafff0dea3ba380c7c28dbd53d849eae08f80522496ed710e9578ad3c48ca69a1b4f5b349abefc4a588c
-EBUILD gnucash-2.7.7-r1.ebuild 3938 BLAKE2B caeec758f850e9bf89d6baad7e2884cf9fefa3892dbaf0dbab63be92d28664dcac46122a3f5a00bcee2b7a88cd788e611e8823da3dcc5a3ee12cf066fce2da52 SHA512 0025632752b6f45f7ec5259560ff9b7998bb8247be8ead416db1c281efded6da014770b23718e067cf54e7044537b7cbf6343d8c016ef6e1230041ea0cf123cb
-EBUILD gnucash-3.0.ebuild 3858 BLAKE2B cb09a0493a8a78237459c20d6ebd38428e20a78821a766fd247f78ab6b4a65f89dc963029fdb6259bd102de3ab3179b6cc07957129cdd01e77661f0907538973 SHA512 4f5a2c4db41525605a82da65ed0231aa90b2802b69b14667c95fbc79d289e7ab31e4a8e7596bd5ae1aa270100e7a7b72b98a2a20b3f137c8ceaaafdd5c015a93
-EBUILD gnucash-3.1.ebuild 3890 BLAKE2B 9f198bce0f8bd6deae017ae8db836d09546c8ae091b80d843e59f2fb5cd898151cdcb3fb36d99bb41e6f5fe3fdfebf1f3e6c452fcc1eac8ad82c6106409b73de SHA512 4d233e8daad07eefaed440d55cc01fdc507e6d7bdfbb8e437e8fd6251455ea5223e9315efa9bd4db7a83fc6ad862e193e296facf3c1ea7a312496b3b252e26aa
+EBUILD gnucash-3.2-r1.ebuild 4034 BLAKE2B d18757f5fbdefb5a59535c5607ef49a2f821d39b56c8d17f584b8d342537a81206dab17c610935cbd8a70e58ede4bb1e334537e214302e75bf22c6f9d8dec19c SHA512 59456bc40b78511c5fd66903dad2a4a96b3a693d22866994cb3966c3d7024f0b9df581278282a547f9bbad32c9faacd56cb33cd4c789029e5757088924681335
 EBUILD gnucash-3.2.ebuild 3888 BLAKE2B 7c7f0231e94ea7c430c2007968e70cd69c74dbb804f4b8e9858eafffc29e05ad8e2a1528b902294c75115161466ae2558e1149fc8c98a2376bf3f609e742e794 SHA512 b767881302588a21edc469ca1ed91a47a4560a756e099914c23a5907c78b1b9cd615831c3024c1c6f00a4c444b7c1c03d7417e1b9d90aa967c2196ab09d22b06
-MISC metadata.xml 766 BLAKE2B 8da7802829c98dfc8a219d6ad339081af2ed5506668e0331ce944e61a69eb7c9bfb5ac2b7a27616cf2b59081aee348654774937336b5540bab8f2333c1d577c5 SHA512 5e64d4d0a7e9570bb12793d983852deacf8a94a79a153c18e490109d68f1275f82dc584d0bda4b5e3df119660cba90c7c03852ee046a7c7a29626c05cdea6784
+MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/files/gnucash-3.2-no-gui.patch b/app-office/gnucash/files/gnucash-3.2-no-gui.patch
new file mode 100644
index 000000000000..896aafd17f15
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.2-no-gui.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e10a09..cdbdb7a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -770,7 +770,9 @@ set(SCHEME_INSTALLED_CACHE_DIR ${PKGLIBDIR}/scm/ccache/${GUILE_EFFECTIVE_VERSION
+ # The subdirectories
+ add_subdirectory (borrowed)
+ add_subdirectory (data)
++if (WITH_GNUCASH)
+ add_subdirectory (doc)
++endif (WITH_GNUCASH)
+ add_subdirectory (po)
+ add_subdirectory (common)
+ add_subdirectory (libgnucash)
diff --git a/app-office/gnucash/gnucash-2.7.5.ebuild b/app-office/gnucash/gnucash-2.7.5.ebuild
deleted file mode 100644
index 5b65c36fec6c..000000000000
--- a/app-office/gnucash/gnucash-2.7.5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-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 examples 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? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# Uncomment for 3.0
-# PDEPEND="doc? (
-# 	~app-doc/gnucash-docs-${PV}
-# 	gnome-extra/yelp
-# )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-2.7.7-r1.ebuild b/app-office/gnucash/gnucash-2.7.7-r1.ebuild
deleted file mode 100644
index 5b5dde99e048..000000000000
--- a/app-office/gnucash/gnucash-2.7.7-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-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 examples 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? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# Uncomment for 3.0
-# PDEPEND="doc? (
-# 	~app-doc/gnucash-docs-${PV}
-# 	gnome-extra/yelp
-# )"
-
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-3.0.ebuild b/app-office/gnucash/gnucash-3.0.ebuild
deleted file mode 100644
index bc347e50c6fb..000000000000
--- a/app-office/gnucash/gnucash-3.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples 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? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	~dev-cpp/gtest-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-3.1.ebuild b/app-office/gnucash/gnucash-3.2-r1.ebuild
index d75f0e734e36..64b817987f96 100644
--- a/app-office/gnucash/gnucash-3.1.ebuild
+++ b/app-office/gnucash/gnucash-3.2-r1.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}-1.tar.bz2
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
 		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
 
 SLOT="0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
-	  python quotes -register2 sqlite"
+	  python quotes -register2 sqlite +gui"
 REQUIRED_USE="
 	chipcard? ( aqbanking )
 	python? ( ${PYTHON_REQUIRED_USE} )"
@@ -30,14 +30,16 @@ REQUIRED_USE="
 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-scheme/guile-2.0.0:12=[regex]
+	gui? (
+	  gnome-base/dconf
+	  net-libs/webkit-gtk: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]
@@ -70,7 +72,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.19.6
 	dev-lang/perl
 	dev-perl/XML-Parser
-	gnome-base/gnome-common
+	gui? ( gnome-base/gnome-common )
 	sys-devel/libtool
 	virtual/pkgconfig
 "
@@ -80,13 +82,16 @@ PDEPEND="doc? (
 	gnome-extra/yelp
 )"
 
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	xdg_environment_reset
 }
 
+src_prepare() {
+	use gui || eapply "${FILESDIR}"/${PN}-3.2-no-gui.patch
+	default
+}
+
 src_configure() {
 	local sql_on_off="OFF"
 	if use mysql || use postgres || use sqlite ; then
@@ -103,6 +108,7 @@ src_configure() {
 		-DWITH_OFX=$(usex ofx)
 		-DWITH_PYTHON=$(usex python)
 		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
 	)
 
 	cmake-utils_src_configure
@@ -122,7 +128,10 @@ src_install() {
 	cmake-utils_src_install
 
 	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+
+	if use gui ; then
+	  rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	fi
 
 	if use examples ; then
 		mv "${ED%/}"/usr/share/doc/gnucash \
@@ -141,8 +150,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 
@@ -153,8 +164,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index f0b8ab6233e1..3ce301801507 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -16,6 +16,10 @@
 		<flag name="chipcard">
 			Enable support for chipcard reading and processing.
 		</flag>
+		<flag name="gui">
+			Enable graphic interface (needs net-libs/webkit-gtk:4
+			and x11-libs/gtk+:3)
+		</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>