[gentoo-commits] repo/gentoo:master commit in: profiles/base/, app-office/lyx/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, app-office/lyx/

[Andreas Sturmlechner]

commit:     2fd849358d322a76b865f96407d16a6540a02c35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 11:42:43 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 12:04:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd84935

app-office/lyx: Drop no-op IUSE=docbook and app-text/sgmltools-lite

Fix metadata.xml indendation.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/lyx/lyx-2.3.5.2-r2.ebuild |  3 +--
 app-office/lyx/metadata.xml          | 21 +++++++++------------
 profiles/base/package.use.mask       |  4 ----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app-office/lyx/lyx-2.3.5.2-r2.ebuild b/app-office/lyx/lyx-2.3.5.2-r2.ebuild
index 21798abb31d..f11686c58e8 100644
--- a/app-office/lyx/lyx-2.3.5.2-r2.ebuild
+++ b/app-office/lyx/lyx-2.3.5.2-r2.ebuild
@@ -16,7 +16,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 ~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 subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -38,7 +38,6 @@ 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:2 )
 	gnumeric? ( app-office/gnumeric )

diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index f17145b4389..f96a4d3d00c 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>

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0f50861dbf7..3c520ad5eb9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -37,10 +37,6 @@ dev-libs/efl efl-one
 # The respective dependencies are masked for removal.
 net-nntp/pan gnome-keyring
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-19)
-# The respective dependencies are masked for removal.
-app-office/lyx docbook
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
 media-plugins/mythplugins mythnetvision