app-text/sigil: version bump to 0.9.4

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Closes: https://github.com/gentoo/gentoo/pull/1114

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index f99e27823528f87721ad299761e912602d9bd9de..daeea60263c062840445b5f334e8d489a43fa63b 100644 (file)
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,2 @@
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
-DIST sigil-0.9.3.tar.gz 18095814 SHA256 714417ec2ac8aa21a29dcc9fd5054479fcba965029c1b881f8229ca76781c404 SHA512 c3463e0b16188b9d15f2f00e2b4fb8c565c0281cde144b840e49dbf7026462251d44ad8b5ae4b0ac8f88569ce73c6a9bcd781864283f3b5b8b25be7962b0f9b1 WHIRLPOOL 29cbf950015a562c247a127c527dd09f45328d799b710f9715d720798a89e77e781758978c683a1b85fe55690679cc8aa99f71c24786e4a7e534515664335644
+DIST sigil-0.9.4.tar.gz 18084460 SHA256 97872d88e1b55de638f77add19d95f867b39fa919ed98bfe7a7e11b0bc44c168 SHA512 dad5d44061375da99748d767c0cc288e11d02cc475c239b7709b4ace36cfd0deec8b2a5bcd74431e0465e1cd4d927bafd094ba238aec06bf40ec62d43d568cc1 WHIRLPOOL 5ecbb09f373e976f716dfc2c95d504bb92f40bf5cc42f0b09c90430ca67141e1e0feb89cdabcc1fac225b1785a3bf443299dd8eeb8dd39824f044c9a32a81f52

diff --git a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
new file mode 100644 (file)
index 0000000..6e7db28
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
@@ -0,0 +1,26 @@
+diff -Naur Sigil-0.9.4/internal/gumbo/CMakeLists.txt Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt
+--- Sigil-0.9.4/internal/gumbo/CMakeLists.txt  2016-03-13 20:20:52.000000000 +0100
++++ Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt        2016-03-22 14:50:26.026558216 +0100
+@@ -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 -Naur Sigil-0.9.4/src/CMakeLists.txt Sigil-0.9.4.b/src/CMakeLists.txt
+--- Sigil-0.9.4/src/CMakeLists.txt     2016-03-13 20:20:52.000000000 +0100
++++ Sigil-0.9.4.b/src/CMakeLists.txt   2016-03-22 14:49:49.628556236 +0100
+@@ -1015,12 +1015,10 @@
+     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/ )
+     install( FILES ${LINUX_DESKTOP_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/applications/ )
+     install( FILES ${LINUX_DESKTOP_ICON_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/pixmaps RENAME sigil.png )
+     install( FILES ${QM_FILES} DESTINATION ${SIGIL_SHARE_ROOT}/translations/ )

diff --git a/app-text/sigil/sigil-0.9.3.ebuild b/app-text/sigil/sigil-0.9.4.ebuild
similarity index 92%
rename from app-text/sigil/sigil-0.9.3.ebuild
rename to app-text/sigil/sigil-0.9.4.ebuild
index bc82d766dd541fdca417cea2e58ad22bb84df99b..22683ba89645695d420ec060c57b3a8630b5fdfe 100644 (file)
--- a/app-text/sigil/sigil-0.9.3.ebuild
+++ b/app-text/sigil/sigil-0.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 CMAKE_MIN_VERSION="3.0"
 
 PYTHON_COMPAT=( python3_4 python3_5 )
@@ -22,7 +22,7 @@ IUSE=""
 
 RDEPEND="
        app-text/hunspell
-       dev-libs/boost[threads,${PYTHON_USEDEP}]
+       dev-libs/boost[threads]
        dev-libs/libpcre[pcre16]
        dev-libs/xerces-c[icu]
        dev-python/chardet[${PYTHON_USEDEP}]
@@ -60,7 +60,9 @@ 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/CMakeLists.txt || die "sed failed"
+       eapply "${FILESDIR}/sigil-0.9.4-proper-gumbo-install.patch"
 
+       eapply_user
        cmake-utils_src_prepare
 }
 
@@ -68,6 +70,7 @@ src_configure() {
        local mycmakeargs=(
                -DUSE_SYSTEM_LIBS=1
                -DSYSTEM_LIBS_REQUIRED=1
+               -DLIBDIR="$(get_libdir)"
        )
        cmake-utils_src_configure
 }