gentoo resync : 22.05.2021

3 files changed, 241 insertions, 0 deletions

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 0fe5a1072b36..e5a0e2fe3b59 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,5 +1,7 @@
+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 4120 BLAKE2B fee38035212de49dc2dd50bb234a60ed6c79d623edf836dfef984e5ac150a18334a6fbef78ed760a57a8e551c5044162887917a993e625b976586545ebd882ca SHA512 213c56e0e496fafbb7855468b2691a52bfc139c1a4e5dc2110e735eeaa0835d25a79137c10a7707d91a6d3b152e90fa0d621ce26e1b1c9d0fffec424120be157
 EBUILD lyx-2.3.6.1.ebuild 3936 BLAKE2B 992c3937c0c7408c57d95447e7120cbbf829192897f050f88373521b68c1d88dc1d8c1cd0b6077e71e936a55cf0e4a289e0ac5b64176bc5095822d3b6fc05997 SHA512 b5cc1834d7b76b8e36f61ff25db3a5132ad6654f8874b2f3593dbda690a067bd855b729a2bf28f66a52303786757e683399097fad68bf7752fbd860f179d1ef9
 MISC metadata.xml 1269 BLAKE2B b400b34cf521d12c4bf93a828b8b4b4cb578abf511a951c680ba8eb25fccd83d17302ae8921155c93e5f4718f818923675c97eb6a4debde6df10d797592e290e SHA512 b46c4aab0ef227d8eb3f38aac8b9f9e99aaaca05f9f7b992e9cfcec90cbf3825521b111b5d0473d78b2742fc5bbbacbc3ea16c3eaf7d4beed2a0d66f88b5f168
diff --git a/app-office/lyx/files/lyx-prefer-xdg-open.patch b/app-office/lyx/files/lyx-prefer-xdg-open.patch
new file mode 100644
index 000000000000..5e12f6c2e699
--- /dev/null
+++ b/app-office/lyx/files/lyx-prefer-xdg-open.patch
@@ -0,0 +1,60 @@
+From: "Dr. Tobias Quathamer" <toddy@debian.org>
+Date: Wed, 31 Jan 2018 23:27:37 +0100
+Subject: Prefer xdg-open
+
+Add xdg-open as the first choice whenever this seems to be useful.
+---
+ lib/configure.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/configure.py b/lib/configure.py
+index 7fee68d..abc4d53 100644
+--- a/lib/configure.py
++++ b/lib/configure.py
+@@ -657,7 +657,7 @@ def checkFormatEntries(dtl_tools):
+     checkViewerEditor('a Dia viewer and editor', ['dia'],
+         rc_entry = [r'\Format dia        dia     DIA                    "" "%%"	"%%"	"vector,zipped=native", "application/x-dia-diagram"'])
+     #
+-    checkViewerEditor('an OpenDocument drawing viewer and editor', ['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
++    checkViewerEditor('an OpenDocument drawing viewer and editor', ['xdg-open', 'libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
+         rc_entry = [r'\Format odg        "odg, sxd" "OpenDocument drawing"   "" "%%"	"%%"	"vector,zipped=native"	"application/vnd.oasis.opendocument.graphics"'])
+     #
+     checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
+@@ -682,16 +682,16 @@ def checkFormatEntries(dtl_tools):
+ \Format xbm        xbm     XBM                    "" "%s"	"%s"	""	"image/x-xbitmap"
+ \Format xpm        xpm     XPM                    "" "%s"	"%s"	""	"image/x-xpixmap"'''
+     path, iv = checkViewerNoRC('a raster image viewer',
+-        ['xv', 'gwenview', 'kview',
++        ['xdg-open', 'xv', 'gwenview', 'kview',
+          'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt',
+-         'xdg-open', 'gimp-remote', 'gimp'],
++         'gimp-remote', 'gimp'],
+         rc_entry = [imageformats])
+     path, ie = checkEditorNoRC('a raster image editor',
+         ['gimp-remote', 'gimp'], rc_entry = [imageformats])
+     addToRC(imageformats % ((iv, ie)*10))
+     #
+     checkViewerEditor('a text editor',
+-        ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
++        ['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
+          'nedit', 'gedit', 'geany', 'leafpad', 'mousepad', 'xed', 'notepad'],
+         rc_entry = [r'''\Format asciichess asc    "Plain text (chess output)"  "" ""	"%%"	""	""
+ \Format docbook    sgml    DocBook                B  ""	"%%"	"document,menu=export"	""
+@@ -745,7 +745,7 @@ def checkFormatEntries(dtl_tools):
+     #checkProg('a Postscript interpreter', ['gs'],
+     #  rc_entry = [ r'\ps_command "%%"' ])
+     checkViewer('a Postscript previewer',
+-                ['kghostview', 'okular', 'qpdfview --unique',
++                ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique',
+                  'evince', 'xreader',
+                  'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
+         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"	"image/x-eps"
+@@ -756,7 +756,7 @@ def checkFormatEntries(dtl_tools):
+     # maybe use "bestApplication()" from https://github.com/jleclanche/python-mime
+     # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime
+     checkViewer('a PDF previewer',
+-                ['pdfview', 'kpdf', 'okular', 'qpdfview --unique',
++                ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique',
+                  'evince', 'xreader', 'kghostview', 'xpdf', 'SumatraPDF',
+                  'acrobat', 'acroread', 'mupdf',
+                  'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'],
diff --git a/app-office/lyx/lyx-2.3.6.1-r1.ebuild b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
new file mode 100644
index 000000000000..d9922fde669e
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
@@ -0,0 +1,179 @@
+# 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?]
+
+	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"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+	# Try first with xdg-open before hardcoded commands
+	# Patch from Debian using a similar approach to Fedora
+	eapply "${FILESDIR}"/${PN}-prefer-xdg-open.patch
+
+	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
+}