gentoo auto-resync : 14:12:2023 - 11:49:05

3 files changed, 60 insertions, 1 deletions

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index cbf2e6b4bc6b..25ecbd54ce25 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,6 +5,7 @@ AUX gnucash-4.13-webkit2gtk-4.1.patch 552 BLAKE2B 8fd437c963fd8d6ba61d6b4c9db75e
 AUX gnucash-5.0-exclude-license.patch 790 BLAKE2B e3f251d47b965f0071efc36bf6a399d1f0269ff02506635195b61760f8a99b9599c4bdeadda3204a344ca0493290ca8a0bb3b726f425cd084b830e0f4328167b SHA512 97fd15413759447857a51fddfec4f52e716017d585882d56acec195672f999687f33eb8276091f2fa43060d129c6a8171e1678a7b511a31cf441aab28e083c33
 AUX gnucash-5.0-webkit2gtk-4.1.patch 484 BLAKE2B 075c06765edbd6f0d7e50c033813b587c145e882372efb2b10cd63fc0ec555ee7a4ec048d89e96208fb117a4b4cde22e7a6a2b36c5fa247e6bde1edc50ad59f7 SHA512 37df788a64c91ac30667d1d92f0a017883314968cd77aace7b43654232e140dd5e00a4044d9c63437df4d1d50ebbe665f6a65189734c02c0fa224dd7076364bf
 AUX gnucash-5.3-no-werror.patch 1288 BLAKE2B 75fda4f8cd0906744417149381d3f0f32de2471c8afef0305292b53c162a35c4ff7cea875fc8087e70f1b94b6ad00107230e3e595ef94ba9cb84fe1d7ec14559 SHA512 74eb0d5e23fc01abaf61ae1295a1feda95fc0332415645adc75fa3badd921fa2642b6a2813adc68837025bf0eba9114588900b2cf9fea04fbb0b60b4a4591881
+AUX gnucash-5.4-fix-python-finding.patch 1727 BLAKE2B 2df2b3aad33f97b83425f01fa193e5d7d799f7c14d39cfebabee4995330ccee37c20064dad5d9f8425595f599f2b6e31f9c9533f57f081ee1b44932e6194a9de SHA512 26d7216ce583452aa19bf8301559a40888546deae2d93f868bdbb80fab8fdfee6cc2e30bc3180dec0a02b6880e06e98e4dc36b5d61f7216307b8daed4126d140
 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
@@ -12,5 +13,5 @@ DIST gnucash-5.4-1.tar.bz2 14928988 BLAKE2B 389996058e2d452f7e0a9ee088a56254c565
 EBUILD gnucash-4.13.ebuild 5317 BLAKE2B e70cf172e96bd05148f81df1890dd2813f53ae9416abb59c7307b8e0ac4b160827f06574332cfd719632fc7a3486822476fa0fc86a6bca2934b1f3fe26231359 SHA512 9912b569e6440c6fdec57d24af553692ffabc16b16f41d1753cd17badafbd5398f8784c4a4fff8f9d6ae358cd612b04936269eff5839337829e958f2f5afaa7e
 EBUILD gnucash-5.1.ebuild 5277 BLAKE2B beecbac17faf5768cd07c78f8c77d29176ecc2491b0eb98b4fb1517c9dcac5ba1abe461c25e8d498b7d608cf90e9830ef93925271064bb1f9c5541040c31348b SHA512 aa50a0dad9e641906cdc26c68a4953eaf8eb7bc9af39b522f828096407460c838bde4675e3688bba8c91fb3e293c0b97f70b0225d2b0ffcb1a9d8a0d79bfa0c8
 EBUILD gnucash-5.3.ebuild 5305 BLAKE2B 0ad1884d6ad87cb4affe5d25107cdccbc696884e77f91418820374812b0182c7d789ab64c4a913492590d7c3e40afba479b37c6705dc9e7de02cb2e9bbfea541 SHA512 e2835bd4390421137eb9540d669149aa68e9e0703ac84e1537b8d7f8ed0cb7579416a4cb0c1f7a806c5b1d91d0ec6b848ce306d51a089a5b58cf48cf58d09a46
-EBUILD gnucash-5.4.ebuild 5449 BLAKE2B 0736ecef3dbce24bb51838078d75eb88c9a8d6455bad8ac0dc7eba68bb9eb12369227bd4360a65b06ce3287d1aedf2e7940903ee385f19e3439f779aff5b86c2 SHA512 c9d5404d85d588e6ab56bc9f566d304bda564b0b1d2fc40bbab64cde9ff234d73b0ba92b32be83e2c57d413d34e89ca1677c6b3871fcb4e75db8d31a283ea739
+EBUILD gnucash-5.4-r1.ebuild 5677 BLAKE2B a5708c4578b5c448cf5c4b07841f081102b7b0967c3e0e7e5ea9b207fbd26fa43696cac591358b46789038327ba385b0371a5d120226fdf4789046c116482eee SHA512 d231d1d6af15f3cfd7f92ea79c79da96ca4585def84addec16dee6af5967eca3fd7b99369d09698ff5c7031565624e8d76448bbcac1bd57e4d6b2274ba56bbb5
 MISC metadata.xml 1920 BLAKE2B 939505ab09b19d3d24cc4c21f571d846204325822d9b9b82434d0687a4dce165382860b06892274f45a2910511e87fad9d64878d0dc79e8e3eba42aeae786ded SHA512 335cfa691d00403ef8b2ad3c03738706ba8ed49c427c01cb11b9f69ceaf0759e52a8ece5da6a10cc31aa6edb1a22573884edbb45dc05d963b2fd5db34cf29268
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 000000000000..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 <sa.me.uk>
+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
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