[gentoo-commits] repo/gentoo:master commit in: x11-misc/vym/, x11-misc/vym/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/vym/, x11-misc/vym/files/

[Andreas Sturmlechner]

commit:     05218d576195db8afa5f0d851fab450451d4e488
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jan 23 23:12:42 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  4 23:01:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05218d57

x11-misc/vym: switch live to Qt6

See also: https://github.com/gentoo/gentoo/pull/40302

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-misc/vym/files/vym-2.9.562-docdir.patch | 14 +++++
 x11-misc/vym/vym-9999.ebuild                | 86 +++++++++++------------------
 2 files changed, 47 insertions(+), 53 deletions(-)

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/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
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/vym/, x11-misc/vym/files/

[Sam James]

commit:     3aa7592a53e89b9877d1cf4b591d3871a69682b5
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jan 23 23:12:42 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 03:54:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa7592a

x11-misc/vym: update live with minor fixes

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/vym/files/{vym-2.9.562-docdir.patch => vym-2.9-docdir.patch} | 0
 x11-misc/vym/vym-9999.ebuild                                          | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/vym/files/vym-2.9.562-docdir.patch b/x11-misc/vym/files/vym-2.9-docdir.patch
similarity index 100%
rename from x11-misc/vym/files/vym-2.9.562-docdir.patch
rename to x11-misc/vym/files/vym-2.9-docdir.patch

diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index fb39e0dab9b8..c5ce74392d71 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="dbus"
 
 RDEPEND="
-	dev-qt/qtbase:6[dbus?,gui,network,ssl,xml,widgets]
+	dev-qt/qtbase:6[dbus?,gui,network,ssl,widgets,xml]
 	dev-qt/qtdeclarative:6
 	dev-qt/qtsvg:6
 "
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/qttools:6[linguist]"
 
 PATCHES=(
 	# fix install dir for doc, remove gzipped man, set VYM_DOCDIR
-	"${FILESDIR}"/${PN}-2.9.562-docdir.patch
+	"${FILESDIR}"/${PN}-2.9-docdir.patch
 )
 
 src_prepare() {