[gentoo-commits] repo/gentoo:master commit in: app-text/sigil/

[Patrice Clement]

commit:     f9a08a7e587c26d9a4111f8029b004b81587d020
Author:     tomboy64 <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Mon Dec  7 17:54:47 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 17:54:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a08a7e

app-text/sigil: version bump

- remove outdated version 0.8.7
- bump version 0.9.1

 app-text/sigil/Manifest                            |  1 +
 .../{sigil-0.8.7.ebuild => sigil-0.9.1.ebuild}     | 41 +++++++++++++---------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 36f5a1b..70aa99f 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,3 @@
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 
0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 
24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
 WHIRLPOOL 
2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
 DIST sigil-0.9.0.tar.gz 17446877 SHA256 
39887e1f76236e796d29c679f327c7183907c47b522794a00090eb1aa04dac92 SHA512 
f83e5e8ae233e8784ad25345890a33424cf951a3d385d26a69b0efbabe87b22ab9466a6faed93f1106875642ef395c6f20c69b556661b6fe24388946d677746b
 WHIRLPOOL 
d6cca23116a428fc032538ab7fda1ab1d2afa703b8f665d58c03bcd5568e6174f1efbc43b7c5cb7f9e8b91866ea93d8cf01428fbd47748a26b4906152de972c8
+DIST sigil-0.9.1.tar.gz 17451106 SHA256 
7ef13ae9f570ac51aa8d80890ff31bcdf8d1b488c1c4bbb315f1ca4b75237a63 SHA512 
41327a67aea80f655f8662c0fcf7159db7d44a5cf89274777c719bcff2960e8ef11788c767c8ffba095c1fb4be320b055e1826bff8f6d0ca89999d52e750f7e0
 WHIRLPOOL 
49d3b4d10abebce045e55fac7350d7a7e09ebef9293593db6b5bc148507e289a9ab26ddaf6f0b53dfe7252be78f53fbcdc0c760b78ed642c74ee8f73a026a302

diff --git a/app-text/sigil/sigil-0.8.7.ebuild 
b/app-text/sigil/sigil-0.9.1.ebuild
similarity index 53%
rename from app-text/sigil/sigil-0.8.7.ebuild
rename to app-text/sigil/sigil-0.9.1.ebuild
index 027d5d0..98abaad 100644
--- a/app-text/sigil/sigil-0.8.7.ebuild
+++ b/app-text/sigil/sigil-0.9.1.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=5
 CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"
 
-# This ebuild could use some python checks, as sigil contains python plugin 
architecture.
+# Sigil supports Python 3.5 already. Include it when our deps support it.
+PYTHON_COMPAT=( python3_4 )
 
-inherit eutils cmake-utils
+inherit eutils cmake-utils python-single-r1
 
 MY_PN="Sigil"
 
@@ -22,10 +22,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-       >=app-text/hunspell-1.3.2
-       >=dev-libs/boost-1.49[threads]
-       >=dev-libs/libpcre-8.31[pcre16]
-       >=dev-libs/xerces-c-3.1.1[icu]
+       app-text/hunspell
+       dev-libs/boost[threads,${PYTHON_USEDEP}]
+       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
@@ -36,30 +44,31 @@ RDEPEND="
        >=dev-qt/qtwidgets-5.4:5
        >=dev-qt/qtxml-5.4:5
        >=dev-qt/qtxmlpatterns-5.4:5
-       >=sys-libs/zlib-1.2.7[minizip]
+       sys-libs/zlib[minizip]
 "
 DEPEND="${RDEPEND}
+       dev-python/lxml[${PYTHON_USEDEP}]
+       dev-python/six[${PYTHON_USEDEP}]
+       >=sys-devel/gcc-4.8
        virtual/pkgconfig
        >=dev-qt/linguist-tools-5.4:5
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-DOCS=( README.md )
+DOCS=( ChangeLog.txt README.md )
 
 src_prepare() {
        # sigil tries to copy non-needed qt libs for deb package, safe to 
ignore this completely
-       sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
+       sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
 
        cmake-utils_src_prepare
 }
 
 src_configure() {
+       local mycmakeargs=(
+               -DUSE_SYSTEM_LIBS=1
+               -DSYSTEM_LIBS_REQUIRED=1
+       )
        cmake-utils_src_configure
-
-       cd "${WORKDIR}/${P}_build" || die "Where is the build dir?"
-       for i in CMakeCache.txt src/Sigil/CMakeFiles/sigil.dir/link.txt $(find 
. -name '*.make')
-       do
-               sed -e 's/-O3 -DNDEBUG/-DNDEBUG/' -i ${i} || die "sed failed"
-       done
 }