Merge updates from master

app-misc/doublecmd-bin/Manifest

@@ -2,3 +2,7 @@ DIST doublecmd-1.0.11.gtk2.i386.tar.xz 7555420 BLAKE2B 7b80c8eac6d561b054375ea89
 DIST doublecmd-1.0.11.gtk2.x86_64.tar.xz 8315448 BLAKE2B 74ae77064382a76bb743bf63c3f152788156e9e178ab3fd7e2fb4e645e2cd6f1c34365b350490e45521c6d550bad543b94d9ef226f64284b347c1a7f097e33f6 SHA512 edf881df859e6ea4f7de9b65111b9ff4bc4dc0bd1c5a84e1ac218c0ffbf76fcf6ea99f3e412f037a591ee9401261afb95312ba95f197bb3d974f07868bf88f04
 DIST doublecmd-1.0.11.qt.i386.tar.xz 7946756 BLAKE2B 828f0925da2939f9234eb587628ec6b038942b26d96d1372e2985055e176a3970048c1e25c0f44a9bde72afc5120215e5534a61d8530f3a64a4ee890657ffc82 SHA512 25fe8d71df7172e64915db2e3a025f5e3e45582f20893bab53db62968d810ddc4c4e9801a9c320821e4bbc22130944d40a7e81fa8cf5d4ce3fe641956990ead8
 DIST doublecmd-1.0.11.qt.x86_64.tar.xz 8649332 BLAKE2B 5009b9b001a5605bf130485ee92a39c1310ab2abe543e39278dccca3240a4558e53d2fd9f1fe6010f01da2f82fe625da5ebd1d7aff326e81dcf82abb83e93582 SHA512 2dd4088ea9b7309bf5d9f9bee2bf590d11e1e96690393fae17f04a8b59d7e245fc1c43c6e92a2a44a37e59c54448d42b562ff98fe36eeab85999013ba1719da6
+DIST doublecmd-1.1.4.gtk2.i386.tar.xz 7973708 BLAKE2B 01c4693d1e3eca3930336cb4da463198e7c992e789c6a455e4a47cb1649823afa7f538924f6d47426455f05f372110faa613041185b05c6f804c402f284578e4 SHA512 229edda6cc43813107674cf79686a4ba578da99bd280e565fbf49b82934a629008738fd14f7f113594b36ddecef4b5fb5177ed74d17d9f5383de2cfb0eb857a9
+DIST doublecmd-1.1.4.gtk2.x86_64.tar.xz 8748536 BLAKE2B 766edef7883ebf6338a3b8b8413cbdf158fc4cdc54199153a671021ba51950c8515cd709ad12e06f268d182fcc36d09e44e15a265248f23d209ca40c4e9c1069 SHA512 e035f6ca7550371cbfbf2e4a7203b2065e5a2bcab974885619132a8279442d5699a5cd2d59999076ef242c128ca5c173dc2bec47db58efaf2e05313e63d141b2
+DIST doublecmd-1.1.4.qt.i386.tar.xz 8364992 BLAKE2B da737c16cf42c0302875d98775813d593e9a1f031451e14598382f2b17fed00f97e6de6be1c33ba45d13f5a924ca95a81d7a335f9a5839472b755f26f6b53f2d SHA512 434797d4f52c89d556dd4db2df409d0c529ca2d067a393fc9a0ccca11f96cf8ef6424866100b6034924bf01c412ce71ac975dbe3abc366522d72af452d0fd832
+DIST doublecmd-1.1.4.qt.x86_64.tar.xz 9079448 BLAKE2B 009543832e458da4c374d044884b0839f2f0e91dd5e1985d05b720893a929558048becb52a2649b56ab6ec17cc00cbb91002c48f1dac5808787b581730429d58 SHA512 3033b13ce04570f45246663c924161dd316fd6254211c0c0deddfd13bc11f96911c52e1e6013d9c993daf357feb280764897f26d1eb1e3a9c96eccf8f2a82a3d

app-misc/doublecmd-bin/doublecmd-bin-1.0.11.ebuild

@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}"
 QA_PREBUILT="
 	*/doublecmd
 	*/libQt5Pas.so.1
-	*/libunrar.so                                                                                                                                     │
+	*/libunrar.so
 	*/plugins/.*
 "
 

app-misc/doublecmd-bin/doublecmd-bin-1.1.4_beta.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+MY_PN="doublecmd"
+DESCRIPTION="Free cross platform open source file manager with two panels side by side."
+HOMEPAGE="https://doublecmd.sourceforge.io/"
+
+SRC_URI="amd64? (
+		gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.gtk2.x86_64.tar.xz )
+		qt5?  ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.qt.x86_64.tar.xz )
+	)
+	x86? (
+		gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.gtk2.i386.tar.xz )
+		qt5?  ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.qt.i386.tar.xz )
+	)"
+
+# Licenses for package and plugins
+LICENSE="GPL-2+ LGPL-2-with-linking-exception LGPL-2.1+ LGPL-3 GPL-1 freedist"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="gtk qt5"
+REQUIRED_USE=" ^^ ( gtk qt5 ) "
+
+S="${WORKDIR}/${MY_PN}"
+
+QA_PREBUILT="
+	*/doublecmd
+	*/libQt5Pas.so.1
+	*/libunrar.so
+	*/plugins/.*
+"
+
+## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2
+## (maybe virtual/libc-1) and no libraries of sys-libs/ncurses (that removed here).
+## x11-libs/X11 is optional dependency of dev-qt/qtgui:5 by [xcb] or [X]
+## therefore it is mentioned here explicitly.
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/libX11
+	virtual/libc
+	gtk? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+	)
+"
+
+src_install(){
+	insinto "/opt/${PN}"
+	doins -r "${S}/."
+
+	# Remove doublecmd.inf to use config from user home directory
+	rm "${ED}/opt/${PN}"/settings/doublecmd.inf || die
+
+	exeinto "/opt/${PN}"
+	doexe "${S}/${MY_PN}"
+	make_wrapper ${MY_PN} "/opt/${PN}/${MY_PN}" "" "/opt/${PN}" "/opt/bin/"
+
+	doicon -s 48 ${MY_PN}.png
+	make_desktop_entry "${MY_PN}" "Double Commander" "${MY_PN}" "Utility;" || die "Failed making desktop entry!"
+}

dev-python/Pyro5/Pyro5-5.15-r1.ebuild

@@ -26,12 +26,15 @@ RDEPEND="
 	>=dev-python/serpent-1.40[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-test-on-ipv6.patch
+)
+
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source \
 	dev-python/sphinx-rtd-theme
 
 EPYTEST_DESELECT=(
-	tests/test_socketutil.py::TestSocketutil::testGetInterface # https://github.com/irmen/Pyro5/issues/82
 	tests/test_server.py::TestServerOnce::testRegisterWeak # https://github.com/irmen/Pyro5/issues/83 (pypy3 specific)
 )
 

dev-python/Pyro5/files/Pyro5-5.15-fix-test-on-ipv6.patch

@@ -0,0 +1,36 @@
+https://github.com/irmen/Pyro5/commit/8db91b617dd08508053e54dea2a781749a00ffc8.patch
+https://bugs.gentoo.org/915997
+
+From 8db91b617dd08508053e54dea2a781749a00ffc8 Mon Sep 17 00:00:00 2001
+From: Irmen de Jong <irmen@razorvine.net>
+Date: Sat, 21 Oct 2023 21:48:56 +0200
+Subject: [PATCH] made getGetInterface test work with ipv6 localhost
+
+---
+ tests/test_socketutil.py | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_socketutil.py b/tests/test_socketutil.py
+index ef0720d..c9467ae 100644
+--- a/tests/test_socketutil.py
++++ b/tests/test_socketutil.py
+@@ -56,10 +56,15 @@ def testGetIP6(self):
+ 
+     def testGetInterface(self):
+         addr = socketutil.get_interface("localhost")
+-        assert addr.version == 4
+-        assert str(addr).startswith("127.")
+-        assert str(addr.ip).startswith("127.0")
+-        assert str(addr.network).startswith("127.0")
++        if addr.version == 6:
++            assert str(addr).startswith("::1")
++            assert str(addr.ip) == "::1"
++            assert str(addr.network).startswith("::1")
++        else:
++            assert addr.version == 4
++            assert str(addr).startswith("127.")
++            assert str(addr.ip).startswith("127.0")
++            assert str(addr.network).startswith("127.0")
+         if has_ipv6:
+             addr = socketutil.get_interface("::1")
+             assert addr.version == 6

sys-apps/asus-touchpad-numpad-driver/asus-touchpad-numpad-driver-0_pre20220311.ebuild

@@ -27,9 +27,9 @@ DEPEND="
 	dev-libs/libevdev
 	sys-apps/i2c-tools
 	$(python_gen_cond_dep '
-		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/libevdev[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-libevdev[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="
@@ -47,5 +47,5 @@ src_install() {
 
 	python_optimize "${ED}/usr/libexec/${PN}"
 
-	dosym ../libexec/${PN}/asus_touchpad.py /usr/bin/asus_touchpad
+	dosym -r /usr/libexec/${PN}/asus_touchpad.py /usr/bin/asus_touchpad
 }

sys-apps/asus-touchpad-numpad-driver/asus-touchpad-numpad-driver-9999.ebuild

@@ -27,9 +27,9 @@ DEPEND="
 	dev-libs/libevdev
 	sys-apps/i2c-tools
 	$(python_gen_cond_dep '
-		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/libevdev[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-libevdev[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="
@@ -47,5 +47,5 @@ src_install() {
 
 	python_optimize "${ED}/usr/libexec/${PN}"
 
-	dosym ../libexec/${PN}/asus_touchpad.py /usr/bin/asus_touchpad
+	dosym -r /usr/libexec/${PN}/asus_touchpad.py /usr/bin/asus_touchpad
 }