gentoo resync : 17.10.2017

3 files changed, 109 insertions, 0 deletions

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 4591ee64ee9a..66ec38490721 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,10 +1,13 @@
 AUX sigil-0.9.4-proper-gumbo-install.patch 1582 SHA256 fab824cd6ce418ebbfe1fcbdc1b180e5e2071ec63b4a3076401b69272fd83221 SHA512 880a34ffddee86e5e66fe6d0ca12798e29af0a3e554fcde69872f9c6cd9e731e8cc02e6a88acafd0e3d418883c6e9346cefcfd7e0c7aae6f05758b2a667fccb6 WHIRLPOOL 4598f4a6303b1be803d19f9166bf7243cb160cb59528d622c43649b1b43e8e535cec5abd62f6cde82630d0c1ee829db83dbd6c712ac6d0963063eb092d3ef052
+AUX sigil-0.9.8-proper-gumbo-install.patch 1351 SHA256 9ea0e9b53997481595daa3873ed11d4131eccddf4aeef783e1906dabf95a4926 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89 WHIRLPOOL a9e321582c939e32500d32e187b0b56de20b87cf2d023f883b139feecd0e88f12d88e0526df1721f52cfc2724672bc44a4c82a8ee0aaf61beb62c3595dc19d7a
 DIST Sigil-0.9.5-Code.zip 19224845 SHA256 fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625 WHIRLPOOL 8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
 DIST Sigil-0.9.6-Code.zip 19307454 SHA256 7856ad20116ef13fc3f79fa01c1d65c8b15ce1047f1e88b0723c2658cd8f18fd SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417 WHIRLPOOL d74290b59247ced4977bf575adb93c7a76a8045f464b649854e49f6028cb2a9fb28c50fc36d00d3ab106768a85c514b5df5252e5172597a6120913a051b9cca7
+DIST Sigil-0.9.8-Code.zip 19807795 SHA256 78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00 WHIRLPOOL 16a3b3ce3f3c67236b95aba91a5d5a2fce88a4d72364fbef7c6c69dcabb6a53849d74334d2684b58a64cf35b6ba43494b3d260909d6d0e9b06f99ec3593069cf
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
 EBUILD sigil-0.8.7-r1.ebuild 1276 SHA256 11ace9e20eb41c98ea4a2807836a619f35d77b234f8618ef902d2a732ffe4e58 SHA512 99f64144328eb0e7566646a5705bc533df127da56f633c38ba85f432e63cda949f54f322419b7934ed80263fb275f897d8513d721d7b6807ce4ac1cabf0d2456 WHIRLPOOL 0ea210a1b0c9ef6b4ce968020df451de94dc6115969717ddd53bf4a8bd6436ebc38c59dba5965c17a221b7ed4134f402e2a3dea1b687e429aa7f9d60cabfae7e
 EBUILD sigil-0.9.5-r2.ebuild 2242 SHA256 47fa5d6143fd8bcb492fcbaf36be3642ab7553be797fc4da62718fad8a58abca SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04 WHIRLPOOL 0d82691655eb657c6feb57275dad2bae7032caf24bcaf9d99b0e281da094db1a578e90340e118a618f6d178d38c99da48d2a60c456922c4b530a55c6fffb318f
 EBUILD sigil-0.9.6.ebuild 2242 SHA256 47fa5d6143fd8bcb492fcbaf36be3642ab7553be797fc4da62718fad8a58abca SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04 WHIRLPOOL 0d82691655eb657c6feb57275dad2bae7032caf24bcaf9d99b0e281da094db1a578e90340e118a618f6d178d38c99da48d2a60c456922c4b530a55c6fffb318f
+EBUILD sigil-0.9.8.ebuild 2242 SHA256 02d18dff5d24c82012094a81ca221956f88ca14978d8d97bbdcf6dd5d58dbe11 SHA512 633c3eb675dcd67890af8f46e1f9143952162b6ff3ae63228c1936f58e7bbb1d70255b73e0fc5ca2858693f6d3e61b62d0b39fc998ffa4967aa184ba220aa7fd WHIRLPOOL 6b440f27b30814e7e526ef3e9babd6200619c3ea548086b7f816307ed6f6d5bcfcb7dc3559b241fce86509c11f69e51db13c103d93eaf71583e22963eaf962e0
 MISC ChangeLog 7635 SHA256 607c351b0c32280e50848c2454d95ba3a1fa500abe99759889edf80477cde5cc SHA512 1436d601f1aeab5fcd8fc7e8eadf793e257922154bdb9217e74cc3dc64bb6e1c1e27fffb10ccc0ff021e5a2a06e9da1c8e77e0007e69adcdce42e87690549825 WHIRLPOOL 019c929d678af0db3e4e4d5662e15bf392ca7272bee98b82786d4a882aa5fa004d6037d107de156abfe3e3a720f564776ac2e8b4d16f2d7a84043f097aabf97a
 MISC ChangeLog-2015 2643 SHA256 d4a27d050f4fb657eef3ad487c632eb8f9afca6e7760b4d89e628a16295e7c2f SHA512 15270b02a9bcbcf23225a53efff1d0fac71a1eea3fd51c20aeed1804553a9703a29341dca9ad772d08f467612f5cae089d55d4a051c84fa06390ad7310b28d66 WHIRLPOOL 90e0e673221edeaae669ad2167a6679cdc00b6fd36ebb34e5bcdf95c5601de220c5da03a455555176abb89d0020bef45144785324a9511a6b3d533edf888df5a
 MISC metadata.xml 636 SHA256 2e9262d0707ae9ba14e8906f138a408ecf7835c715a42e857cfe082aa0ed0f4d SHA512 66546079856b255a0c5c46a2eb3df314a08b510456e971f74422748cd689517b248f01f9500f3c7a76698d5f9271540be52ba4e1ab457f55c25f75c3cf5da488 WHIRLPOOL 88ab73db404348de3170d5b2f2c3577261bd5af2fa564bfa25d70ac3ddbe888f0592dab50b6ed632da46037308bafc8e5964a5bc8513cd0b7d1999755c9be0fa
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
new file mode 100644
index 000000000000..375f2e0ab6ca
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
@@ -0,0 +1,24 @@
+--- 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.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
new file mode 100644
index 000000000000..0bdd33c470ee
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://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."
+}