Gentoo Archives: gentoo-commits

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