10 files changed, 48 insertions, 17 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 4faf41b61f47..54dc5b03b84b 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/filebus/Manifest b/app-misc/filebus/Manifest
index e5a5802e933b..c4500840f157 100644
--- a/app-misc/filebus/Manifest
+++ b/app-misc/filebus/Manifest
@@ -1,3 +1,3 @@
 DIST filebus-0.3.5.tar.gz 17373 BLAKE2B bd49f86e658bcc8dcdcc7cc0c5ca1a3c354a716137157753417b9b57294c14f058292650092e7e8bdb5563e041c009f36474508fb121e14487075cfc41b223bb SHA512 639b047be8fd3eba9cf97e57d7234f590aeb28e6e321195b435480ce0b334e14c236b888e79d14a824b16505e1c2d2c1fc04dd5d75b6f7ac1c8e9fbae6bf562f
-EBUILD filebus-0.3.5.ebuild 1337 BLAKE2B b5795c7a4987bd70902d988a7b1bb2a6083d9e05c78fab8f298022a83d13815ab6199484b7a8715ac7d99c9d204d8f6705f893857008cacc05c940e9e3782f61 SHA512 cba712fc8cfd2da35e25a7ab6235a853fe7255ce64c5a2722544471ff3b4d86ed10690c82d30c72b340387a50ebde699ebfafebd4a0db06f72f37cc408902b2f
+EBUILD filebus-0.3.5.ebuild 1388 BLAKE2B 09fd4aaf65f084ab8e2d96b122fa871cbf184278fe53ab90de58938e484b5e08fea2558a76391d085de5e14196b0883e8f7f2dc3b522bd07141319fa8f4ac7c0 SHA512 ab8089fc45cf3d0684acd5c14c8f8ba2fa80e1223b3b3001452a57c3e35a8b5b5bfdc97a7186b943fbe82210149c7645cf271cb667cc3165da7543a38e8b721b
 MISC metadata.xml 344 BLAKE2B 5caade90b88d436416ff73af46b130b7b81e87f7c8850eac5eb6544432bec05da5c7d1f916f1f8306ff9dc13383dd6608667c8bc532712c57859ffd317fcde90 SHA512 4c172e9f8559f617647d0c6bf5b5408b53c5e26f9cfb96295584c594fcabfb768672c20ff4f16f4da738b391167aec2ea2f4929723f0167e8274df528c0bf561
diff --git a/app-misc/filebus/filebus-0.3.5.ebuild b/app-misc/filebus/filebus-0.3.5.ebuild
index c8eae8478dcd..71ab1c8994b0 100644
--- a/app-misc/filebus/filebus-0.3.5.ebuild
+++ b/app-misc/filebus/filebus-0.3.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 pypi
 
@@ -23,7 +24,7 @@ RDEPEND="
 		dev-python/filelock[${PYTHON_USEDEP}]
 		inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
 	)"
-BDEPEND="${RDEPEND}"
+BDEPEND="${DISTUTILS_DEPS} ${RDEPEND}"
 
 src_prepare() {
 	default
diff --git a/app-misc/jpipe/Manifest b/app-misc/jpipe/Manifest
index 206306a2e6bd..2431d46049c1 100644
--- a/app-misc/jpipe/Manifest
+++ b/app-misc/jpipe/Manifest
@@ -1,4 +1,4 @@
 DIST jpipe-0.2.0-deps.tar.xz 1216464 BLAKE2B 1e4f5ad82ffac2ab759675293f0eebcb31a9458fb70f5113941829604e71f1971e7fc1ac20828f1b41fb350f0637dda07758abff4fd367852158d655f89e2ab7 SHA512 e7f6565ba4304256fc650d9786be587d8827f922cab481bb0a578c0d55717b618980e822f92af97a7da94f3a8953c1987ba917637236f6823301ca184b42a9a3
 DIST jpipe-0.2.0.tar.gz 25188 BLAKE2B 427de1de0f6cc8e716065eda71d13bdae69e939e54dbdc8cc86077898d0d8f3feb4e77b4e8bbbe3f2c9218a7dfe8fbe2d20e6fcdf03f900dc09676610c58847b SHA512 8028eb555bec9fd590207b5052d14b8735deeead9e027cec3ae5e8d3a40aa05495857db8aa60a41cd405f279b823f74474262b55bb7e91316df790769f1950a6
-EBUILD jpipe-0.2.0-r1.ebuild 2170 BLAKE2B cbd7392404a1975253c9947e62f2b832b9c15c8962ad0de2b9683374769d09aca7ad5028cdd79730009e34eec11ccc4663f0ee8867235359c98d8db1959747e2 SHA512 626b0e68a26428ecb900cbe8af3383da5771b1fba186b01a1f880a0e35d7585073ce585331aa7485366901b822ffa2273733348a61c4837990666c6268d83c39
+EBUILD jpipe-0.2.0-r1.ebuild 2248 BLAKE2B b608b568273f94c51cb998e7d6b64298abc114f0340d1fb8867abde523393904fdd87535bb402c3fa609deb8e3ec4114221b3138c29b0142c2508acdfc3b40e1 SHA512 387a86af8a6168dcec2e59f1cda5ee9376e08cebeb54c4558cb4f90c85c4366d6b0bcda4e3490f2dca75608d9bec994e253f1bc179e5a5d8ccce06ef8107c07f
 MISC metadata.xml 523 BLAKE2B 531998e8d9ced9d9230fc6b0bb7b66406223f0bac941757cbef18b70f3843063666ec47459151f21bc330106286d4a0899e773761712fa1ea8eb990e6c0a9545 SHA512 dc667dede0ab53da577e565255daebaad2a725a22c00a1a943107a6d6d0fb42ff59c9b732bde11a47b766272314c0910425258a4ae246c11d17f6f1c9c43880e
diff --git a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
index ada99312a317..ac4e8aa09cd1 100644
--- a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
+++ b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 GO_OPTIONAL=1
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10,11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit go-module distutils-r1 pypi
 
@@ -21,7 +22,7 @@ RESTRICT+=" test"
 IUSE="jpp-symlink jp-symlink python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
-BDEPEND="
+BDEPEND="${DISTUTILS_DEPS}
 	!python? (
 		app-arch/unzip
 		>=dev-lang/go-1.12
@@ -40,6 +41,8 @@ RDEPEND="
 	)
 "
 
+distutils_enable_tests pytest
+
 src_unpack() {
 	if use python; then
 		default
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index 40ef219e91dd..4c7d1bb808c1 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,3 +1,4 @@
+AUX lfm-3.1-dont-error-on-wheel.patch 466 BLAKE2B fe01bacfd2851886e493191f6deac5d11d1ad7bc8674143c5e71031eb0caf1386a98d20f1df240ccc2f6ebecd7c2de64e85d2b4a22293a78429031fe525dccf0 SHA512 f78150a4a6bc1575b8c8d9a446138ccb1e7fe81b3ea621467c11bf246e02c7025ecead26188a79dff11c104d6fceb94241f874b6df89561125543a0166fa24bd
 DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
-EBUILD lfm-3.1.ebuild 451 BLAKE2B 2fe7246528f177ed70469560b270fe48676ddb61b43b3dc21a031070352731871b8f7fc1dceef60d5dba23885396a4fbeb45361da74b7dd81d3ef5ff754f8935 SHA512 5329e3499dea2a26e8bdbd47a996cf2a8e0ac0ab25c02cd250fff6b6b4451e080c0c22fe6b861a9c65e48d16453cffdc429e77029216bea9fd4d438d441ba6f4
+EBUILD lfm-3.1-r1.ebuild 647 BLAKE2B 7d200f60b86c566fb50f8158dc239c8a91344d68d91165abf83790470ce121d0ff5d27f494de095d9bcd6d9b227abae591fe0f410bb7e180d491c5693ee52eb0 SHA512 ae3b3309ddf16a61bdfd83bed410cdb57bc14a7097fdf3a248de9bf3eab5b557d0857e3065062a155e31c7e1fe22d9c550c31bad0e5de6d37ad88398adbd2476
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/app-misc/lfm/files/lfm-3.1-dont-error-on-wheel.patch b/app-misc/lfm/files/lfm-3.1-dont-error-on-wheel.patch
new file mode 100644
index 000000000000..d74014fb05ff
--- /dev/null
+++ b/app-misc/lfm/files/lfm-3.1-dont-error-on-wheel.patch
@@ -0,0 +1,14 @@
+diff -ur lfm-3.1/setup.py lfm-3.1.new/setup.py
+--- lfm-3.1/setup.py	2024-03-06 11:44:37.646520051 -0600
++++ lfm-3.1.new/setup.py	2024-03-06 11:45:18.058725112 -0600
+@@ -45,10 +45,6 @@
+     print('ERROR: Python 3.4 or higher is required to run lfm.')
+     exit(-1)
+ 
+-# to avoid bug in pip 7.x. See https://bitbucket.org/pypa/wheel/issues/92
+-if 'bdist_wheel' in argv:
+-    raise RuntimeError("This setup.py does not support wheels")
+-
+ import shutil
+ try:
+     try:
diff --git a/app-misc/lfm/lfm-3.1.ebuild b/app-misc/lfm/lfm-3.1-r1.ebuild
index 1404dff1e505..c6f5c61a6916 100644
--- a/app-misc/lfm/lfm-3.1.ebuild
+++ b/app-misc/lfm/lfm-3.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Last File Manager is a powerful file manager for the console"
@@ -15,3 +15,15 @@ SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/lfm-3.1-dont-error-on-wheel.patch )
+
+src_prepare() {
+	default
+	sed -e '/data_files/d' -i setup.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman ${PN}.1
+}
diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index e7874ebefd1b..98d1c258960b 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,4 +1,4 @@
 AUX ola-0.10.9-nullptr.patch 7412 BLAKE2B f03facd9b48493a47d35744d33edab8fbae87e0440053cd7f1610af40fae1a4d56b6a20beb2b3ca8b4fb64d023795ca9e12fd8149d69a150bc105f9978eaddbb SHA512 669ab2bab44cbab87f8c99f92799faa1422a0d0aaeb7da3c8b2dcdb71f47515e93f773b8fab372c66aa47a23797fce0725722ca25354e868ae2926510282058d
 DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581 SHA512 e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf
-EBUILD ola-0.10.9-r2.ebuild 2437 BLAKE2B f549d7c3ed854c24884653c06ffce6c2890d52947c067b92ee54322fb1156a67217b4da923937f3544e7ddb03b5929a82cdeb822e62f70886db11468ee16995b SHA512 d9ede9d22bace2100e82166c667f6a3e572422bd8f64e8712a1bb1f80a14338f791f034774bddc2681defcf88a143f8d24838a94f1f05885ce009db53928d615
+EBUILD ola-0.10.9-r2.ebuild 2437 BLAKE2B 36f4aa7fe9a2f4027ca307aecc0c025f405f2773e6987e4f9f2e0806c079b785dc0240f4872f061199ad7339b2b7f26d1f90d59b3e8f732370ba8d50f54f2f06 SHA512 82b91b2469bd5b723b60d28910e3efd90f10c0f8e4cff8db06a08f198f63aaf929328d43653e28f116d0538d8c45f2267974fdb7a72cf73c1d9277d6728fa2da
 MISC metadata.xml 1012 BLAKE2B 181177e538c6cdc37b3ba630b3bd3cffd1701e4f674cd51c6032c3b0367c11a0090482055328961e150203f47a1662597e2d0164c65c12662ce3ae2407db5a98 SHA512 01e6e96741b65a895229e7626e6fbfc51132d7b841c597933ea7055c302369264d014da1ff9c9bbad014c1cb812bb43d120a1d40c473c40eef6353ed4bfafc11
diff --git a/app-misc/ola/ola-0.10.9-r2.ebuild b/app-misc/ola/ola-0.10.9-r2.ebuild
index 38c75abc6bd5..a9d0c36ac512 100644
--- a/app-misc/ola/ola-0.10.9-r2.ebuild
+++ b/app-misc/ola/ola-0.10.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools python-single-r1