gentoo resync : 06.08.2019

5 files changed, 104 insertions, 111 deletions

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 18c1e040165d..d31afa862d82 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,8 +1,7 @@
-AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
 DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706 SHA512 cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
-DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
+DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
 EBUILD sigil-0.9.13.ebuild 2527 BLAKE2B f48d3ad43514ad147011b2902e9dec7d4ca35e8f58100cd6ed4e0ce640d9a3f321ccd1c996cb5e88c861ee273c09dd384c95f1136be5604361d1dc7f5044ca0e SHA512 a6b0a5e912f90617f23abdd36b6173e8cc8287f0dc0b2d8052069f656c042dc3d132c7a0b6035c8bc899c6a8defa13f8d6caf08c55793661e5d0e8ef34d0fcdf
-EBUILD sigil-0.9.16.ebuild 2877 BLAKE2B cf884cab1b1b41c4b8ca7b95c8de4db846aaab774a741d8dc51babeff1513db3fa9354f2fb162d7010afac2e93b578603bd8eca86f2811d26ece7e4cf51f518f SHA512 080f1efaf317e4b872bc153d1e78ae793a07400b726977af985c8e73917e887097235c0960be93c9ec9facb92a8c53cf193369e884f765640b70f62b256f5979
-EBUILD sigil-0.9.8.ebuild 2234 BLAKE2B 81dbc8905e5e4d96f7a423a64a66fa2f5a1ad501a7f8e8ae4049bbf43cbac8366c7fe388da1a9ba9a2f4aaca92b7df9fe585443276f283f80a305eead2797db0 SHA512 834be1bffdd30059bd224d8b0ea0d4b5efa8286f934042183e305ba793b3b25bca01a807ce1c3de9c011d4c335a5362bcfd6cc20694a83f4f9142f65f91286c9
+EBUILD sigil-0.9.16.ebuild 2875 BLAKE2B 431939484d3124f69512bebc5bfcdf40cc5c6cc3a4fb9c4456b99fe5151579928f675a7cc2c3d3026212b36b49ad6f3e0f236eac25edb4ed68e9db90d665b350 SHA512 6aceb1ac42f5b6e7f0413337c1ec4c79748f6b8654fff933bdd93b98c5c574e6ab4dba700d80ea102e834ba518f8846848aba7c1d4eedc6ecf932db39cc051ce
+EBUILD sigil-0.9.18.ebuild 2693 BLAKE2B 531b36defdc189bd33c1c3cf15c55093518894a791af9daa89acf7438e083ddca07fa09302a28de452cbd0a7e77f5080fdccd2c9ff66efb46e86b973ef66eacb SHA512 97b853181a212d9be386cc9a769a492fdb10ad7edcbd15cf1e4621ad00a77c7c491e23654c1271f91bb8ed880f8eaeb20a0bde4065167762cf35e045a959435c
 MISC metadata.xml 1073 BLAKE2B 5428bda0e56ccfc8a4f5c7df773698fa62e0309daa5cb970df9fe3381a7a45c920a854e793b92a2d7e91c66698ddd40f2cf89001e85d0bdfbf521af9fe8ea4a8 SHA512 cdfca84a4cd89a3d4d8d6d79b7eb6432d51019b3ac2c8f59f09262c7cf52c990886e299557bcf10f698ec84e8c3c4f46da19bd9dc298d7011aaf4e52b9e0b35b
diff --git a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
deleted file mode 100644
index 375f2e0ab6ca..000000000000
--- a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/CMakeLists.txt	2017-10-17 14:22:57.780297490 +0200
-+++ b/src/CMakeLists.txt	2017-10-17 14:24:21.754150453 +0200
-@@ -962,12 +962,8 @@
-     endif()
- 
-     # Standard Linux 'make install'
--    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-+    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
-     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
--    if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
--        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
--    endif()
--    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     if( BUILD_PATCHED_LIBXML2 )
-         install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-         install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
---- a/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:02.539107666 +0200
-+++ b/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:27.985457056 +0200
-@@ -40,4 +40,5 @@
- 
- if( UNIX AND NOT APPLE )
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
-+	install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
- endif()
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
index 2faaf3abb786..f2afdb994b88 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16.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-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
new file mode 100644
index 000000000000..f7af56a5f6f3
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake-utils python-single-r1 readme.gentoo-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/boost:=[threads]
+	dev-libs/libpcre:3=[pcre16]
+	dev-libs/xerces-c[icu]
+	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? (
+		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}"
+
+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 (epub2 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_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-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
deleted file mode 100644
index fbd390f249ce..000000000000
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[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/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.8-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}