gentoo resync : 03.09.2021

3 files changed, 2 insertions, 86 deletions

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 85d2f9adbfee..36de8a2672e8 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,3 @@
-DIST sigil-1.5.1.tar.gz 20020962 BLAKE2B ac70c117d69c4062d66151372fc8cbede48be6f38ceae7d1dd1bd49fd8a0a4a352c885a120e00ba729e64ebfa928103d07f7bb85d69cbb3385f640f4fcf42985 SHA512 281c8327f7a05b9c9f805b02ef4c21f50d340a2f9e09dcae74be30aad107b0f2605801f0239e9a503db70afa2b37b7931dfec0efa5662dde906ce6c014da8849
 DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
-EBUILD sigil-1.5.1.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
-EBUILD sigil-1.7.0.ebuild 1856 BLAKE2B 33eae27a66f606c38abb130e73a81bf08a4ce8077f3a512f46158c637dcf1284058fcb151defd9c23cafafb06af53c6a9672b6a518ab77f6ef6cefaa83dec4d0 SHA512 5d75662a62912f2f8f03371a7c43eb75a6fd296d4b1120e1ed6450aedf466b856e2aa50e73e935654993059c46f97bb6e7cb04e82b14ded87b99546d7612c128
+EBUILD sigil-1.7.0.ebuild 1854 BLAKE2B ff67b41ebc8fb7939753b212070cd6cc2ebc15800e647b8988f01f8ec0c96c9b282b3694fc446918380921ef211d81c14ab1d677b7e1607c3b0c9548eaaae058 SHA512 2daad4895f948c7c946d3e20b0602f6486d816bc48f06b2d3f621a6b6144b19bb1e6fb02921212fe8aa192ff3b203bc989265ead5d4eda039c30293172521dd6
 MISC metadata.xml 809 BLAKE2B 98f1480f608f28bc2f39f31ea91a87b276d6ca181da159bc490c8c36f196015081007cfcd5f9d3fd54ac0e211efec434f69014a9c898ad41e97de3048f07d878 SHA512 b593df7b245eb41665eeeceb3ae9dc9be9bdacd5b6cfca3a847d3bc61b4cddbd9c29547cc332eff10ed8149c46f15fdef058f50e7b8e7460f488dd056a74a4ba
diff --git a/app-text/sigil/sigil-1.5.1.ebuild b/app-text/sigil/sigil-1.5.1.ebuild
deleted file mode 100644
index c7f5b33a10e8..000000000000
--- a/app-text/sigil/sigil-1.5.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/libpcre:3=[pcre16]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]')
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/dulwich[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.7.0.ebuild b/app-text/sigil/sigil-1.7.0.ebuild
index 0b2453ffe0da..56f93e6b73f0 100644
--- a/app-text/sigil/sigil-1.7.0.ebuild
+++ b/app-text/sigil/sigil-1.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"