gentoo resync : 25.11.2020

3 files changed, 21 insertions, 24 deletions

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index bbafa1aa40e6..9682950c3fd3 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,3 +1,3 @@
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
-EBUILD lyx-2.3.5.2-r1.ebuild 4015 BLAKE2B f73c8116b0ca5e554e468501fa325c49ce1f440a99c1087495483b1ce82087ae578a04fd4f05d8264f26e16e96c36e17b502327670214003220f136d8d2f0190 SHA512 a732f221b4da3844c7d6e535e87bbe9fffb62c4d92ae3745c9b2a6c2c8d8fbb93136ec460ff0da971d1eaa68a5f1aa94b443bfdbb367bd700c3c3426c4379551
-MISC metadata.xml 1429 BLAKE2B a1bcde398c387c4d6f468a296144ca8d75a2dc78b170d0b94f6cd0c8896583d878bb423f039e509f40eefa634b1be96ea9211f1c4841fbd30684e32e172410f7 SHA512 79ed9557e4883159a71f9ed2a5ebdd5507924a6ed5a0f50dad3047a1d51638847f5facfe757548b6bf9fe781026ff8987cadf84498a6f6aa8e3d260e19e7284e
+EBUILD lyx-2.3.5.2-r2.ebuild 3950 BLAKE2B 43ac2a492fa94d586798109f2537967c4b7332f4d4f73af0be1338539bdfb8d355f25c7da6111be63a478e56ab4c24a40d3589c2e1ed92bb7aa45b894459aac8 SHA512 0f86a75da649b8f3c8bdaaf5cfe6ddc4c2b55238eb5df93ef2b0e56641e8372e5b1553cd666e7308a06afdfa93b70288b8f1ffb572c7781aec7da026408462ac
+MISC metadata.xml 1364 BLAKE2B 7c37ea060d4eb27a8db07c96854404f33cdfa2d662904eca8789b86c6962fb8294b230a07a06db982e16d3adee6450b3d6172f19e3a71d74f3e3d6053bef7714 SHA512 851d5865b1a1c4c0e118e8d739ec7a798fda087410d7ca85646f4c10b7108071527aa45bf18026019169858221609d93a0b4ebc32f899dc0d2742b45e904ff2b
diff --git a/app-office/lyx/lyx-2.3.5.2-r1.ebuild b/app-office/lyx/lyx-2.3.5.2-r2.ebuild
index 4db12ad1a2ef..1bb95628293b 100644
--- a/app-office/lyx/lyx-2.3.5.2-r1.ebuild
+++ b/app-office/lyx/lyx-2.3.5.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 MY_P="${P/_}"
 inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -16,9 +16,13 @@ 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 ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
+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:=
@@ -34,9 +38,8 @@ RDEPEND="${PYTHON_DEPS}
 	aspell? ( app-text/aspell )
 	cups? ( net-print/cups )
 	dia? ( app-office/dia )
-	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant:0 )
+	enchant? ( app-text/enchant:2 )
 	gnumeric? ( app-office/gnumeric )
 	html? ( dev-tex/html2latex )
 	hunspell? ( app-text/hunspell )
@@ -64,13 +67,10 @@ RDEPEND="${PYTHON_DEPS}
 		dev-tex/html2latex
 		dev-tex/latex2rtf
 	)
-	subversion? ( dev-vcs/subversion )
 	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	dev-qt/qtconcurrent:5
-	nls? ( sys-devel/gettext )
 "
 
 DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
@@ -147,7 +147,7 @@ pkg_postinst() {
 
 	# fix for bug 91108
 	if use latex ; then
-		texhash
+		texhash || die
 	fi
 
 	# instructions for RTL support. See also bug 168331.
@@ -167,6 +167,6 @@ pkg_postrm() {
 	xdg_desktop_database_update
 
 	if use latex ; then
-		texhash
+		texhash || die
 	fi
 }
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index f17145b4389a..f96a4d3d00ca 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -10,23 +10,20 @@
 		<name>Cjk</name>
 	</maintainer>
 	<use>
-		<flag name="docbook">Add support for docbook export</flag>
+		<flag name="aspell">Add support for aspell spellchecking</flag>
+		<flag name="enchant">Add support for enchant spellchecking wrapper
+			(both aspell and hunspell can be used by LyX).</flag>
 		<flag name="dia">Add support for diagrams (<pkg>app-office/dia</pkg>)</flag>
-		<flag name="dot">Add support for DOT import (<pkg>media-gfx/graphviz</pkg>)
-	</flag>
-		<flag name="html">Add support for HTML import</flag>
-		<flag name="monolithic-build">This should speed up compilation significantly
-			when you have enough RAM (&gt; 600 MB)</flag>
-		<flag name="rcs">Add support for revision control via <pkg>dev-vcs/rcs</pkg>
-	</flag>
-		<flag name="rtf">Add support for RTF import/export packages</flag>
+		<flag name="dot">Add support for DOT import (<pkg>media-gfx/graphviz</pkg>)</flag>
 		<flag name="gnumeric">Add support for importing Gnumeric/OpenOffice/MS Excel
 			spreadsheets into LyX.</flag>
+		<flag name="html">Add support for HTML import</flag>
 		<flag name="hunspell">Add support for spellchecking based on hunspell and
 			reuse system-wide OpenOffice dictionaries. This also enable thesaurus
 			dictionaries not accessible via aspell.</flag>
-		<flag name="aspell">Add support for aspell spellchecking</flag>
-		<flag name="enchant">Add support for enchant spellchecking wrapper
-			(both aspell and hunspell can be used by LyX).</flag>
+		<flag name="monolithic-build">This should speed up compilation significantly
+			when you have enough RAM (&gt; 600 MB)</flag>
+		<flag name="rcs">Add support for revision control via <pkg>dev-vcs/rcs</pkg></flag>
+		<flag name="rtf">Add support for RTF import/export packages</flag>
 	</use>
 </pkgmetadata>