gentoo resync : 12.03.2021

4 files changed, 3 insertions, 474 deletions

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 6034ad77aa05..292282e7b59d 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,9 +1,6 @@
 AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
 AUX gnucash-3.8-examples-subdir.patch 316 BLAKE2B 77779cebb75896e8d51981f5fc0cbc09aa51e83ea0823b1055d5e6bf9b420492f039e7e39985e405304819a46bbd178d10c2a55188e956c9b71b2c20842f947e SHA512 d4fc9a3e062ff25f65b82253c563c0d291d461b44d47f30c33a8041908a59fa23ce3e127b885690b1ec55d17222cac2c3679d49d962bb5be998f9611467e88f8
 AUX gnucash-3.8-exclude-license.patch 634 BLAKE2B d6b86102a4ced983684e75f4f4801b7da096923a65c7fca10f13e9da45adb70ac5c2c3c5af9151a14e6f1eb3a3711d6283840db232ee6113818e1f1b215be9dc SHA512 a9c43405226d2256c0b3c981e70a4fc79bd126c08089e68ac01edc86070a2936eaa3f77ac16bad94954addd2085ca0bf1c62bec3d31840559bbf213e1b530f2d
-DIST gnucash-4.2.tar.bz2 14225695 BLAKE2B be77c5876cd1720e9b7422c6afbb05f0144a20cf45d7dac0e8bd3362139f4b4d18f47f0edcb6db9db7a2485263d6bff5e0546f5691fe097fe1d4912852bc0ce4 SHA512 f730d2ba5d6b310e0c467767aa4c4e6a153b441b6b9aed948344b9a9b9dee351f3cba9fac1d655385136f5ce4313f8f37ef305e9b93b0ea32c40525d9293b070
 DIST gnucash-4.4.tar.bz2 14430959 BLAKE2B 7a9e04957919a99e083dd5c1ac04150f77ab64eef277c0cd63ef90ade4a82875447f291d4f14499a14e987a86a7b7615d4a3cbb79a980be7022cb4f511b71368 SHA512 5882e5a91081bb9279ac5dc8798352cb15ebb934d1d37c6d6639244602108e067ece5b7f51ba32c9c413c1469d08ca32a73369e6af34e41c3ef704033c71f336
-EBUILD gnucash-4.2-r1.ebuild 5488 BLAKE2B 59203c108531235ab4c48fb880020bd2615cd0d9824f55be0feab698f9f73876ff662e65c4558cbe33c8767baf2399f9c447237cfa97b258cfe4472175ecd368 SHA512 3f11e22c63eeef1f4ce7ad04a930d056ce267d94070ff71ab5701deccb1d7f267572f8b40260e05d41a7517c08dd0a129012d26593e837d77452c296633eda95
-EBUILD gnucash-4.2.ebuild 5481 BLAKE2B 2474f3300bf991ca9ce3e3b2c22e2ad7c92e5a9c09da86a6246672d8bf9f50fac2808b310d7e32713b5b1647bac0b13cc593943000eb4e11c2d09a3508a97644 SHA512 50fc83c4bf129a53c4f52e90aaa673975c73c58a3abd0cc18820f225344e6202470ccda356747f862c8e1d92668d867fe9986402df0a505c9009ed85070759cc
-EBUILD gnucash-4.4.ebuild 5488 BLAKE2B 59203c108531235ab4c48fb880020bd2615cd0d9824f55be0feab698f9f73876ff662e65c4558cbe33c8767baf2399f9c447237cfa97b258cfe4472175ecd368 SHA512 3f11e22c63eeef1f4ce7ad04a930d056ce267d94070ff71ab5701deccb1d7f267572f8b40260e05d41a7517c08dd0a129012d26593e837d77452c296633eda95
+EBUILD gnucash-4.4.ebuild 5486 BLAKE2B 1cc7dc311d4bebc107c8cc252e26bab8e044f7d999740dfb25680722f74ab8869691f30038dfb11d2f1c7b8e8465b4f928fadeab280d9513d717267be5137ebf SHA512 f6c8672462c6d9aec37d1b05afcd0026aebdc70374947a3d0d35b806fed6706ec9f44080e2b98f668ff0ba1ca651044fd75e37170d099e93e9f70105d8f3a8ac
 MISC metadata.xml 562 BLAKE2B 07fb70bae76794f49e852dc2840b13b811e3e8b28cd1f504d693662e6530591d337f993248fd80868c08b2c1cb9a648c7fcf8f964e74eeef70c5815946edad64 SHA512 659ded7048ced517f06d94952df08694ae5d2775aec8bb9adaf658d5151048ec1b612d6bf54af664a44b5510406b4ed02809ee0c150159eb6c2652186589c4a2
diff --git a/app-office/gnucash/gnucash-4.2-r1.ebuild b/app-office/gnucash/gnucash-4.2-r1.ebuild
deleted file mode 100644
index 2726892030af..000000000000
--- a/app-office/gnucash/gnucash-4.2-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~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:=
-		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=
-		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
-	)
-	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
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	>=dev-cpp/gtest-1.8.0
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-"
-
-BDEPEND="
-	dev-lang/swig
-	dev-util/cmake
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-8:*
-		>=sys-devel/clang-6:*
-	)
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-no-gui.patch
-	"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
-	"${FILESDIR}"/${PN}-3.8-exclude-license.patch
-)
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
-
-pkg_pretend() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 8 ]]; then
-			die "GnuCash needs at least GCC version 8."
-		fi
-	elif tc-is-clang; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			die "GnuCash needs at least clang version 6."
-		fi
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-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}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! ${LOCALE_TESTS} ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-}
-
-src_install() {
-	cmake_src_install
-
-	# strip is unable to recognise the format of the input files (*.go)
-	dostrip -x /usr/$(get_libdir)/guile
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples
-	fi
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	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() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-4.2.ebuild b/app-office/gnucash/gnucash-4.2.ebuild
deleted file mode 100644
index 8f72db0ee04a..000000000000
--- a/app-office/gnucash/gnucash-4.2.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 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
-		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=
-		aqbanking? ( sys-libs/gwenhywfar[gtk] )
-	)
-	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
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	>=dev-cpp/gtest-1.8.0
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-"
-
-BDEPEND="
-	dev-lang/swig
-	dev-util/cmake
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-8:*
-		>=sys-devel/clang-6:*
-	)
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-no-gui.patch
-	"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
-	"${FILESDIR}"/${PN}-3.8-exclude-license.patch
-)
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
-
-pkg_pretend() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 8 ]]; then
-			die "GnuCash needs at least GCC version 8."
-		fi
-	elif tc-is-clang; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			die "GnuCash needs at least clang version 6."
-		fi
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-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}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	if use python ; then
-		cp common/test-core/unittest_support.py \
-		   "${BUILD_DIR}"/common/test-core/ || die
-	fi
-
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! ${LOCALE_TESTS} ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-}
-
-src_install() {
-	cmake_src_install
-
-	# strip is unable to recognise the format of the input files (*.go)
-	dostrip -x /usr/$(get_libdir)/guile
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples
-	fi
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	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() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-4.4.ebuild b/app-office/gnucash/gnucash-4.4.ebuild
index 2726892030af..1b028d8901fd 100644
--- a/app-office/gnucash/gnucash-4.4.ebuild
+++ b/app-office/gnucash/gnucash-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
 	  python quotes -register2 smartcard sqlite test"