3 files changed, 6 insertions, 205 deletions
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index e4df87bb883a..b3dec6c017a8 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,10 +2,8 @@ AUX lyx-2.3.6.1-python.patch 2294 BLAKE2B 1980fe19607577d6b7462aaa4a049a41cbc329
 AUX lyx-2.4.0-fix-hunspell.patch 780 BLAKE2B 04c8373fa29e7a1d40901d83104832fe01ca96fca25a99f19d472cfb0387145b14c124fa44a6d2710f0d35e4dc7061c8935b1e03378154de85c2e4c4079269f9 SHA512 992c21e8d3e30bf2c14c006e19c969e93f447a12f0080bf59238ccc66967938fd10fa35387ab3943f0d39ab132b330876e7cf207e49c6ab174a731a2dc4f4ef3
 AUX lyx-2.4.0-prefer-xdg-open.patch 3138 BLAKE2B 95dd25064876a6ab58649249f0a42035bfdb6c91524dc7b6031017eb911efe7534c267e178b0dac26d0090409245962d153f81db3dd28785b11576e988ecef12 SHA512 e2f5a0484742af079bc69aff3056dd2d3afe8f952fd342f3e5da8445894bd8d6c60a575079bdee61a378ce20adba7e31e1e6a5cb6c2b00ba3b7d0b161c55ef12
 AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3
-DIST lyx-2.3.7-1.tar.xz 16158416 BLAKE2B 6041280ab0cd4dfa3c10e8ae01253ff657b4ac9ffe4cf61a3a2459b7aef152a7daf8ae306a09aaece799b6e7b6b15bc1aff62ab0f5d46508fbd79fd3e0b1c45b SHA512 b8aaefb68993032354fea3c6fd87d6da161395c92b5def4ecf92a7d6873ec59e01cdfb45c51ae1aaa62aa54db8e100b00ff9c2c9e0f1307c2f46860cd8c6eefe
 DIST lyx-2.4.0.tar.xz 17823824 BLAKE2B 924425bbbbc50c1e1b03e493a021be4f9b56344712407b46dc1ec75bd583f0f9803592d3fbdca70fdefdbb60056f0275ab4a25e251f728ed710ef796b50f711e SHA512 b52724a7f544f190c93b948c11b835057f73e417115cf67a5e586f6872816b3a4df7429d24b5323410a34a79f725052db57105649ff6c275141f97d391a2091b
-DIST lyx-2.4.0~RC4.tar.xz 17785100 BLAKE2B 15d3785934045e9e3f39426d7a48ae4b200b64f28dc953b69c9b1b6f7c3e6cfe163aeaaaccbea9bb3b89c321a95f3162bab5869a290e4d4be2658bc39d6b2d46 SHA512 fa131ed3323a273529a59266b693381c0123400b7207733398992c99b424831a2918d019353ee0f2e6cce24b47042039f1abdbfe1ceeb28e56e35da4bf9e8c96
-EBUILD lyx-2.3.7.ebuild 4652 BLAKE2B 49cdfe4a7fc8c1766966f6d2cde604b08cd09f2cef858883d4d781da4a715a259c95dd57c9594308675103ec58fdf9db60114136003889044f4bca5d4ce10604 SHA512 73baeded196c8304a7955da756ebfde5ab0e3c021600fd24aaff126a9a7777712f9172412dd634a1e7860f1af8a9655c92900a73488cd385c3332a65170550a8
+DIST lyx-2.4.1.tar.xz 17848700 BLAKE2B 5e9d9530610149a1b0f6a7d536068ff0da97e261a6069a9efc3c45a892c653e7accadcd0bde96bf3ffad9d936fef4a4b88ee7b5233f875bbc568044376a5b37e SHA512 80d57d46dab61ecb655c9d54ba1d20203ad943db5249ed16dbeb5b78b7845896a79224c8032213cc861fd943629fbe87ef8ac9155cc9b34da9be2f59eb087071
 EBUILD lyx-2.4.0.ebuild 3832 BLAKE2B c4ef34eaef2db18605cfa75ff5c86153b18ed3100c4486bbff504e836a0378b22ef5c92d28a22a66ffbdf016ec096d3b3521c5624243093a16c68ef80aed66eb SHA512 ce81366f6416af9fdcb3d1c64bd46e7f930c7a30daf1a8be19e892fe81c189bf330e6565aec481afe44a9b84d005ae8b0b0e2c484da2199a5209652f07d7b6ac
-EBUILD lyx-2.4.0_rc4.ebuild 3828 BLAKE2B 5983c2b8686886033fae43a853815ba2968bdc08dbea0fadd11bd8437d9f468d378dc1586b01803ba7d20ba2fef358f4992c042948f84f27419903070d74ac55 SHA512 341f6f9e68af8e25fa469d4c255ee76701e920afb92b842fe1c784d49f0ba9cfcf431ef3d32119d86e22b088e3af051ecb38a56fb2cd8b0c4f154404013691f9
+EBUILD lyx-2.4.1.ebuild 3833 BLAKE2B c4c3d1dd2ae84e9dc956dd7f839fd4200910a9603f80175a5d6096355a6cc34151e756cd112ca631171299dc0f87e6dc49af36e0e10e9c217e209eb666584582 SHA512 e376e4e7a83152912b98eea9c6ba75dc630df6de628e1983cfa6f007e0341efc7f7ccd57884b29274ab778e455508da54cf6080897a7a963bd1b517438fd225d
 MISC metadata.xml 1381 BLAKE2B dde484f4254356ccea9a7110761d3df4ca0dcbddb1b631e09126a762030638e4e3c53859db19df750467b2de8dbe186142b2464b5db2cc563fc2adb3684d8719 SHA512 40ae608e527af9727fbd077dc3e6e1254cd130f32424356d53479a34b6ffdf25b206e044f4071e32e59a7394fafe53ede429732a099e3c66658f337e77517ac9
diff --git a/app-office/lyx/lyx-2.3.7.ebuild b/app-office/lyx/lyx-2.3.7.ebuild
deleted file mode 100644
index 29a7b60275a0..000000000000
--- a/app-office/lyx/lyx-2.3.7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-MY_P="${P/_}"
-inherit desktop font optfeature python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${MY_P}-1.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
-BDEPEND="
-	app-alternatives/bc
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${PYTHON_DEPS}
-	app-text/mythes
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/file
-	sys-libs/zlib
-	virtual/imagemagick-tools[png,svg?]
-
-	x11-misc/xdg-utils
-
-	aspell? ( app-text/aspell )
-	cups? ( net-print/cups )
-	dia? ( app-office/dia )
-	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant:2 )
-	gnumeric? ( app-office/gnumeric )
-	html? ( dev-tex/html2latex )
-	hunspell? ( app-text/hunspell )
-	l10n_he? ( dev-tex/culmus-latex )
-	latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/ps2eps
-		app-text/texlive
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-plaingeneric
-		|| (
-			dev-tex/hevea
-			dev-tex/latex2html
-			dev-tex/tex4ht[java]
-			dev-tex/tth
-		)
-	)
-	rcs? ( dev-vcs/rcs )
-	rtf? (
-		app-text/unrtf
-		dev-tex/html2latex
-		dev-tex/latex2rtf
-	)
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-
-PATCHES=(
-	# Try first with xdg-open before hardcoded commands
-	# Patch from Debian using a similar approach to Fedora
-	"${FILESDIR}"/${PN}-prefer-xdg-open.patch
-
-	# Already part of 2.4.x (from Fedora)
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1965118
-	"${FILESDIR}"/${PN}-2.3.6.1-python.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS="${T}"/fonts
-
-	econf \
-		$(use_with aspell) \
-		$(use_enable debug) \
-		$(use_with enchant) \
-		$(use_with hunspell) \
-		$(use_enable monolithic-build) \
-		$(use_enable nls) \
-		--enable-qt5 \
-		--with-qt-dir=$(qt5_get_libdir)/qt5 \
-		--disable-stdlib-debug \
-		--without-included-boost \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind || die
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind
-	fi
-
-	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "lib/images/lyx.png"
-	doicon -s scalable "lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	# Workaround https://bugs.gentoo.org/907288
-	if has_version "<${CATEGORY}/${PN}-2.3.7"; then
-		ewarn "dev-texlive/texlive-fontsextra is now an optional dependency"
-		ewarn "If you need these fonts, you will need to manually install"
-		ewarn "them."
-	fi
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash || die
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-
-	optfeature "handling more fonts" dev-texlive/texlive-fontsextra
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-
-	if use latex ; then
-		texhash || die
-	fi
-}
diff --git a/app-office/lyx/lyx-2.4.0_rc4.ebuild b/app-office/lyx/lyx-2.4.1.ebuild
index 95d64cac5f63..d9d8f324a88f 100644
--- a/app-office/lyx/lyx-2.4.0_rc4.ebuild
+++ b/app-office/lyx/lyx-2.4.1.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit desktop font optfeature python-single-r1 cmake xdg
 
 DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
 HOMEPAGE="https://www.lyx.org/"
-SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz"
-S=${WORKDIR}/${P/_rc/~RC}
+SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
@@ -110,6 +109,7 @@ src_configure() {
 		-DLYX_INSTALL=ON
 		-DLYX_USE_QT=QT6
 		-DLYX_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}"
 
 		-DLYX_NLS=$(usex nls)
 		-DLYX_ASPELL=$(usex aspell)