gentoo auto-resync : 15:06:2024 - 00:09:17

3 files changed, 31 insertions, 1 deletions

diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index cafc5e34d80d..036eefbc3efe 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,12 +1,13 @@
 AUX libftdi-0.20-cmake-include.patch 687 BLAKE2B 8817db6e200adcb3d76da91565fe25f694445a46325a6435d6d0545d6741b0d15b199f96aabf01ca664eeb3355008acc6ec309f5fa87f975584935ecd74558f7 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90
 AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014549bdae23e35fefb0d2f6cf14c4610d79ebfbbb11e94174b6c1ff260d83713c4c4db395c725bbe836142e0e80092324a3f SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91
 AUX libftdi-1.5-cmake-cxx.patch 1448 BLAKE2B f43c592cc17481e21dc1b0fe4a4cf583c3b2f192197133443f90dc1f9bd134fe903598dc9d12f92a8376bcd58f4cb698b9bd34ff4c06cf2df180260d2456126c SHA512 9881153611aa75dcc53f739bd510898f55d9fc56a07cec41e09fed37768c462663160d8491f7eaaa5dd7bc8935d36f33379d3529cfe355a3391507415a9e7cae
+AUX libftdi-1.5-py312.patch 1144 BLAKE2B cf2263322b71ac06ac23f94fff8b2b68763fda8eb9d59d5811ed02e178a8c866f0f045b9acaced3b8cb01924504f3e00fd5f10c16642e9e2089a18f56e2e2c6c SHA512 8f0bdf45028d586a3d5d28aac135e6ad04f4e28d44e5a16953db78253a37374c87bf085eb1969a716e906a22f0b6affa874f3bc8e39c1b4ffaf8a84cdd5f800a
 AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
 EBUILD libftdi-0.20-r2.ebuild 1934 BLAKE2B 33de7434c3034e134dd8dbd6aabf5ebff8749625b44506025561f7669002026c3d0381ed9addb28b3edfcc32dc86855ec7580fc35ffe08eddea389a523a607e3 SHA512 5cf7dc0ef8f0b905dd2cdad429c38d2ddc74dad99629113013d866de278b70e33ba008730222926fe97cfecc3004dbe00e1ce577f105c171527f8d146dfa9b36
 EBUILD libftdi-0.20-r3.ebuild 1945 BLAKE2B 7c0e7146a37b0566f55d9be4ff015031ade0757c649252b7f7fe81c14bb8ce7f2aef6f9c7b1fa1db92fff9d27ee6d9f9a2ee226423c17fb78f6b795d328bdd50 SHA512 ebb49e55791af0725fc1ecbda023b1c37288e0add6e3600b67207413707d838ba68f3597b57781e8b2a7fbb76fabc7257ba9a757effda1b52fa1df984477b1e2
 EBUILD libftdi-1.5-r5.ebuild 1946 BLAKE2B 55d8e7a04218032ea30f68fb0e8d8defd3473252ca6e0680e14e5fa5bf8d0a3dab96f9ff8fd855299d3cb1a442bded5d38c3c1c319262f0b98da95483fc6622a SHA512 66a6412fa2eee65872235f45684c2f3f09caaca07251a9f46ed3df4ae947bad7f3e56143ed32cc925c3ba04cb17d92ae80228149b943411c9be7d03b5dfd3286
-EBUILD libftdi-1.5-r6.ebuild 1957 BLAKE2B 2a70c7f1314c766a794175cfe1e42e9dc4cc29a6a6f4d5e913131e3ed2299a2e1065abc5875f950d1dc82b6037720ed13617e028102692c64c59d9d0fbc83458 SHA512 c11212c52637b6dbfaad5db0831d98da2b7a0e905b78621ac9263c6c8ab58eea0a4bf4029e5a3488140bba891caa5069119ee77ad108472258b66be8ef1cd577
+EBUILD libftdi-1.5-r6.ebuild 2002 BLAKE2B 9b7fd8138e22212a06492d48b852f48094d1522b8bad6e1db5e37df61c108bfeabf1db8a3d610fff16e137a9e8cfb1cfff84f204af3b4f7a85d978271d72936b SHA512 8539c45a90a5f864dc16dfe30e3956ce55d6a440d9130ff267938c4b8a39dab165737c639c98a96d76701f981a4784fd55e1f04d9bdbd96dc813f42338922495
 EBUILD libftdi-9999.ebuild 1922 BLAKE2B 2dcd66ae7692b36455886598ddfe4bafe9ed9214a286d9dff7666672ee6b044c1d0e5f634546c00570ed918581cefd4c6c2621a933cd820946c50c513177c7ce SHA512 118f30671a56383ae22c5e943d078b9a450f430ad418bb9f1190f4cd60f0cebea71e1f34f7030f38b866735d9ac941b17c30c3c2d3b6a1941a774f4117856b04
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/files/libftdi-1.5-py312.patch b/dev-embedded/libftdi/files/libftdi-1.5-py312.patch
new file mode 100644
index 000000000000..51fdd10efd81
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-1.5-py312.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/934224
+http://developer.intra2net.com/git/?p=libftdi;a=commit;h=abd19b721f7e9b4d514ed319ece173ebc7b1ea72
+
+From abd19b721f7e9b4d514ed319ece173ebc7b1ea72 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 19 Dec 2022 17:40:43 +0100
+Subject: [PATCH] python: move from distutils to sysconfig
+
+The distutils module was deprecated in Python 3.10, and will be removed
+in 3.12 [1], thus switch to the sysconfig module instead.
+
+[1] https://peps.python.org/pep-0632/
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -42,7 +42,7 @@ endif ()
+ 
+ set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES NO_SONAME ON )
+ 
+-execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print( sysconfig.get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )"
++execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print( sysconfig.get_path( 'platlib', vars={'platbase': '${CMAKE_INSTALL_PREFIX}'} ) )"
+                   OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
+                   OUTPUT_STRIP_TRAILING_WHITESPACE )
+ 
+-- 
+1.7.1
diff --git a/dev-embedded/libftdi/libftdi-1.5-r6.ebuild b/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
index c8a0cc141846..d176c11a73f3 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	python? ( >=dev-lang/swig-4.2.0 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py312.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }