gentoo resync : 20.03.2022

4 files changed, 3 insertions, 350 deletions

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 3e2fdb788246..d7ceb9d630bd 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,7 +1,4 @@
 AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3
-DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970 SHA512 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
-EBUILD lyx-2.3.5.2-r2.ebuild 3937 BLAKE2B d1b8daa94a0f51563c6bbfe59f4f87a79fd5ae5c0cfef92d2add3881fb82904011b9ef489890a626c5f05d91f1c13538b1314b120812db9ac8d0c589eae39e85 SHA512 f3fbc672b9514925e33d1bbbe0a9a89d9a6e3b6834c5b48b62bed5c5f44aca5bc5fee5e10dacefa9557ee79fb04058196924bd07a6860aea382b8a7c368d0161
-EBUILD lyx-2.3.6.1-r1.ebuild 4217 BLAKE2B c0981286993b559f8a64b73ebb2a3c38949bfb56383df26398d5138b2c7ea5bb8d5259c11e8bcdb04ffdfe098a073073f547ceb6d75ef91b52e0938c52f908d7 SHA512 1b6f1ea006899edaefd4e4bf638242f8cd1006b5812bd121f420bbca82c10a3e2f853573f9c48112264346d333fd04c17da2f85ce6e8edc4d21aeb1b38c3abe8
-EBUILD lyx-2.3.6.1.ebuild 3936 BLAKE2B 992c3937c0c7408c57d95447e7120cbbf829192897f050f88373521b68c1d88dc1d8c1cd0b6077e71e936a55cf0e4a289e0ac5b64176bc5095822d3b6fc05997 SHA512 b5cc1834d7b76b8e36f61ff25db3a5132ad6654f8874b2f3593dbda690a067bd855b729a2bf28f66a52303786757e683399097fad68bf7752fbd860f179d1ef9
+EBUILD lyx-2.3.6.1-r1.ebuild 4218 BLAKE2B 5b2929be8b3ab74eeaff89e9b52c24150e0ce92748144739e3d483400ca87628dc7cc2da7bacb8d22b69b340b5e2e188df98a456e8ef58654f6587b0f2e1b129 SHA512 fae690fc95f74a053dcb8e872df0eac9f36a339a0c8fd108359bd38e1190befe8fbcae987594b54b47e3aa939b0cf71d575ba1ed781104bb7760dfd852aa8233
 MISC metadata.xml 1270 BLAKE2B eaaaa462e91ba2e33dfd7e8507de5b8b2e392f3db01c761580b055407c65844ca4297db70e539b5c7db6a1420f2a30c0f75ddc25d160a78e598475bf36912f32 SHA512 d8f5361766f37c679b58ad329b24632ee11fe0ddce26aaf5cdfb1bd21a56214c6bff6076c8ba9e3584bfbe086e49ce9c4c7e0ba44e38deeaa33e11b6f5a6274a
diff --git a/app-office/lyx/lyx-2.3.5.2-r2.ebuild b/app-office/lyx/lyx-2.3.5.2-r2.ebuild
deleted file mode 100644
index 9291b764f071..000000000000
--- a/app-office/lyx/lyx-2.3.5.2-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-MY_P="${P/_}"
-inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc 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}"
-
-BDEPEND="
-	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
-	dev-texlive/texlive-fontsextra
-	sys-apps/file
-	sys-libs/zlib
-	virtual/imagemagick-tools[png,svg?]
-	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"
-
-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_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
-}
-
-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.3.6.1-r1.ebuild b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
index bf44ce0f1283..3cc7ebbbfcc2 100644
--- a/app-office/lyx/lyx-2.3.6.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~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}"
 
diff --git a/app-office/lyx/lyx-2.3.6.1.ebuild b/app-office/lyx/lyx-2.3.6.1.ebuild
deleted file mode 100644
index 2f664e39a9ff..000000000000
--- a/app-office/lyx/lyx-2.3.6.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-MY_P="${P/_}"
-inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc 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}"
-
-BDEPEND="
-	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
-	dev-texlive/texlive-fontsextra
-	sys-apps/file
-	sys-libs/zlib
-	virtual/imagemagick-tools[png,svg?]
-	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"
-
-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_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
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-
-	if use latex ; then
-		texhash || die
-	fi
-}