From 6fde365789bd61cccaa459c9d318f82a443f2805 Mon Sep 17 00:00:00 2001
From: Dorian OUAKLI <dorian.ouakli@xwiki.com>
Date: Tue, 26 Mar 2024 09:19:59 +0100
Subject: [PATCH] add patch

---
 dev-lang/python-nogil/Manifest                |  3 +-
 dev-lang/python-nogil/files/10-fix_dbm.patch  | 58 +++++++++++++++++++
 .../python-nogil/python-nogil-3.12.0.ebuild   |  4 ++
 .../md5-cache/dev-lang/python-nogil-3.12.0    |  2 +-
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 dev-lang/python-nogil/files/10-fix_dbm.patch

diff --git a/dev-lang/python-nogil/Manifest b/dev-lang/python-nogil/Manifest
index 16c9863..52c352c 100644
--- a/dev-lang/python-nogil/Manifest
+++ b/dev-lang/python-nogil/Manifest
@@ -1,5 +1,6 @@
+AUX 10-fix_dbm.patch 1888 BLAKE2B 86782d44d7ecf5c4da1af5d3b7b228609a613d33dc6c2021bc46334d6ada4097deb110254780fe734af7bbedfbc1382c35781d9da805c770b88fb179f4d96e40 SHA512 200ffca81b0a28d9548067c6ca65b7cda5503338ce9b99fa235b39b6dce503b6b92c5dd98b3d1651003e6a9ac3b405b6cf52dbe68d9d237c23d5117d03067eec
 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 DIST python-gentoo-patches-3.12.0.tar.xz 5156 BLAKE2B 42d23d4567b09878000a6b01425e06e377c779e8e3713af6d7522f8cdbe22d2bcb67dbfd04e8d7104ce3bd9b7e3950bbe0ac0dfa3892e1c1e5992642d6ef0ce7 SHA512 dcc6afe0c91436cdbad7bedb72557c72b0cc97c1714bbe41905e5e3fd6956e47c82226df09be2041d1935bd4031fdbc1c1b178e031d3eaaf6f587a0cf3d68f42
 DIST v3.12.0a4.zip 28626963 BLAKE2B 8681e14da3c22b64478f8a39df645789e018cb387d2b6dc8e087bb7788c2571d05cd78e7eb418976a82a40f9e9ca15a8857b3576575832b6ea0fc9d1dac5a233 SHA512 fbfb7adb2522513815aa367416a7634dcc9934cbb077f6861affbaf2da771b69732930b57d4e8a665c698d08b970dede423e79f262eb2e57e4ebda1544901cf7
-EBUILD python-nogil-3.12.0.ebuild 14634 BLAKE2B 83cdcb81f0cf27171a883b1fcaa4ab8c2d56beb3cd11c2d404be5665ddb3a99095fbe53e3ac5ff079a06be32ccdb6bf10b136aa3e2b49cf7638c73dce4efaba3 SHA512 4f8743d1670f0c8331ced713bc2acc07ea27faa3306cc2b24fed73844d8aa095a74d052251dcf5c1411637565ae120eab570b624b14ffc9b14d22b4430b0f8c3
+EBUILD python-nogil-3.12.0.ebuild 14683 BLAKE2B af3ca6de0a744179358f9218c1ea37d277fd4ce9fcc3224e4060576bda44db81277bd8aa4e090ef9d30f7f44c2ca29d8278be9eb3b50954203e74a81704a9c3d SHA512 83230d3f0f2bc3f0b01292e4aa01296375ac0fc76f47fd0ef913ba9eec25aa3b6a2e5e6441da7ff0b8cd3b223fb8559be3cb75e0a09d3c3aead2978e434aa86b
diff --git a/dev-lang/python-nogil/files/10-fix_dbm.patch b/dev-lang/python-nogil/files/10-fix_dbm.patch
new file mode 100644
index 0000000..5ecfbc1
--- /dev/null
+++ b/dev-lang/python-nogil/files/10-fix_dbm.patch
@@ -0,0 +1,58 @@
+diff --git a/Misc/ACKS b/Misc/ACKS
+index d50cb3c2d1ee4f..169afc6eb383e4 100644
+--- a/Misc/ACKS
++++ b/Misc/ACKS
+@@ -640,6 +640,7 @@ Tiago Gonçalves
+ Chris Gonnerman
+ Shelley Gooch
+ David Goodger
++Michał Górny
+ Elliot Gorokhovsky
+ Hans de Graaff
+ Tim Graham
+diff --git a/Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst b/Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst
+new file mode 100644
+index 00000000000000..26a7cc8acaf243
+--- /dev/null
++++ b/Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst
+@@ -0,0 +1,2 @@
++Fix a regression in detecting ``gdbm_compat`` library for the ``_gdbm``
++module build.
+diff --git a/configure b/configure
+index 946218fd8d8568..224bfaa80da47b 100755
+--- a/configure
++++ b/configure
+@@ -14703,6 +14703,7 @@ fi
+ { ac_cv_header_gdbm_ndbm_h=; unset ac_cv_header_gdbm_ndbm_h;}
+ 
+ if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
++  { ac_cv_search_dbm_open=; unset ac_cv_search_dbm_open;}
+   save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ save_LDFLAGS=$LDFLAGS
+@@ -14762,7 +14763,9 @@ $as_echo "$ac_cv_search_dbm_open" >&6; }
+ ac_res=$ac_cv_search_dbm_open
+ if test "$ac_res" != no; then :
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
++  have_gdbm_compat=yes
++else
++  have_gdbm_compat=no
+ fi
+ 
+ 
+diff --git a/configure.ac b/configure.ac
+index 22028972cb3d19..8f6a9c24fcb039 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4118,8 +4118,9 @@ AS_VAR_IF([ac_cv_header_gdbm_dash_ndbm_h], [yes], [
+ AS_UNSET([ac_cv_header_gdbm_ndbm_h])
+ 
+ if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
++  AS_UNSET([ac_cv_search_dbm_open])
+   WITH_SAVE_ENV([
+-    AC_SEARCH_LIBS([dbm_open], [gdbm_compat])
++    AC_SEARCH_LIBS([dbm_open], [gdbm_compat], [have_gdbm_compat=yes], [have_gdbm_compat=no])
+   ])
+ fi
+ 
diff --git a/dev-lang/python-nogil/python-nogil-3.12.0.ebuild b/dev-lang/python-nogil/python-nogil-3.12.0.ebuild
index 46bf626..31aca8a 100644
--- a/dev-lang/python-nogil/python-nogil-3.12.0.ebuild
+++ b/dev-lang/python-nogil/python-nogil-3.12.0.ebuild
@@ -125,6 +125,10 @@ src_prepare() {
 		"${WORKDIR}/${PATCHSET}"
 	)
 
+	PATCHES+=(
+		"${FILESDIR}"/10-fix_dbm.patch
+	)
+
 	default
 
 	# force the correct number of jobs
diff --git a/metadata/md5-cache/dev-lang/python-nogil-3.12.0 b/metadata/md5-cache/dev-lang/python-nogil-3.12.0
index 9d709de..f742341 100644
--- a/metadata/md5-cache/dev-lang/python-nogil-3.12.0
+++ b/metadata/md5-cache/dev-lang/python-nogil-3.12.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3nogil
 SRC_URI=https://github.com/colesbury/nogil-3.12/archive/refs/tags/v3.12.0a4.zip https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0.tar.xz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	5f49a16f67f81bdf873e3d1f10b10001	autotools	3af8f60c4bdb23e738db506a630898ee	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=56dcefcd4d62e9573a4942afec4b6905
+_md5_=0f1de0f31c369879f21d2c0c989628ff