gentoo auto-resync : 03:06:2024 - 00:07:25

4 files changed, 49 insertions, 4 deletions

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index efc6f0d70e0e..1060f4e66fb2 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,8 +1,9 @@
 AUX dtc-1.7.0-meson-macos.patch 1303 BLAKE2B 1b479891e150a990fb560aac8e74604ee97373ab7bb26f3171552bcad6c8c649e0c4a57630ab85bdcff1cf49c7318a3e154112be65e70a2fd078774d4ed17ed1 SHA512 ff70b6396410ad45dd49fb83cf2762ba081a8f221e9713934497b562b119951f0a50eb041680ba2318059537af54015047aacf03f38259005cfb86b0f002961f
 AUX dtc-1.7.0-meson-tests.patch 1265 BLAKE2B f121b676e2f711e6be75ff4f2c7a077b7e9efd682cd29dea08135958e8c9f29ce9b4ff42c1bfc22d77927d749d44264647e47e49d260a7760151fa1dae93648b SHA512 4afb9bc6b2615ba58ae5d997807563ec8672a9253a9d5a15ea5ed476ab1cf80229de3ca0289f2b016c31d6bb9adc2ecae46d004425244cc699768159b8929761
+AUX fix-tests-for-Python3.12.patch 1914 BLAKE2B bdb612e1aa3d42a6d17bf1663f40cec2ebc2222ebedcd67bcb6f20c4cdb389f9cc0c4f7513d56de659996f76d0311551dc0e513612cdd7cc367126ca26398de7 SHA512 2fc10469b4c1f5016cdccd1a1e24d1f0984267c88efe88d268d52d9a49c441d832f53bf004a5223810c82e0f10cf5b515d6a6ddb56e49ca5bb86b55724634f0b
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
 DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb
 EBUILD dtc-1.6.0.ebuild 1504 BLAKE2B f9159399aec94cb17d0920543031bd7c076f22bac9cce5ad8cb7f45d762d4ff67b287e35cbca287c1e3cd951be0cd01bc45dff3fa978990b064e827a0d43ee9f SHA512 89d8c7de7ef502b13874f4cdb48b0fd2a545f817ba568659a2e8741455a70a4a22406a58f59a8ebaddacceceb32df421b956113901e8c6071e52eb3cb3e99ddb
-EBUILD dtc-1.7.0.ebuild 1610 BLAKE2B b84a90679c2decf914e5990957aef4237ff03d31682faf2ad52c7193c86734a02a2ece35165e2385ead1f3147ed2f10bea9f8d7eb9f631d6e11f5286a283b30a SHA512 77080099ec63babd08559edef3b8c0187ffe481734aa4a93e252203de112623fc9d99854d3320c5c83b8d58549ab23d0b0842ccf0bbe43e19d61adf3a979a888
-EBUILD dtc-9999.ebuild 1529 BLAKE2B aa7b0c6f73db039a802f67bb51cf90dc1adf88f6f8df8bbb71f2b2817b22cfd9570d569eeed9c0c8a21cd74b2ef1a618cb297693017ff487d593a983783745e1 SHA512 7945f2fffb16faf25444962323b17f20023da742e2cba209c187777935c8220f026b78033bb6e9b4d30ca6742761a303d189780f5a1ac0a4d823e9ef37066eac
+EBUILD dtc-1.7.0.ebuild 1656 BLAKE2B 75d792778b89f1af2328c1246eaedac5f8da391c9d72a91765357080103102caf31205e82008bb761fa113380631b7b51d1bfc98110ec96c108031eabddbf6ff SHA512 4f78ed0eee341e1779f4b0b87afde3e6522848c49fec376995990879bb63eaa618e1dd8267397c7cc57f1038cff5da00314b0032f425339604b9628992176022
+EBUILD dtc-9999.ebuild 1529 BLAKE2B 72c6452b6b76364eccb0ae7176871cc669ecd5bce5764342f7c91402385e05fe15fd7feb7f32af78b6caaf43fa26af48a7810e4bb3b5f0969b40c2f6171111f8 SHA512 9705931992cf9b108532f79f5ce4dd0ee98dc464e9eef0a75694c0641cb1e00dace8ffdd9ec15a40a2c74acc362e5a644d529859a510d19f082590354673967b
 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
index f674774c831b..bcb50ad71a85 100644
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ b/sys-apps/dtc/dtc-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1
 
 if [[ ${PV} == 9999 ]] ; then
@@ -44,6 +44,7 @@ DOCS=(
 PATCHES=(
 	"${FILESDIR}"/${P}-meson-tests.patch
 	"${FILESDIR}"/${P}-meson-macos.patch
+	"${FILESDIR}"/fix-tests-for-Python3.12.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index dd2aadfad28a..ad87023887a3 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
new file mode 100644
index 000000000000..7a08648f3835
--- /dev/null
+++ b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
@@ -0,0 +1,43 @@
+Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
+ 
+ Author: Héctor Orón Martínez <zumbi@debian.org>
+
+---
+
+Bug: https://github.com/dgibson/dtc/issues/123
+Bug-Debian: https://bugs.debian.org/1061318
+Bug-Ubuntu: https://launchpad.net/bugs/2051399
+Last-Update: 2024-01-30
+
+--- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
++++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
+@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
+     def testReserveMap(self):
+         """Test that we can access the memory reserve map"""
+         self.assertEqual(2, self.fdt.num_mem_rsv())
+-        self.assertEqual([ 0xdeadbeef00000000, 0x100000],
+-                          self.fdt.get_mem_rsv(0))
+-        self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        else:
++            self.assertEqual([0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
+ 
+     def testEmpty(self):
+         """Test that we can create an empty tree"""
+@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
+ 
+         fdt = sw.as_fdt()
+         self.assertEqual(2, fdt.num_mem_rsv())
+-        self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        else:
++            self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
+ 
+         # Make sure we can add a few more things
+         with sw.add_node('another'):