[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/

[Andreas Sturmlechner]

commit:     8e92d34680b2ce1aa600fc43030d0bfc1f45e1c3
Author:     Zamarin Arthur <arthurzam <AT> gmail <DOT> com>
AuthorDate: Sun Jul 21 05:46:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 11:58:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e92d346

app-text/sigil: add USE=plugins

USE flag to disable Python libs deps if no plugin support is desired
depend on system css-parser instead of bundled

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Zamarin Arthur <arthurzam <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/sigil/metadata.xml        |  1 +
 app-text/sigil/sigil-0.9.16.ebuild | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 745afeddf71..ec9790cba78 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -12,6 +12,7 @@
 	<longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
 		It is designed to edit books in ePub format.</longdescription>
 	<use>
+		<flag name="plugins">Installed needed Python packages for using Sigil plugins</flag>
 		<flag name="system-mathjax">Use the system-wide <pkg>dev-libs/mathjax</pkg> instead of bundled</flag>
 	</use>
 	<upstream>

diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
index 1ee490a23ec..2faaf3abb78 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="system-mathjax"
+IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -24,13 +24,8 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 	dev-libs/libpcre:3=[pcre16]
 	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/css-parser[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-qt/qtconcurrent-5.12:5
 	>=dev-qt/qtcore-5.12:5
@@ -40,6 +35,14 @@ RDEPEND="
 	>=dev-qt/qtwidgets-5.12:5
 	>=dev-qt/qtxmlpatterns-5.12:5
 	sys-libs/zlib[minizip]
+	plugins? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+	)
 	system-mathjax? ( dev-libs/mathjax )
 "
 DEPEND="${RDEPEND}"
@@ -66,6 +69,12 @@ For example use & # 1 6 0 ; for non-breaking spaces and etc.
 We strongly recommend enabling Mend On Open in your settings
 for best performance with Sigil."
 
+src_prepare() {
+	# bundled is a exact copy of the package, and upstream plan to switch soon
+	rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
 	local mycmakeargs=(