10 files changed, 105 insertions, 59 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5f6734788532..1b221b60a144 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index dd7c43eec1ca..27cbd006954e 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,3 +1,5 @@
+DIST dex-0.10.1.tar.gz 13224 BLAKE2B 97d39251d67f89880b7c6252ec1da77f9188b432bce1e6f7e66205363cd3aa876b1a192f4e2e7193e41a0ae7835e6da499c6e64b7f9bae0359028f539d11753b SHA512 4832e60416f07b90d4f4d03d6493322ccd44a73270edf289d80136587859d137cf39db12fc5cf38d3bdfa46aae3a4d1353c7776e702240b560a287190bdc2b57
 DIST dex-0.9.0.tar.gz 10056 BLAKE2B 7abc01ccc6938e926840e4448eb6436db77703c1f8e1fef334d97196803a0b59af0f05fc507d1ac4337367120f7d9d9a211aecec6ac3644424edee3599067a89 SHA512 d68f5482cb0948f27a724437ddfc6de9a0f502bfd0d5c60c76fb85dda3c30e4c432013e530f6a91138c9ac9ff36b3824cd5e382e9d29bb9fb2ec2b9de4133094
+EBUILD dex-0.10.1.ebuild 1028 BLAKE2B f0502ac62e63128370f8ad4b2d0f9d077b98729c6728064e21d2a618e158161ea743916ff3534d4830e6e747d56c7f67d350ec2286826ad726e1263035330e5e SHA512 112d1eebc62d4e43273d582071669f3962c4352017d323479186df00f0034152f044607751a66c49d5ecb3ed45526dc2e3db2f9ef5f1735527db07c05e4ce784
 EBUILD dex-0.9.0.ebuild 1016 BLAKE2B 40a7c0d780c1af086d0f08d4cc3c2615cdb0c5c257250c8650a59cf72e01a5eca3db77cf7d2f426389194ffb77b2bd195fe4f874706a6620cc5ad3148d3a4b22 SHA512 e11b5748c01ef160737ae1c1bc73df26887e11e70e50c330fceb672ba3a35ffa113a8cc97e28f6d222e1ed915dad7ce4f61d672d86bbca04181d47985aa7ad34
 MISC metadata.xml 241 BLAKE2B 2d8350e134c84a3974a561b48212a687b01b2507994e61afec958cad35c2fca29bfadc9918c4b101f5e75a257a7c434c0daa9d4cd6adcfa11433a675c7571fd7 SHA512 2d448dfb1d937c52578e7ad1bfd45a369712bab97c4c923ca6df5f75cdd5e79cd7448b65a0814849c3219043c0ad45a08908c58e61caf09d612b3c441dc9e42b
diff --git a/x11-misc/dex/dex-0.10.1.ebuild b/x11-misc/dex/dex-0.10.1.ebuild
new file mode 100644
index 000000000000..bf7d77c4a784
--- /dev/null
+++ b/x11-misc/dex/dex-0.10.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit python-r1
+
+DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
+HOMEPAGE="http://e-jc.de/"
+SRC_URI="https://github.com/jceb/dex/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-amd64 -x86 -amd64-linux -x86-linux"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# https://github.com/jceb/dex/issues/37
+
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( dev-python/sphinx )"
+
+src_compile() {
+	# Makefile is for creating man page only
+	use doc && emake
+}
+
+src_test() {
+	dex_test() {
+		./dex --test 2>&1 | tee test.log || die
+		if grep -q "Failed example" test.log ; then
+			die "Tests failed with ${EPYTHON}"
+		fi
+	}
+
+	python_foreach_impl dex_test
+}
+
+src_install() {
+	dobin dex
+	python_replicate_script "${ED}/usr/bin/dex"
+	dodoc CHANGELOG.md README.rst
+	use doc && doman dex.1
+}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 1fc6d0eca015..4bc3c8ec7cbc 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,6 +1,6 @@
-AUX dunst.initd 269 BLAKE2B 0f411e08b79669e6ecd5e61060372ec6766d1f18ed6630e1172a8ae47807c73a164aeb1ea7a043bfdcb4f43e4dba5a34f98b39da340bb37f6baa1353abbe60c7 SHA512 d1aa6b9ec1820902f5dbe84ed7590d16cb9b8312aff106d8dfde9d1b70451bcd017baaf02c845847a34cb565c7b2789d6743803638158e72fe7e82b49ba693a5
+AUX dunst.initd 279 BLAKE2B b682183552677b8b3992b322cecb0273cac7a27074b64210e335b0375eb957e6fa0bc944acb0f2cfc2808e44e7d9270605e664ca489e01d15c66e3d39aca3388 SHA512 276c626b4425a0320620b390869e1ce03a1eb372e70ed3d85323933c95406fcb45bb5a3cf3f881133777eac13b0cf3c8fcd09221dde070730d09b2cec2c2909a
 DIST dunst-1.12.1.tar.gz 4654978 BLAKE2B 61dfb8c3e56367cb2afed925f4ee66891ae8edd68837d6391889972aff46683eb5fe8fbf5951e30d6be9074aa648be480847e46cc36c2db6bb4024b42c02064c SHA512 0b4ef72bde6bd4b535f11b58d8bf463df3b9b06d5e2ff40e327eb25f13771eb52c7f7aa91590c6d1228ecb3bc2105510409b6984dd45b5e747c1141f3b79b46c
-EBUILD dunst-1.12.1-r1.ebuild 1916 BLAKE2B dfeea0d0d3843882fb26a1dbeebbc245cd6a2d73431b723442c09ec34d851073fea33b938e9b69317aca0c4c918450c8026b0fc358fcfce69fa1cc51ba27aa79 SHA512 824e67d2e986ce1b18f28be122d200c4bdc35d0742ba1381fcf5c8ffdc9ee1a67f647d388ff3d65e6cd2171bdb2cb2bc0be7cf2934285c9f3375364b4abd1403
+EBUILD dunst-1.12.1-r2.ebuild 1916 BLAKE2B dfeea0d0d3843882fb26a1dbeebbc245cd6a2d73431b723442c09ec34d851073fea33b938e9b69317aca0c4c918450c8026b0fc358fcfce69fa1cc51ba27aa79 SHA512 824e67d2e986ce1b18f28be122d200c4bdc35d0742ba1381fcf5c8ffdc9ee1a67f647d388ff3d65e6cd2171bdb2cb2bc0be7cf2934285c9f3375364b4abd1403
 EBUILD dunst-1.12.1.ebuild 1848 BLAKE2B 021bd5b9642dfc767c9456181ac18a381f607492eb20328db0607cdfa51d6077360cc7bdef834d5bcd7db2b6e6843bbcfe523f71af81a6cb7a584baf251bd863 SHA512 f8779bf9eda90829f29b48c63fa94a70cd4907def66a0e7f687ef5da0451905c470be564a9a88afba9bca78d8e90b43ae7ce31895e12f5ce180ba12983f3ed8d
 EBUILD dunst-9999.ebuild 1839 BLAKE2B c7f0b60d826f555e1415b3eff5caa276d9da8a6393226a9e698ef194bd201d700f730a1b7293d2138b60319190b751838868bcaa9ea11e3939245d7005172a78 SHA512 0774a06de0ad17b4454c6cd2b0636795d7dc136ab2698c0e7ac97556e20e04c719ca29be9141523071a9155ad1f230fbc14f58cc0ecb4970faf56edba8098d40
 MISC metadata.xml 583 BLAKE2B 0e304f035c74e14c1551e0e15eafac158cded052a39b893ab63b72f700a3d151fe048db153b00a1c98145261e8d6f56e609e215e95ff75de091d6f33156c9f14 SHA512 31932adf73148096301e796a0320332efd87f5b855d51618c81bb661611ef51d151ed2ea9575e3e64702368ca0791a9a5b9c8d2b6c036e1d11ce8bf04b7dc151
diff --git a/x11-misc/dunst/dunst-1.12.1-r1.ebuild b/x11-misc/dunst/dunst-1.12.1-r2.ebuild
index f5a7861e403a..f5a7861e403a 100644
--- a/x11-misc/dunst/dunst-1.12.1-r1.ebuild
+++ b/x11-misc/dunst/dunst-1.12.1-r2.ebuild
diff --git a/x11-misc/dunst/files/dunst.initd b/x11-misc/dunst/files/dunst.initd
index c5bfa4cc8bc7..8ed0f8c38ad5 100644
--- a/x11-misc/dunst/files/dunst.initd
+++ b/x11-misc/dunst/files/dunst.initd
@@ -6,6 +6,6 @@ depend() {
 	need dbus
 }
 
-export DBUS_SESSION_BUS_ADDRESS="${XDG_RUNTIME_DIR}/bus"
+export DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
 supervisor=supervise-daemon
 command="/usr/bin/dunst"
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 3bedaa850b2d..66af19f395d4 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,4 +1,5 @@
+AUX vym-2.9.562-docdir.patch 787 BLAKE2B cebd12f15551bf7853637d819ceed6ac4cd73f93c7b53e7bfd482274f31d1c991e5779ba041df4490299f48b7b19a469b79cd4a3c16041e3db5dc8871e7db430 SHA512 f9eff8bbb7f58fe78bfdc67e7e61c86c39ecb8c42122c2b16f8e6737b02b784d2d5227787329e6e06ce603f9b3e50526ca525188fa2569c00caa835d1148731c
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
 EBUILD vym-2.7.1.ebuild 1485 BLAKE2B 4cc2724618c943c9d275ac312ef103c2486e94d6cd61e16d4b1a1aa4f30a0784b663f507e77a8134e4be0d5b4979cbd77a89c7b70e3102a4138804422b48685a SHA512 7a07e73c358b1e41aa00091cc832ff0f87357056e6076866454d20d8a0671d8e92c8805b167163f386f3f9ca5b17a45c984040be48c32ff6f1d01f39be1d988a
-EBUILD vym-9999.ebuild 1438 BLAKE2B de14c0e7d4271d41c111bd0f7ee03fe9bea905ef5c07d4e919e674e5abe2320ec1680752d4f17e348c66515ef481c56eea6676a293aaa87e04633a5a47ae6281 SHA512 62f644a969e0c05047ee1cc40e474e4588ebf3074ca8b1f043f24f21f2e46b80ed3dafe05c5c187debce4b135fad984dcb31f23ee696724d5a6e780e74f9c664
-MISC metadata.xml 350 BLAKE2B 18b34b3a4b25c5b82d90704cc19390119cff967fea43fd6b45be5939d1c2386aca47ba4f938a7b961cb2b1e58b957f43e884771161b8dc7120bd09a53bdbb466 SHA512 f52ac1b5b5523866091a8221000c4d68f509c3656838b1560265d7d3bdddd7e8a25dcfccba90ba8dc60e658772cad3541dccfa9d401174ca5858660768484760
+EBUILD vym-9999.ebuild 1106 BLAKE2B 8af75767170cb45aaadfc46c21cfc7799757c811d4722db8729b2733c7aa0ea4241e3cd95337999819d70fa4646c8b2fa9af9f0aa7ab54bb708acf02380c9c1c SHA512 025b60b30fbfab53ad7323132c3bd1742df7dd4b40d6fc9d672a25eb5029d615939748eb68dcba90a54102a05204e48f3676ffeb20b417f120a79020c52ee428
+MISC metadata.xml 421 BLAKE2B 981af077c6c28d2f3a3c58a6e6bf029c0ecf17c62d68a384ddaada4c3f715bcca5be5f4ef0830787d2002e342c6b9dc12c61208d871d687f7ae8e8d9465a0c23 SHA512 b8fe57c75b023865e0c42de2085d6ff2cde47307e7a8288035b637166f0e5552475b080e86ed19090d36715eb5675843eb6eec25414cc7f0f288b073503ba305
diff --git a/x11-misc/vym/files/vym-2.9.562-docdir.patch b/x11-misc/vym/files/vym-2.9.562-docdir.patch
new file mode 100644
index 000000000000..fffe2bfb64ef
--- /dev/null
+++ b/x11-misc/vym/files/vym-2.9.562-docdir.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -171,9 +171,9 @@
+     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/translations)
+ add_dependencies(vym make-translations-directory)
+ 
++ADD_COMPILE_DEFINITIONS(VYM_DOCDIR="${CMAKE_INSTALL_DOCDIR}")
+ install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+-install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf")
+-install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR})
++install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf")
+ install(FILES README.md LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+ 
diff --git a/x11-misc/vym/metadata.xml b/x11-misc/vym/metadata.xml
index a5dd1392ab72..187e7d2f2cd3 100644
--- a/x11-misc/vym/metadata.xml
+++ b/x11-misc/vym/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">vym</remote-id>
+		<remote-id type="sourceforge">vym</remote-id><!-- old repo -->
+		<remote-id type="github">insilmaril/vym</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index d1943a94621b..fb39e0dab9b8 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -1,78 +1,58 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW"
-inherit desktop git-r3 plocale qmake-utils
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/insilmaril/${PN}.git"
+	inherit git-r3
+else
+	COMMIT=""
+	SRC_URI="https://github.com/insilmaril/${PN}/archive/develop/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-develop"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="View Your Mind, a mindmap tool"
 HOMEPAGE="https://www.insilmaril.de/vym/"
-EGIT_REPO_URI="https://git.code.sf.net/p/vym/code"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="dbus"
 
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/linguist-tools:5
+	dev-qt/qtbase:6[dbus?,gui,network,ssl,xml,widgets]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtsvg:6
 "
-DOCS=( README.md )
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
+PATCHES=(
+	# fix install dir for doc, remove gzipped man, set VYM_DOCDIR
+	"${FILESDIR}"/${PN}-2.9.562-docdir.patch
+)
 
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
+src_prepare() {
+	cmake_src_prepare
 
 	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	plocale_find_changes lang ${PN}. .ts
-	plocale_for_each_disabled_locale remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
 }
 
 src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
+	local mycmakeargs=(
+		$(cmake_use_find_package dbus DBus1)
+		-DCMAKE_INSTALL_DATAROOTDIR="share/${PN}"
+	)
+
+	cmake_src_configure
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
 	doman doc/vym.1
 
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
+	cmake_src_install
 }