gentoo auto-resync : 05:03:2025 - 01:46:50

4 files changed, 52 insertions, 56 deletions

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
 }