Gentoo Archives: gentoo-commits

From: Tobias Klausmann <klausman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sigil/files/, app-text/sigil/
Date: Tue, 17 Oct 2017 12:35:51
Message-Id: 1508243740.d9390b31a4e06bf70af55d9928650d701678b2d7.klausman@gentoo
1 commit: d9390b31a4e06bf70af55d9928650d701678b2d7
2 Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 17 12:35:16 2017 +0000
4 Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 17 12:35:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9390b31
7
8 app-text/sigil: Add v0.9.8 with fixed patch
9
10 Gentoo-Bug: https://bugs.gentoo.org/621204
11 Fixes: https://bugs.gentoo.org/621204
12 Package-Manager: Portage-2.3.11, Repoman-2.3.3
13
14 app-text/sigil/Manifest | 1 +
15 .../files/sigil-0.9.8-proper-gumbo-install.patch | 24 +++++++
16 app-text/sigil/sigil-0.9.8.ebuild | 82 ++++++++++++++++++++++
17 3 files changed, 107 insertions(+)
18
19 diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
20 index 97418191730..5b7c9c044e6 100644
21 --- a/app-text/sigil/Manifest
22 +++ b/app-text/sigil/Manifest
23 @@ -1,3 +1,4 @@
24 DIST Sigil-0.9.5-Code.zip 19224845 SHA256 fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625 WHIRLPOOL 8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
25 DIST Sigil-0.9.6-Code.zip 19307454 SHA256 7856ad20116ef13fc3f79fa01c1d65c8b15ce1047f1e88b0723c2658cd8f18fd SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417 WHIRLPOOL d74290b59247ced4977bf575adb93c7a76a8045f464b649854e49f6028cb2a9fb28c50fc36d00d3ab106768a85c514b5df5252e5172597a6120913a051b9cca7
26 +DIST Sigil-0.9.8-Code.zip 19807795 SHA256 78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00 WHIRLPOOL 16a3b3ce3f3c67236b95aba91a5d5a2fce88a4d72364fbef7c6c69dcabb6a53849d74334d2684b58a64cf35b6ba43494b3d260909d6d0e9b06f99ec3593069cf
27 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
28
29 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
30 new file mode 100644
31 index 00000000000..375f2e0ab6c
32 --- /dev/null
33 +++ b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
34 @@ -0,0 +1,24 @@
35 +--- a/src/CMakeLists.txt 2017-10-17 14:22:57.780297490 +0200
36 ++++ b/src/CMakeLists.txt 2017-10-17 14:24:21.754150453 +0200
37 +@@ -962,12 +962,8 @@
38 + endif()
39 +
40 + # Standard Linux 'make install'
41 +- install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
42 ++ install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
43 + install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
44 +- if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
45 +- install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
46 +- endif()
47 +- install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
48 + if( BUILD_PATCHED_LIBXML2 )
49 + install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
50 + install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
51 +--- a/internal/gumbo/CMakeLists.txt 2017-10-17 14:25:02.539107666 +0200
52 ++++ b/internal/gumbo/CMakeLists.txt 2017-10-17 14:25:27.985457056 +0200
53 +@@ -40,4 +40,5 @@
54 +
55 + if( UNIX AND NOT APPLE )
56 + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
57 ++ install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
58 + endif()
59
60 diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
61 new file mode 100644
62 index 00000000000..0bdd33c470e
63 --- /dev/null
64 +++ b/app-text/sigil/sigil-0.9.8.ebuild
65 @@ -0,0 +1,82 @@
66 +# Copyright 1999-2017 Gentoo Foundation
67 +# Distributed under the terms of the GNU General Public License v2
68 +
69 +EAPI=6
70 +
71 +PYTHON_COMPAT=( python3_4 python3_5 )
72 +
73 +inherit cmake-utils python-single-r1
74 +
75 +my_pn="Sigil"
76 +
77 +DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
78 +HOMEPAGE="http://sigil-ebook.com/"
79 +SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
80 +
81 +LICENSE="GPL-3+"
82 +SLOT="0"
83 +KEYWORDS="~amd64 ~x86"
84 +IUSE=""
85 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
86 +
87 +RDEPEND="
88 + ${PYTHON_DEPS}
89 + app-text/hunspell
90 + dev-libs/boost[threads]
91 + dev-libs/libpcre[pcre16]
92 + dev-libs/xerces-c[icu]
93 + dev-python/chardet[${PYTHON_USEDEP}]
94 + dev-python/cssselect[${PYTHON_USEDEP}]
95 + dev-python/cssutils[${PYTHON_USEDEP}]
96 + dev-python/html5lib[${PYTHON_USEDEP}]
97 + dev-python/lxml[${PYTHON_USEDEP}]
98 + dev-python/pillow[${PYTHON_USEDEP}]
99 + dev-python/regex[${PYTHON_USEDEP}]
100 + dev-python/six[${PYTHON_USEDEP}]
101 + >=dev-qt/qtconcurrent-5.4:5
102 + >=dev-qt/qtcore-5.4:5
103 + >=dev-qt/qtgui-5.4:5
104 + >=dev-qt/qtprintsupport-5.4:5
105 + >=dev-qt/qtwebkit-5.4:5
106 + >=dev-qt/qtwidgets-5.4:5
107 + >=dev-qt/qtxmlpatterns-5.4:5
108 + sys-libs/zlib[minizip]
109 +"
110 +DEPEND="${RDEPEND}
111 + >=sys-devel/gcc-4.8
112 + virtual/pkgconfig
113 + >=dev-qt/linguist-tools-5.4:5
114 + app-arch/unzip
115 +"
116 +
117 +S="${WORKDIR}"
118 +
119 +PATCHES=(
120 + # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
121 + "${FILESDIR}"/${PN}-0.9.8-proper-gumbo-install.patch
122 +)
123 +DOCS=( ChangeLog.txt README.md )
124 +
125 +src_configure() {
126 + local mycmakeargs=(
127 + -DUSE_SYSTEM_LIBS=1
128 + -DSYSTEM_LIBS_REQUIRED=1
129 + -DLIBDIR="$(get_libdir)"
130 + )
131 + cmake-utils_src_configure
132 +}
133 +
134 +pkg_postinst() {
135 + elog "From Sigil's release notes:"
136 + elog "When you fire up Sigil for the very first time:"
137 + elog "navigate to the new General Preferences and select the default"
138 + elog "epub version you plan to work with (epub 2 or epub3) so that new"
139 + elog "empty ebooks start with the correct code."
140 + elog "if you plan to work with epub3 epubs, you should change your"
141 + elog "PreserveEntities setting to use ONLY NUMERIC entities."
142 + elog ""
143 + elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
144 + elog ""
145 + elog "We strongly recommend enabling Mend On Open in your settings"
146 + elog "for best performance with Sigil."
147 +}