From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94D77138334 for ; Sun, 21 Jul 2019 11:58:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01C71E0830; Sun, 21 Jul 2019 11:58:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CBC2CE0830 for ; Sun, 21 Jul 2019 11:58:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BC3A348393 for ; Sun, 21 Jul 2019 11:58:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FDD971A for ; Sun, 21 Jul 2019 11:58:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1563710315.8e92d34680b2ce1aa600fc43030d0bfc1f45e1c3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sigil/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/sigil/metadata.xml app-text/sigil/sigil-0.9.16.ebuild X-VCS-Directories: app-text/sigil/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8e92d34680b2ce1aa600fc43030d0bfc1f45e1c3 X-VCS-Branch: master Date: Sun, 21 Jul 2019 11:58:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 07f84073-0070-45db-b10a-49236d3d6632 X-Archives-Hash: 9aec3828c491fe9ac8bab672644d4bbb commit: 8e92d34680b2ce1aa600fc43030d0bfc1f45e1c3 Author: Zamarin Arthur gmail com> AuthorDate: Sun Jul 21 05:46:03 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 gmail.com> Signed-off-by: Andreas Sturmlechner 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 @@ Sigil is a multi-platform WYSIWYG ebook editor. It is designed to edit books in ePub format. + Installed needed Python packages for using Sigil plugins Use the system-wide dev-libs/mathjax instead of bundled 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=(