From 6156a2b89fbc80c99c71059457c6c68fc9fc35f8 Mon Sep 17 00:00:00 2001 From: Matthew Brewer Date: Fri, 25 Sep 2015 02:42:46 +0200 Subject: update sigil --- app-text/sigil/Manifest | 8 ++-- app-text/sigil/sigil-0.8.6-r1.ebuild | 65 ++++++++++++++++++++++++++++++ app-text/sigil/sigil-0.8.7.ebuild | 27 ++++++++----- app-text/sigil/sigil-0.8.900.ebuild | 56 -------------------------- app-text/sigil/sigil-0.8.900_pre.ebuild | 70 +++++++++++++++++++++++++++++++++ 5 files changed, 158 insertions(+), 68 deletions(-) create mode 100644 app-text/sigil/sigil-0.8.6-r1.ebuild delete mode 100644 app-text/sigil/sigil-0.8.900.ebuild create mode 100644 app-text/sigil/sigil-0.8.900_pre.ebuild diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest index 0d2ab12..7ab1b5a 100644 --- a/app-text/sigil/Manifest +++ b/app-text/sigil/Manifest @@ -1,5 +1,7 @@ +DIST sigil-0.8.6.tar.gz 19394568 SHA256 5f89b47abbf0a7befa4e776083db5426456f8ef1ef50bd168dc98d621fb2ad26 SHA512 5d45ca43520f6fd13e83c97da24d613a05e9b33dd0e07637f872a0fb6050f345f9228a8f63d1e81ee727f07d6dbdf306d55fdb51d0ac67dde33327465c3c6732 WHIRLPOOL 99388aef513842b930c4f549fdfa23414366a9af390850fa982dd3ef53d59ab4bd443001929bb50d83699ed4f960104f8f96452744a9acb5f08416843dcbe960 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827 -DIST sigil-0.8.900.tar.gz 17691810 SHA256 8f96b2220abb96c53d72d4d2f704f9fdbd60443ace2f226ebc19c14e43ca0e5a SHA512 4b642c21e9500db04fe31117cdf3a083e4609ddc0e1c6323d1561e771bb033ab57d2edb024a12a74400332d97e5d5ee2d25f4635f87df9c09d940a6b12700518 WHIRLPOOL 14262882ce60bec0fb66a20afd3241390f97aa97cf29b32bf159703ddbf18a0dd7bfa463737573d266522eccb4ed15e89e8bf9ec03357929bfeaf6dcfa61a29e -EBUILD sigil-0.8.7.ebuild 1357 SHA256 86aac8071b101960cff099234861455ac2c4e1f85f778af5d2f47815d43594ea SHA512 dbd5b62a0d33546a0263cbbe33bf45f7b7aa049b40806684045b5370b5df62fa0d74e76ecf15bff13e9741241293465512f5e3fac77d7ca349a1feeb2b52e519 WHIRLPOOL a63369a004eb26c0c859922aaf1d556509a33c71cd3a5496d921f0ea9dcaf3ca0b12f9b2decba3a28494d9f94805c8ac83be4bb05894afb8b86c86410440872d -EBUILD sigil-0.8.900.ebuild 1357 SHA256 86aac8071b101960cff099234861455ac2c4e1f85f778af5d2f47815d43594ea SHA512 dbd5b62a0d33546a0263cbbe33bf45f7b7aa049b40806684045b5370b5df62fa0d74e76ecf15bff13e9741241293465512f5e3fac77d7ca349a1feeb2b52e519 WHIRLPOOL a63369a004eb26c0c859922aaf1d556509a33c71cd3a5496d921f0ea9dcaf3ca0b12f9b2decba3a28494d9f94805c8ac83be4bb05894afb8b86c86410440872d +DIST sigil-0.8.900_pre.tar.gz 17691810 SHA256 8f96b2220abb96c53d72d4d2f704f9fdbd60443ace2f226ebc19c14e43ca0e5a SHA512 4b642c21e9500db04fe31117cdf3a083e4609ddc0e1c6323d1561e771bb033ab57d2edb024a12a74400332d97e5d5ee2d25f4635f87df9c09d940a6b12700518 WHIRLPOOL 14262882ce60bec0fb66a20afd3241390f97aa97cf29b32bf159703ddbf18a0dd7bfa463737573d266522eccb4ed15e89e8bf9ec03357929bfeaf6dcfa61a29e +EBUILD sigil-0.8.6-r1.ebuild 1591 SHA256 6f0ee2fc43611b8cd57697de846f7489f156c76e0f7965bdf045af6228dff2bb SHA512 1cc899624d22e1ad53723451788da45052e3f577102397f6ba8cd4ae68c6f4f015cdb008d319f26b735c2ababa757851dc629d48d7bcf98cf618bb62c17c6c3c WHIRLPOOL 8ac04e7af889f87143e15213430a3d59bc1d58b9152fd659d28890d5802bc5f88e51082945b6b0502f312966bd407156e36844fc4d27d95ba5567dcc799fe95e +EBUILD sigil-0.8.7.ebuild 1593 SHA256 45295de3fe9eaf44544630630d2483dcbab3d1d2c0a5f802f405055a9320c033 SHA512 ac18a994ee3ddede8acca56e717df0e56af1bdb42ff0eeb8f30ef830d60199b6bd701c9834f3c870a7fbcd3a4b9fe6c8b04e3a426014d1ff393e97da2f9f716d WHIRLPOOL be57d9f12964540d1e4d4a6d8db96aa09ffd21f28b70250cf21e71c0ecbd9adf7945989294d16e47e7fa770e76a9b8d1f197bfbe0a366be105a137e26bd86de1 +EBUILD sigil-0.8.900_pre.ebuild 1684 SHA256 7410aef7d94c08afaabd2c8d0e8a441a9061e81da63d310e3c8feb2f6d9004e3 SHA512 6456e497a744eb301dd44f28995451a02ff631d91172153c7627153df3ed5f9e963044ec7d4c058af43fa37b505d3c0386431e2470f7861a046a5736843ab28b WHIRLPOOL 9b3e085b06dfd133d85f02e19400e30d63d49e4ab8cf001c5995d74247794bb70b3b0c9e5e124ea13750babd6257be4beac3d4f9ac05a401364485d0d6b24cc3 MISC metadata.xml 565 SHA256 b86403dfd085183081ddfb747c844ab2e21e1a4bb08c33403ff1aae452de9d61 SHA512 6a968225e62318b833497262ddc240ae34226a32625c02ef0f6631c03bfa5302aff90fc346f6cb77d3bb938548ca5d75ed2c3d2f4625dd48d3afe2623b01634b WHIRLPOOL 1e9ba4b68cd07abdb2718cb19817b30d17475c87c3596138fb01c4ece7a25c9fc618aeb5012fddc7c4bceb7b648f3d4b6f7c1b1fc48bace6a686b20eb0bc8a47 diff --git a/app-text/sigil/sigil-0.8.6-r1.ebuild b/app-text/sigil/sigil-0.8.6-r1.ebuild new file mode 100644 index 0000000..cbb641d --- /dev/null +++ b/app-text/sigil/sigil-0.8.6-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CMAKE_MIN_VERSION="3.0" +CMAKE_BUILD_TYPE="Release" + +# This ebuild could use some python checks, as sigil contains python plugin architecture. + +inherit eutils cmake-utils + +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/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sys-libs/zlib-1.2.7[minizip] + >=dev-libs/libpcre-8.31[pcre16] + >=dev-libs/boost-1.49[threads] + >=app-text/hunspell-1.3.2 + >=dev-libs/xerces-c-3.1.1[icu] + >=dev-qt/qtconcurrent-5.4:5 + >=dev-qt/qtcore-5.4:5 + >=dev-qt/qtgui-5.4:5 + >=dev-qt/qtnetwork-5.4:5 + >=dev-qt/qtprintsupport-5.4:5 + >=dev-qt/qtsvg-5.4:5 + >=dev-qt/qtwebkit-5.4:5 + >=dev-qt/qtwidgets-5.4:5 + >=dev-qt/qtxml-5.4:5 + >=dev-qt/qtxmlpatterns-5.4:5 +" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=dev-qt/linguist-tools-5.4:5 +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +DOCS=( 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" + + cmake-utils_src_prepare +} + +src_configure() { + 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 +} diff --git a/app-text/sigil/sigil-0.8.7.ebuild b/app-text/sigil/sigil-0.8.7.ebuild index 13aac30..beb67b6 100644 --- a/app-text/sigil/sigil-0.8.7.ebuild +++ b/app-text/sigil/sigil-0.8.7.ebuild @@ -14,7 +14,7 @@ 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/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -27,30 +27,39 @@ RDEPEND=" >=dev-libs/boost-1.49[threads] >=app-text/hunspell-1.3.2 >=dev-libs/xerces-c-3.1.1[icu] + >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 - >=dev-qt/qtwebkit-5.4:5 - >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtgui-5.4:5 + >=dev-qt/qtnetwork-5.4:5 + >=dev-qt/qtprintsupport-5.4:5 + >=dev-qt/qtsvg-5.4:5 + >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 - >=dev-qt/qtconcurrent-5.4:5 - >=dev-qt/qtprintsupport-5.4:5 - >=dev-qt/qtnetwork-5.4:5 " DEPEND="${RDEPEND} - >=sys-devel/gcc-4.8:* virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 " S="${WORKDIR}/${MY_PN}-${PV}" -DOCS=( README.md docs/Install.md ) +DOCS=( 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/Sigil/CMakeLists.txt || die "sed failed" cmake-utils_src_prepare } + +src_configure() { + 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 +} diff --git a/app-text/sigil/sigil-0.8.900.ebuild b/app-text/sigil/sigil-0.8.900.ebuild deleted file mode 100644 index 13aac30..0000000 --- a/app-text/sigil/sigil-0.8.900.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -CMAKE_MIN_VERSION="3.0" -CMAKE_BUILD_TYPE="Release" - -# This ebuild could use some python checks, as sigil contains python plugin architecture. - -inherit eutils cmake-utils - -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/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=sys-libs/zlib-1.2.7[minizip] - >=dev-libs/libpcre-8.31[pcre16] - >=dev-libs/boost-1.49[threads] - >=app-text/hunspell-1.3.2 - >=dev-libs/xerces-c-3.1.1[icu] - >=dev-qt/qtcore-5.4:5 - >=dev-qt/qtwebkit-5.4:5 - >=dev-qt/qtsvg-5.4:5 - >=dev-qt/qtgui-5.4:5 - >=dev-qt/qtwidgets-5.4:5 - >=dev-qt/qtxml-5.4:5 - >=dev-qt/qtxmlpatterns-5.4:5 - >=dev-qt/qtconcurrent-5.4:5 - >=dev-qt/qtprintsupport-5.4:5 - >=dev-qt/qtnetwork-5.4:5 -" -DEPEND="${RDEPEND} - >=sys-devel/gcc-4.8:* - virtual/pkgconfig - >=dev-qt/linguist-tools-5.4:5 -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -DOCS=( README.md docs/Install.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' - - cmake-utils_src_prepare -} diff --git a/app-text/sigil/sigil-0.8.900_pre.ebuild b/app-text/sigil/sigil-0.8.900_pre.ebuild new file mode 100644 index 0000000..9ec78bd --- /dev/null +++ b/app-text/sigil/sigil-0.8.900_pre.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CMAKE_MIN_VERSION="3.0" +CMAKE_BUILD_TYPE="Release" + +# This ebuild could use some python checks, as sigil contains python plugin architecture. + +inherit eutils cmake-utils + +MY_PN="Sigil" +MY_PV="0.8.900" + +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}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-lang/python:3.4 + >=dev-libs/boost-1.49[threads] + >=dev-libs/libpcre-8.31[pcre16] + >=dev-libs/xerces-c-3.1.1[icu] + >=dev-qt/qtconcurrent-5.4:5 + >=dev-qt/qtcore-5.4:5 + >=dev-qt/qtgui-5.4:5 + >=dev-qt/qtnetwork-5.4:5 + >=dev-qt/qtprintsupport-5.4:5 + >=dev-qt/qtsvg-5.4:5 + >=dev-qt/qtwebkit-5.4:5 + >=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] +" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=dev-qt/linguist-tools-5.4:5 +" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +DOCS=( README.md ChangeLog.txt ) + +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" + + 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/CMakeFiles/sigil.dir/link.txt $(find . -name '*.make') + do + sed -e 's/-O3 -DNDEBUG/-DNDEBUG/' -i ${i} || die "sed failed" + done +} -- cgit v1.2.3