gentoo auto-resync : 26:12:2022 - 08:07:05

4 files changed, 16 insertions, 31 deletions

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 4472138da1b6..fc1e54b251cd 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,4 +1,3 @@
-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
 AUX gnucash-4.12-drop-broken-test.patch 1214 BLAKE2B 6e977f65cecee6b9102881529799f04ddd03b170f0e9cbe8959b3e356d2dfbef14d9cb11d3e37f0225991fe7bd08ef50163db1d007836cb1024b0c1a6e79b0fd SHA512 8f18214982537514cb0640a4fa52fe9707c6f3ea0db0eef1108fb7b36fb89d0dadc87d12796c60b94d9ed8224655c35a9954bfb463f9f6b56cb02eca4d9d4cda
@@ -7,6 +6,6 @@ DIST gnucash-4.10.tar.bz2 14768016 BLAKE2B 645caedc342508290bac1ed4c8745ddc84f96
 DIST gnucash-4.12.tar.bz2 14552115 BLAKE2B 6d5faf2fa1d096315bd6c346e0291109669fd9df4bc0404f4dbc2fc56c8a361aeff57e3535fea862f21ff59391319010b7f28c9bd7df658a1b0c518894862585 SHA512 4c930dfc9a10dfd06d3c52874a61e533ddc39deb1c334162dc3a096d998dbdfcac61520ae94dedbc6742b7807e250ff92d26067a70c4ab156e46bed333bbfd37
 DIST gnucash-4.8.tar.bz2 14679619 BLAKE2B ef0790dcf823631b3a9764d60a49a55f35614d31117b1921ad5621d8b5298928555725b4d376e4b782437f8874b438496c3fd5b610df480fcc17f5d049a07511 SHA512 5fbafabe7ddbafe5e275b058758637011712934aec875b97085b7d068ab556ae5041b2cfa83f9a735eec877fac5158b701c2255be129e8ce883acf668fadefb5
 EBUILD gnucash-4.10.ebuild 5166 BLAKE2B 06394d0b361926d5b8310096d444f42871c4fce672fdb128309d30d6c6465ba18869b11ba085b0edf332c444fd8bfacfa022dbb225be7168cf8fdb5d5af98a2b SHA512 32be59d825a1b9c136a0e22be0cdce58fdae70344f6363c9dd425cd55b3a3635cb5a8d3c9034cbef74b4b4422722079d88e7e3ec1c8e1fa209f414e290215447
-EBUILD gnucash-4.12.ebuild 5470 BLAKE2B d5c7a475bf83bad29064251a50018f32419091ad8fe1107d70b5828f9624e8bccac0405171e3caf9a198b886cb95c8468832d1a7ec65532ed4b3e8365fbed45a SHA512 8ceac87f19133e5fc71bdedeb0475b4c7ef67be339eda825f9b7c9708a53050cca521db9c1efd0099ccd33ba2839737bfbc42539fd7468134c1888449f332851
+EBUILD gnucash-4.12-r1.ebuild 5315 BLAKE2B 6aec971979bb91fef4d4fedb51314cafb3a32aec888f745a467dd174fd6d6229454ca7d4146f5e55a3c4a0550518ff3d9c459c93aa2fcde5498848e00044d529 SHA512 e89c78943ca85fc785793d3ed38498316a130e45e44e010609e1d1b30467e9ca01ce638848c115eb0ecd7cf1b4ddad8337ebd2a9cdee0f6b69882fb02ccee58c
 EBUILD gnucash-4.8.ebuild 5099 BLAKE2B 1743c35f6d0afb4ea1aab9f902070774478507778eb760ddb2aff9146615095c603c6a3c821793b1153d0783c9eae87ec2549bc8ad6334ac0cb54462d43b5a9b SHA512 c659e49db5238a8598d9d4a697bd3cdc1419170f5d08219c93a04bde13b2aba6a4f8f18c77db5941f68ac5a6de4f58be80ab3e0d32aff8ca612021c4ee8bedae
-MISC metadata.xml 1804 BLAKE2B 15a3ca62726683e56bf8a85ee4738a078c7d832776b54ebb35a28b7525d1634b88507ecba3595e76ec3b06f02fd263605f02c595fd459aeb86dfd05fbe124910 SHA512 0ee5d563d4e787717b97c1993946f6fc6c69b3677791a6bd45bf1aafaac43271b47e11d876a48fdba42a304e75e5f6290ebb1173f56c9f9b5c9422663a5aa119
+MISC metadata.xml 1920 BLAKE2B 797f0dd6443bbb96fe31e287c4733fa477ac64cabc19bea78d3c12b479c08d635d52f03ba0ca0c5e1a992709eef68af01c2d0beb6f9c47e8a9909be327154228 SHA512 d3ed034a7b95480748e7d8431b25d1ef7aa7d2df04df82c35d58450709f8963822ff30476a2be7dd92461efbabbce6963e51158640153f7159c76b244e9b1861
diff --git a/app-office/gnucash/files/gnucash-3.2-no-gui.patch b/app-office/gnucash/files/gnucash-3.2-no-gui.patch
deleted file mode 100644
index 896aafd17f15..000000000000
--- a/app-office/gnucash/files/gnucash-3.2-no-gui.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-4.12.ebuild b/app-office/gnucash/gnucash-4.12-r1.ebuild
index 702eadfdd4b6..071a22d369b0 100644
--- a/app-office/gnucash/gnucash-4.12.ebuild
+++ b/app-office/gnucash/gnucash-4.12-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-libs/libxslt
 	aqbanking? (
 		>=net-libs/aqbanking-6[ofx?]
-		sys-libs/gwenhywfar:=
+		>=sys-libs/gwenhywfar-4.20.0:=
 		smartcard? ( sys-libs/libchipcard )
 	)
 	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
@@ -54,7 +54,7 @@ RDEPEND="
 		dev-db/libdbi
 		dev-db/libdbi-drivers[mysql]
 	)
-	ofx? ( >=dev-libs/libofx-0.9.1:= )
+	ofx? ( >=dev-libs/libofx-0.9.12:= )
 	postgres? (
 		dev-db/libdbi
 		dev-db/libdbi-drivers[postgres]
@@ -75,17 +75,20 @@ RDEPEND="
 		dev-db/libdbi-drivers[sqlite]
 	)
 "
+
+# gtest is a required dep
+# see https://bugs.gnucash.org/show_bug.cgi?id=795250
 DEPEND="
 	${RDEPEND}
 	>=sys-devel/gettext-0.20
 	dev-lang/perl
 	dev-perl/XML-Parser
 	sys-devel/libtool
-	test? ( >=dev-cpp/gtest-1.8.0 )
+	>=dev-cpp/gtest-1.8.0
 "
 BDEPEND="
 	dev-lang/swig
-	dev-util/cmake
+	>=dev-util/cmake-3.10
 	virtual/pkgconfig
 "
 PDEPEND="
@@ -96,12 +99,12 @@ PDEPEND="
 "
 
 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
@@ -134,7 +137,7 @@ src_prepare() {
 		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"
+		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed"
 	done
 }
 
@@ -208,11 +211,6 @@ pkg_postinst() {
 	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() {
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index f4fdd26932f1..80150b2107fa 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -33,5 +33,7 @@
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 		<remote-id type="github">Gnucash/gnucash</remote-id>
+		<changelog>https://github.com/Gnucash/gnucash/releases</changelog>
+		<bugs-to>https://bugs.gnucash.org/</bugs-to>
 	</upstream>
 </pkgmetadata>