gentoo resync : 25.08.2020

4 files changed, 86 insertions, 111 deletions

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 4ed274ce4eee..3aecb7d1ff77 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,6 +1,6 @@
 AUX sigil-1.2.1-qt5.15-fix.patch 1228 BLAKE2B 61c4b8de1d7e6a65668f45b6aadebb7c93bad6c82ed415caad3900f009f88f253aa10ca678c76580ef5d3b344cead91390b001aa824e49ad963a45ff259971d3 SHA512 f4a42fa135b03a218c4fa1d2460563d727f90de1a20482ab35bba8ebe2af8484863424664930ad01f14c20772a60c0d60f6472e287ecb69302140df8af6b7b3d
-DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b SHA512 763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
-EBUILD sigil-0.9.16-r1.ebuild 2960 BLAKE2B f3198426ecfe3f9e01a04a4741049a3e42e54c574a5e8df1500deb5cf632f41c32925b8fee9681da4287b1aaf63eb5c18be4c2372592fb5a7d07796c0fb099a6 SHA512 ce4c4428a22ca2ee06bd38a4cb05c45475a0a2b6ad766128bbfa9d4361ea5bcb756d9167a582e358ba1a80da53e1c1110e51b662a21a708f11b15102d4da35f3
-EBUILD sigil-1.2.1-r1.ebuild 2064 BLAKE2B dac3f83421c2481340fe8d15511de050ea8c0b35e68813f750da9f167b77c2745879a348176d11eb88fbf5998109dc24a96e7695de636945a99e54ed4abd714f SHA512 cf8ac54594d499bbbd68b970785111ceec4653a1613b3d4a7b81f24d33573840ead7332a00dd098a8822b575532bea192e7c3803d7137e96783d8a4d65edd326
+DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
+EBUILD sigil-1.2.1-r1.ebuild 2062 BLAKE2B 246ab17ee83adb4f841c772e44402adc01239e6f3130536b6db2cc0546da219650401afca1bb044c611741e9fdcbf348e47acca07786c42bd341b08bf37672c4 SHA512 62da8924b149912b88d998b5c9431b6061e2290627c8d4d138b514132650d1b8c90894f330b5b1391886c919e5f4c0b4a1f8d063e555061152b313420bcb9589
+EBUILD sigil-1.3.0.ebuild 2014 BLAKE2B bded5f0282a62236f4d7f781c4662e18c89d507d537b746101509dc716c82ebe92f61b5a3d89950c31cb89295213d531847fa8f037aaf52236c80d713b038857 SHA512 9af94b73883ae8f6c58372e126848df9d8a3355aac3b4d5a67afd8b653aa33a414c22d4f1edee5a286974b35161a75cc9d1a0602b8bb3acb2b25375c18243d26
 MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
diff --git a/app-text/sigil/sigil-0.9.16-r1.ebuild b/app-text/sigil/sigil-0.9.16-r1.ebuild
deleted file mode 100644
index a9492f58a94c..000000000000
--- a/app-text/sigil/sigil-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-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/boost:=[threads]
-	dev-libs/libpcre:3=[pcre16]
-	dev-libs/xerces-c[icu]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_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
-	>=dev-qt/qtxmlpatterns-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_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 )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-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_src_prepare
-}
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_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/
-	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.2.1-r1.ebuild b/app-text/sigil/sigil-1.2.1-r1.ebuild
index e7b02c1eea76..5f283ccaee82 100644
--- a/app-text/sigil/sigil-1.2.1-r1.ebuild
+++ b/app-text/sigil/sigil-1.2.1-r1.ebuild
@@ -14,7 +14,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"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/sigil/sigil-1.3.0.ebuild b/app-text/sigil/sigil-1.3.0.ebuild
new file mode 100644
index 000000000000..82de9563cb56
--- /dev/null
+++ b/app-text/sigil/sigil-1.3.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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
+}